search for: f045572

...printf b " --user <hidden>" + | name, Some value -> bprintf b " --%s %s" name (quote value) + ) args; + bprintf b "\n"; + Buffer.contents b + +let print chan t = output_string chan (to_string t) diff --git a/mllib/curl.mli b/mllib/curl.mli index cd01497..f045572 100644 --- a/mllib/curl.mli +++ b/mllib/curl.mli @@ -18,21 +18,53 @@ (** Functions for dealing with [curl]. *) -type curl_args = (string * string option) list +type t -val run : curl_args -> string list -(** [run curl_args] runs the [curl] command. +type args = (string * string option) li...

...l = curl; args = args; tmpdir = tmpdir } = + let config_file, chan = Filename.open_temp_file ?temp_dir:tmpdir + "guestfscurl" ".conf" in List.iter ( function | name, None -> fprintf chan "%s\n" name diff --git a/mllib/curl.mli b/mllib/curl.mli index f045572..c0c2fb0 100644 --- a/mllib/curl.mli +++ b/mllib/curl.mli @@ -27,7 +27,7 @@ type proxy = | SystemProxy (** Use the system settings. *) | ForcedProxy of string (** The proxy is forced to the specified URL. *) -val create : ?curl:string -> ?proxy:proxy -> args -> t +val cre...

...Unix.unlink config_file; + (* Remove the temporary configuration only when not created under + * a proper temporary directory. + *) + if tmpdir = None then + Unix.unlink config_file; lines let to_string { curl = curl; args = args } = diff --git a/mllib/curl.mli b/mllib/curl.mli index f045572..c0c2fb0 100644 --- a/mllib/curl.mli +++ b/mllib/curl.mli @@ -27,7 +27,7 @@ type proxy = | SystemProxy (** Use the system settings. *) | ForcedProxy of string (** The proxy is forced to the specified URL. *) -val create : ?curl:string -> ?proxy:proxy -> args -> t +val cre...

v2 -> v3: - Changes to the Curl API suggested by Pino.