-cleaning up client api to test for service availability

[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 357d399209a1b553608b760bf4a2f815a2af1276..95ec74405e92e857f6cd82289f1a9ae6ffa2775a 100644 (file)
--- a/src/arm/do_start_process.c
+++ b/src/arm/do_start_process.c
@@ -1,3 +1,25 @@
+/*
+     This file is part of GNUnet.
+     (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+#include "gnunet_os_lib.h"
+
 /**
  * Actually start a process.  All of the arguments given to this
  * function are strings that are used for the "argv" array.  However,
@@ -7,12 +29,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 pid_t
-do_start_process (const char *first_arg, ...)
+static struct GNUNET_OS_Process *
+do_start_process (int pipe_control, unsigned int std_inheritance,
+                 const SOCKTYPE * lsocks, const char *first_arg, ...)
 {
   va_list ap;
   char **argv;
@@ -22,34 +48,39 @@ do_start_process (const char *first_arg, ...)
   char *pos;
   char *cp;
   const char *last;
-  pid_t pid;
+  struct GNUNET_OS_Process *proc;
+  char *binary_path;
 
   argv_size = 1;
   va_start (ap, first_arg);
   arg = first_arg;
   last = NULL;
+/* *INDENT-OFF* */
   do
     {
-      rpos = arg;
-      while ('\0' != *rpos)
+/* *INDENT-ON* */
+  rpos = arg;
+  while ('\0' != *rpos)
+    {
+      if (' ' == *rpos)
        {
-         if (' ' == *rpos)
-           {
-             if (last != NULL)
-               argv_size++;
-             last = NULL;
-             while (' ' == *rpos)
-               rpos++;
-           } 
-         if ( (last == NULL) && (*rpos != '\0') )
-           last = rpos;
-         if (*rpos != '\0')
+         if (last != NULL)
+           argv_size++;
+         last = NULL;
+         while (' ' == *rpos)
            rpos++;
-       }      
-      if (last != NULL)
-       argv_size++;
+       }
+      if ((last == NULL) && (*rpos != '\0'))
+       last = rpos;
+      if (*rpos != '\0')
+       rpos++;
+    }
+  if (last != NULL)
+    argv_size++;
+/* *INDENT-OFF* */
     }
   while (NULL != (arg = (va_arg (ap, const char*))));
+/* *INDENT-ON* */
   va_end (ap);
 
   argv = GNUNET_malloc (argv_size * sizeof (char *));
@@ -57,38 +88,46 @@ do_start_process (const char *first_arg, ...)
   va_start (ap, first_arg);
   arg = first_arg;
   last = NULL;
+/* *INDENT-OFF* */
   do
     {
-      cp = GNUNET_strdup (arg);
-      pos = cp;
-      while ('\0' != *pos)
+/* *INDENT-ON* */
+  cp = GNUNET_strdup (arg);
+  pos = cp;
+  while ('\0' != *pos)
+    {
+      if (' ' == *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 = '\0';
+         if (last != NULL)
+           argv[argv_size++] = GNUNET_strdup (last);
+         last = NULL;
+         pos++;
+         while (' ' == *pos)
            pos++;
        }
-      if (last != NULL)
-       argv[argv_size++] = GNUNET_strdup (last);
-      last = NULL;
-      GNUNET_free (cp);
+      if ((last == NULL) && (*pos != '\0'))
+       last = pos;
+      if (*pos != '\0')
+       pos++;
+    }
+  if (last != NULL)
+    argv[argv_size++] = GNUNET_strdup (last);
+  last = NULL;
+  GNUNET_free (cp);
+/* *INDENT-OFF* */
     }
   while (NULL != (arg = (va_arg (ap, const char*))));
+/* *INDENT-ON* */
   va_end (ap);
   argv[argv_size] = NULL;
-  pid = GNUNET_OS_start_process_v (argv[0], argv);
+  binary_path = argv[0];
+  proc = GNUNET_OS_start_process_v (pipe_control, std_inheritance, lsocks, 
+                                   binary_path, argv);
   while (argv_size > 0)
     GNUNET_free (argv[--argv_size]);
   GNUNET_free (argv);
-  return pid;
+  return proc;
 }
+
+/* end of do_start_process.c */