Allow redirection of STDERR when starting processes.

6 files changed, 52 insertions, 11 deletions

diff --git a/src/util/gnunet-uri.c b/src/util/gnunet-uri.c
index 279c5a42e..545b78981 100644
--- a/src/util/gnunet-uri.c
+++ b/src/util/gnunet-uri.c
@@ -113,7 +113,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                                                                 GNUNET_DISK_PIPE_END_READ),
                                        &maint_child_death, NULL);
   p = GNUNET_OS_start_process (GNUNET_NO, 0,
-                               NULL, NULL,
+                               NULL, NULL, NULL,
                                program,
                                program,
                                args[0],
diff --git a/src/util/helper.c b/src/util/helper.c
index 404dad4fa..105ccf057 100644
--- a/src/util/helper.c
+++ b/src/util/helper.c
@@ -426,7 +426,7 @@ start_helper (struct GNUNET_HELPER_Handle *h)
       GNUNET_DISK_pipe_handle (h->helper_in, GNUNET_DISK_PIPE_END_WRITE);
   h->helper_proc =
     GNUNET_OS_start_process_vap (h->with_control_pipe, GNUNET_OS_INHERIT_STD_ERR,
-                                 h->helper_in, h->helper_out,
+                                 h->helper_in, h->helper_out, NULL,
                                  h->binary_name,
                                  h->binary_argv);
   if (NULL == h->helper_proc)
diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index 23eb1d168..d0c512363 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -503,6 +503,7 @@ start_process (int pipe_control,
                enum GNUNET_OS_InheritStdioFlags std_inheritance,
                struct GNUNET_DISK_PipeHandle *pipe_stdin,
                struct GNUNET_DISK_PipeHandle *pipe_stdout,
+               struct GNUNET_DISK_PipeHandle *pipe_stderr,
                const SOCKTYPE *lsocks,
                const char *filename,
                char *const argv[])
@@ -523,6 +524,8 @@ start_process (int pipe_control,
   unsigned int ls;
   int fd_stdout_write;
   int fd_stdout_read;
+  int fd_stderr_write;
+  int fd_stderr_read;
   int fd_stdin_read;
   int fd_stdin_write;
 
@@ -583,6 +586,19 @@ start_process (int pipe_control,
                                                       (pipe_stdin, GNUNET_DISK_PIPE_END_WRITE),
                                                       &fd_stdin_write, sizeof (int)));
   }
+  if (NULL != pipe_stderr)
+  {
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle
+                                                      (pipe_stderr,
+                                                       GNUNET_DISK_PIPE_END_READ),
+                                                      &fd_stderr_read, sizeof (int)));
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle
+                                                      (pipe_stderr,
+                                                       GNUNET_DISK_PIPE_END_WRITE),
+                                                      &fd_stderr_write, sizeof (int)));
+  }
   lscp = NULL;
   ls = 0;
   if (NULL != lsocks)
@@ -659,7 +675,14 @@ start_process (int pipe_control,
     GNUNET_break (0 == close (1));
     open_dev_null (1, O_WRONLY);
   }
