clean up for configs

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

diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index 9644026d6381dbc9270323fb7b49bfbdb30bc307..7e6ce1870cc17c0768bf14effa294ff51df850e9 100644 (file)
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -737,9 +737,6 @@ control_message_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *t
 }
 
 
-#include "do_start_process.c"
-
-
 /**
  * A client specifically requested starting of ARM itself.
  * This function is called with information about whether
@@ -759,6 +756,7 @@ arm_service_report (void *cls,
   unsigned char test_is_active;
   char *cbinary;
   char *binary;
+  char *quotedbinary;
   char *config;
   char *loprefix;
   char *lopostfix;
@@ -817,6 +815,9 @@ arm_service_report (void *cls,
       cm->h->cfg, "arm", "CONFIG", &config))
     config = NULL;
   binary = GNUNET_OS_get_libexec_binary_path (cbinary);
+  GNUNET_asprintf (&quotedbinary,
+                  "\"%s\"",
+                  binary);
   GNUNET_free (cbinary);
   if ((GNUNET_YES == GNUNET_CONFIGURATION_have_value (
           cm->h->cfg, "TESTING", "WEAKRANDOM")) &&
@@ -828,28 +829,30 @@ arm_service_report (void *cls,
     /* Means we are ONLY running locally */
     /* we're clearly running a test, don't daemonize */
     if (NULL == config)
-      proc = do_start_process (GNUNET_NO, cm->std_inheritance,
-                              NULL, loprefix, binary,
-                              /* no daemonization! */
-                              lopostfix, NULL);
+      proc = GNUNET_OS_start_process_s (GNUNET_NO, cm->std_inheritance,
+                                        NULL, loprefix, quotedbinary,
+                                        /* no daemonization! */
+                                        lopostfix, NULL);
     else
-      proc = do_start_process (GNUNET_NO, cm->std_inheritance,
-                              NULL, loprefix, binary, "-c", config,
-                              /* no daemonization! */
-                              lopostfix, NULL);
+      proc = GNUNET_OS_start_process_s (GNUNET_NO, cm->std_inheritance,
+                              NULL, loprefix, quotedbinary, "-c", config,
+                                        /* no daemonization! */
+                                        lopostfix, NULL);
   }
   else
   {
     if (NULL == config)
-      proc = do_start_process (GNUNET_NO, cm->std_inheritance,
-                              NULL, loprefix, binary,
-                              "-d", lopostfix, NULL);
+      proc = GNUNET_OS_start_process_s (GNUNET_NO, cm->std_inheritance,
+                                        NULL, loprefix, quotedbinary,
+                                        "-d", lopostfix, NULL);
     else
-      proc = do_start_process (GNUNET_NO, cm->std_inheritance,
-                              NULL, loprefix, binary, "-c", config,
-                              "-d", lopostfix, NULL);
+      proc = GNUNET_OS_start_process_s (GNUNET_NO, cm->std_inheritance,
+                                        NULL, loprefix, quotedbinary, "-c",
+                                        config,
+                                        "-d", lopostfix, NULL);
   }
   GNUNET_free (binary);
+  GNUNET_free (quotedbinary);
   GNUNET_free_non_null (config);
   GNUNET_free (loprefix);
   GNUNET_free (lopostfix);