1 files changed, 85 insertions, 1 deletions

diff --git a/libbutl/curl.hxx b/libbutl/curl.hxx
index cd4ebd0..ea91807 100644
--- a/libbutl/curl.hxx
+++ b/libbutl/curl.hxx
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <string>
+#include <cstdint>     // uint16_t
 #include <type_traits>
 
 #include <libbutl/path.hxx>
@@ -90,6 +91,19 @@ namespace butl
   public:
     enum method_type {get, put, post};
 
+    // By default the -sS and, for the HTTP protocol, --fail and --location
+    // options are passed to curl on the command line. Optionally, these
+    // options can be suppressed.
+    //
+    enum class flags: std::uint16_t
+    {
+      no_fail     = 0x01, // Don't pass --fail.
+      no_location = 0x02, // Don't pass --location
+      no_sS       = 0x04, // Don't pass -sS
+
+      none = 0            // Default options set.
+    };
+
     ifdstream in;
     ofdstream out;
 
@@ -120,12 +134,77 @@ namespace butl
           const std::string& url,
           A&&... options);
 
+    // Similar to the above, but allows to adjust the curl's default command
+    // line.
+    //
+    template <typename I,
+              typename O,
+              typename E,
+              typename... A>
+    curl (I&& in,
+          O&& out,
+          E&& err,
+          method_type,
+          flags,
+          const std::string& url,
+          A&&... options);
+
+    template <typename C,
+              typename I,
+              typename O,
+              typename E,
+              typename... A>
+    curl (const C&,
+          I&& in,
+          O&& out,
+          E&& err,
+          method_type,
+          flags,
+          const std::string& url,
+          A&&... options);
+
+    // Read the HTTP response status from an input stream.
+    //
+    // Specifically, read and parse the HTTP status line, by default skip over
+    // the remaining headers (leaving the stream at the beginning of the
+    // response body), and return the status code and the reason phrase. Throw
+    // std::invalid_argument if the status line could not be parsed. Pass
+    // through the ios::failure exception on the stream error.
+    //
+    // Note that if ios::failure is thrown the stream's exception mask may not
+    // be preserved.
+    //
+    struct http_status
+    {
+      std::uint16_t code;
+      std::string reason;
+    };
+
+    static http_status
+    read_http_status (ifdstream&, bool skip_headers = true);
+
+    // Parse and return the HTTP status code. Return 0 if the argument is
+    // invalid.
+    //
+    static std::uint16_t
+    parse_http_status_code (const std::string&);
+
+    // Read the CRLF-terminated line from an input stream, stripping the
+    // trailing CRLF. Pass through the ios::failure exception on the stream
+    // error.
+    //
+    static std::string
+    read_http_response_line (ifdstream&);
+
   private:
     enum method_proto {ftp_get, ftp_put, http_get, http_post};
     using method_proto_options = small_vector<const char*, 2>;
 
     method_proto
-    translate (method_type, const std::string& url, method_proto_options&);
+    translate (method_type,
+               const std::string& url,
+               method_proto_options&,
+               flags);
 
   private:
     template <typename T>
@@ -165,6 +244,11 @@ namespace butl
     typename std::enable_if<is_other<O>::value, O>::type
     map_out (O&&, method_proto, io_data&);
   };
+
+  curl::flags operator&  (curl::flags, curl::flags);
+  curl::flags operator|  (curl::flags, curl::flags);
+  curl::flags operator&= (curl::flags&, curl::flags);
+  curl::flags operator|= (curl::flags&, curl::flags);
 }
 
 #include <libbutl/curl.ixx>