-fixing #2546

[oweals/gnunet.git] / src / arm / do_start_process.c

diff --git a/src/arm/do_start_process.c b/src/arm/do_start_process.c
index f4d3424ff179ad7010433953ed26bcb394eeff06..1bc56d540b7607abfaed8545468fe5eabeed166b 100644 (file)
--- a/src/arm/do_start_process.c
+++ b/src/arm/do_start_process.c
@@ -7,13 +7,16 @@
  * limitation that it does NOT allow passing command line arguments
  * with spaces to the new process.
  *
+ * @param pipe_control should a pipe be used to send signals to the child?
+ * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags
  * @param lsocks array of listen sockets to dup starting at fd3 (systemd-style), or NULL
  * @param first_arg first argument for argv (may be an empty string)
  * @param ... more arguments, NULL terminated
- * @return PID of the started process, -1 on error
+ * @return handle of the started process, NULL on error
  */
 static struct GNUNET_OS_Process *
-do_start_process (const SOCKTYPE *lsocks, const char *first_arg, ...)
+do_start_process (int pipe_control, unsigned int std_inheritance,
+                 const SOCKTYPE * lsocks, const char *first_arg, ...)
 {
   va_list ap;
   char **argv;
@@ -35,20 +38,20 @@ do_start_process (const SOCKTYPE *lsocks, const char *first_arg, ...)
 /* *INDENT-ON* */
   rpos = arg;
   while ('\0' != *rpos)
-  {
-    if (' ' == *rpos)
     {
-      if (last != NULL)
-        argv_size++;
-      last = NULL;
-      while (' ' == *rpos)
-        rpos++;
+      if (' ' == *rpos)
+       {
+         if (last != NULL)
+           argv_size++;
+         last = NULL;
+         while (' ' == *rpos)
+           rpos++;
+       }
+      if ((last == NULL) && (*rpos != '\0'))
+       last = rpos;
+      if (*rpos != '\0')
+       rpos++;
     }
-    if ((last == NULL) && (*rpos != '\0'))
-      last = rpos;
-    if (*rpos != '\0')
-      rpos++;
-  }
   if (last != NULL)
     argv_size++;
 /* *INDENT-OFF* */
@@ -69,22 +72,22 @@ do_start_process (const SOCKTYPE *lsocks, const char *first_arg, ...)
   cp = GNUNET_strdup (arg);
   pos = cp;
   while ('\0' != *pos)
-  {
-    if (' ' == *pos)
     {
-      *pos = '\0';
-      if (last != NULL)
-        argv[argv_size++] = GNUNET_strdup (last);
-      last = NULL;
-      pos++;
-      while (' ' == *pos)
-        pos++;
+      if (' ' == *pos)
+       {
+         *pos = '\0';
+         if (last != NULL)
+           argv[argv_size++] = GNUNET_strdup (last);
+         last = NULL;
+         pos++;
+         while (' ' == *pos)
+           pos++;
+       }
+      if ((last == NULL) && (*pos != '\0'))
+       last = pos;
+      if (*pos != '\0')
+       pos++;
     }
-    if ((last == NULL) && (*pos != '\0'))
-      last = pos;
-    if (*pos != '\0')
-      pos++;
-  }
   if (last != NULL)
     argv[argv_size++] = GNUNET_strdup (last);
   last = NULL;
@@ -95,7 +98,7 @@ do_start_process (const SOCKTYPE *lsocks, const char *first_arg, ...)
 /* *INDENT-ON* */
   va_end (ap);
   argv[argv_size] = NULL;
-  proc = GNUNET_OS_start_process_v (lsocks, argv[0], argv);
+  proc = GNUNET_OS_start_process_v (pipe_control, std_inheritance, lsocks, argv[0], argv);
   while (argv_size > 0)
     GNUNET_free (argv[--argv_size]);
   GNUNET_free (argv);