CA-36084: pass an optional environment to Forkhelpers.execute_command_get_output

Signed-off-by: David Scott <dave.scott@eu.citrix.com>

diff --git a/stdext/forkhelpers.ml b/stdext/forkhelpers.ml
index 5b259c24e7339b8e925bebff7e7b9ad90ab725f3..952e5f42ee048b824aedc3b94714f6c0e3cbee40 100644 (file)
--- a/stdext/forkhelpers.ml
+++ b/stdext/forkhelpers.ml
@@ -152,10 +152,10 @@ let safe_close_and_exec ?env stdin stdout stderr (fds: (string * Unix.file_descr
     close_fds
 
 
-let execute_command_get_output cmd args =
+let execute_command_get_output ?env cmd args =
   match with_logfile_fd "execute_command_get_out" (fun out_fd ->
     with_logfile_fd "execute_command_get_err" (fun err_fd ->
-      let (sock,pid) = safe_close_and_exec None (Some out_fd) (Some err_fd) [] cmd args in
+      let (sock,pid) = safe_close_and_exec ?env None (Some out_fd) (Some err_fd) [] cmd args in
       match Fecomms.read_raw_rpc sock with
        | Fe.Finished x -> Unix.close sock; x
        | _ -> Unix.close sock; failwith "Communications error"     

diff --git a/stdext/forkhelpers.mli b/stdext/forkhelpers.mli
index 590db8cbb9c68ed0d5daeda2df5ad4084cee4432..bedb87e8f3c4490af7e4462aaa23be142eaf96d4 100644 (file)
--- a/stdext/forkhelpers.mli
+++ b/stdext/forkhelpers.mli
@@ -17,7 +17,7 @@
 (** [execute_command_get_output cmd args] runs [cmd args] and returns (stdout, stderr)
        on success (exit 0). On failure this raises [Spawn_internal_error(stderr, stdout, Unix.process_status)]
 *)
-val execute_command_get_output : string -> string list -> string * string
+val execute_command_get_output : ?env:string array -> string -> string list -> string * string
 
 (** Thrown by [execute_command_get_output] if the subprocess exits with a non-zero exit code *)
 exception Spawn_internal_error of string * string * Unix.process_status