-  if (0 == (std_inheritance & GNUNET_OS_INHERIT_STD_ERR))
+  if (NULL != pipe_stderr)
+  {
+    GNUNET_break (0 == close (fd_stderr_read));
+    if (-1 == dup2 (fd_stderr_write, 2))
+      LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "dup2");
+    GNUNET_break (0 == close (fd_stderr_write));
+  }
+  else if (0 == (std_inheritance & GNUNET_OS_INHERIT_STD_ERR))
   {
     GNUNET_break (0 == close (2));
     open_dev_null (2, O_WRONLY);
@@ -1220,6 +1243,7 @@ GNUNET_OS_start_process_vap (int pipe_control,
                              enum GNUNET_OS_InheritStdioFlags std_inheritance,
                              struct GNUNET_DISK_PipeHandle *pipe_stdin,
                              struct GNUNET_DISK_PipeHandle *pipe_stdout,
+                             struct GNUNET_DISK_PipeHandle *pipe_stderr,
                              const char *filename,
                              char *const argv[])
 {
@@ -1227,6 +1251,7 @@ GNUNET_OS_start_process_vap (int pipe_control,
                         std_inheritance,
                         pipe_stdin,
                         pipe_stdout,
+                        pipe_stderr,
                         NULL,
                         filename,
                         argv);
@@ -1249,6 +1274,7 @@ GNUNET_OS_start_process_va (int pipe_control,
                             enum GNUNET_OS_InheritStdioFlags std_inheritance,
                             struct GNUNET_DISK_PipeHandle *pipe_stdin,
                             struct GNUNET_DISK_PipeHandle *pipe_stdout,
+                            struct GNUNET_DISK_PipeHandle *pipe_stderr,
                             const char *filename, va_list va)
 {
   struct GNUNET_OS_Process *ret;
@@ -1271,6 +1297,7 @@ GNUNET_OS_start_process_va (int pipe_control,
                                      std_inheritance,
                                      pipe_stdin,
                                      pipe_stdout,
+                                     pipe_stderr,
                                      filename,
                                      argv);
   GNUNET_free (argv);
@@ -1294,14 +1321,20 @@ GNUNET_OS_start_process (int pipe_control,
                          enum GNUNET_OS_InheritStdioFlags std_inheritance,
                          struct GNUNET_DISK_PipeHandle *pipe_stdin,
                          struct GNUNET_DISK_PipeHandle *pipe_stdout,
+                         struct GNUNET_DISK_PipeHandle *pipe_stderr,
                          const char *filename, ...)
 {
   struct GNUNET_OS_Process *ret;
   va_list ap;
 
   va_start (ap, filename);
-  ret = GNUNET_OS_start_process_va (pipe_control, std_inheritance, pipe_stdin,
-                                    pipe_stdout, filename, ap);
+  ret = GNUNET_OS_start_process_va (pipe_control,
+                                    std_inheritance,
+                                    pipe_stdin,
+                                    pipe_stdout,
+                                    pipe_stderr,
+                                    filename,
+                                    ap);
   va_end (ap);
   return ret;
 }
@@ -1332,6 +1365,7 @@ GNUNET_OS_start_process_v (int pipe_control,
                         std_inheritance,
                         NULL,
                         NULL,
+                        NULL,
                         lsocks,
                         filename,
                         argv);
@@ -1776,7 +1810,7 @@ GNUNET_OS_command_run (GNUNET_OS_LineProcessor proc, void *proc_cls,
     return NULL;
   va_start (ap, binary);
   /* redirect stdout, don't inherit stderr/stdin */
-  eip = GNUNET_OS_start_process_va (GNUNET_NO, 0, NULL, opipe, binary, ap);
+  eip = GNUNET_OS_start_process_va (GNUNET_NO, 0, NULL, opipe, NULL, binary, ap);
   va_end (ap);
   if (NULL == eip)
   {
diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c
index 3361ca1b1..0fe8614d0 100644
--- a/src/util/test_common_logging_runtime_loglevels.c
+++ b/src/util/test_common_logging_runtime_loglevels.c
@@ -391,7 +391,8 @@ runone ()
     break;
   }
 
-  proc = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, pipe_stdout,
+  proc = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+                                  NULL, pipe_stdout, NULL,
 #if MINGW
                                   "test_common_logging_dummy",
 #else
diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c
index 90d8ae101..e76ec5bcf 100644
--- a/src/util/test_os_start_process.c
+++ b/src/util/test_os_start_process.c
@@ -135,7 +135,8 @@ run_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   proc =
       GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_ERR,
-                               hello_pipe_stdin, hello_pipe_stdout, fn,
+                               hello_pipe_stdin, hello_pipe_stdout, NULL,
+                               fn,
                                "test_gnunet_echo_hello", "-", NULL);
   GNUNET_free (fn);
 
@@ -203,7 +204,9 @@ check_kill ()
   }
   fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
   proc =
-    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ERR, hello_pipe_stdin, hello_pipe_stdout, fn,
+    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ERR,
+                             hello_pipe_stdin, hello_pipe_stdout, NULL,
+                             fn,
                              "gnunet-service-resolver", "-", NULL);
   sleep (1); /* give process time to start, so we actually use the pipe-kill mechanism! */
   GNUNET_free (fn);
@@ -234,7 +237,9 @@ check_instant_kill ()
   }
   fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
   proc =
-    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ERR, hello_pipe_stdin, hello_pipe_stdout, fn,
+    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ERR,
+                             hello_pipe_stdin, hello_pipe_stdout, NULL,
+                             fn,
                              "gnunet-service-resolver", "-", NULL);
   if (0 != GNUNET_OS_process_kill (proc, GNUNET_TERM_SIG))
   {
diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c
index c94990415..acc3ae6ae 100644
--- a/src/util/test_resolver_api.c
+++ b/src/util/test_resolver_api.c
@@ -367,7 +367,8 @@ main (int argc, char *argv[])
   fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
   proc = GNUNET_OS_start_process (GNUNET_YES,
                                   GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
-                                  NULL, NULL, fn,
+                                  NULL, NULL, NULL,
+                                  fn,
                                   "gnunet-service-resolver",
                                   "-c", "test_resolver_api_data.conf", NULL);
   GNUNET_assert (NULL != proc);