-fixing #2546

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

diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index f81cefa6967dc9e1232ad3947c663ce661594b04..d84de1c7ab84bbdde405407a3494c25de5034a6a 100644 (file)
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -25,11 +25,8 @@
  */
 #include "platform.h"
 #include "gnunet_arm_service.h"
-#include "gnunet_client_lib.h"
 #include "gnunet_constants.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_time_lib.h"
+#include "gnunet_util_lib.h"
 
 /**
  * Timeout for stopping services.  Long to give some services a real chance.
@@ -129,6 +126,16 @@ static unsigned int phase;
 static struct GNUNET_TIME_Relative timeout;
 
 
+/**
+ * Do we want to give our stdout to gnunet-service-arm?
+ */
+static unsigned int no_stdout = 0;
+
+/**
+ * Do we want to give our stderr to gnunet-service-arm?
+ */
+static unsigned int no_stderr = 0;
+
 /**
  * Main continuation-passing-style loop.  Runs the various
  * jobs that we've been asked to do in order.
@@ -213,20 +220,18 @@ confirm_cb (void *cls,
  * @param list copy of the list of running services
  */
 static void
-list_cb (void *cls, int result, uint16_t count, const char **list)
+list_cb (void *cls, int result, unsigned int count, const char *const*list)
 {
-  if (result == GNUNET_YES && list != NULL)
+  unsigned int i;
+
+  if ( (result != GNUNET_YES) || (NULL == list) )
   {
-    FPRINTF (stdout, _("Running services:\n-----------------\n"));
-    int i;
-    for (i=0; i<count; i++)
-    {
-      FPRINTF (stdout, "%s\n", list[i]);
-    }
-    GNUNET_free (list);
-  } else {
     FPRINTF (stderr, "%s", _("Error communicating with ARM. ARM not running?\n"));
+    return;
   }
+  FPRINTF (stdout, "%s", _("Running services:\n"));
+  for (i=0; i<count; i++)
+    FPRINTF (stdout, "%s\n", list[i]);
 }
 
 /**
@@ -328,6 +333,8 @@ cps_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
          if (start)
            {
              GNUNET_ARM_start_service (h, "arm",
+                                        (no_stdout ? 0 : GNUNET_OS_INHERIT_STD_OUT) |
+                                        (no_stderr ? 0 : GNUNET_OS_INHERIT_STD_ERR),
                                        (0 ==
                                         timeout.rel_value) ? START_TIMEOUT :
                                        timeout, &confirm_cb, "arm");
@@ -338,6 +345,8 @@ cps_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
          if (init != NULL)
            {
              GNUNET_ARM_start_service (h, init,
+                                        (no_stdout ? 0 : GNUNET_OS_INHERIT_STD_OUT) |
+                                        (no_stderr ? 0 : GNUNET_OS_INHERIT_STD_ERR),
                                        (0 ==
                                         timeout.rel_value) ? START_TIMEOUT :
                                        timeout, &confirm_cb, init);
@@ -353,7 +362,7 @@ cps_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
              start = 1;
              restart = 0;
              h = GNUNET_ARM_connect (cfg, NULL);
-             if (h == NULL)
+             if (NULL == h)
                {
                  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                              _("Fatal error initializing ARM API.\n"));
@@ -363,12 +372,13 @@ cps_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
              GNUNET_SCHEDULER_add_now (&cps_loop, NULL);
              return;
            }
+         break;
         case 5:
           if (list) {
               GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Going to list all running services controlled by ARM.\n");
   
-              if (h == NULL) 
+              if (NULL == h) 
               {
                GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                               _("Fatal error initializing ARM API.\n"));
@@ -402,8 +412,6 @@ cps_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 int
 main (int argc, char *const *argv)
 {
-  static unsigned long long temp_timeout_ms;
-
   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
     {'e', "end", NULL, gettext_noop ("stop all GNUnet services"),
      GNUNET_NO, &GNUNET_GETOPT_set_one, &end},
@@ -423,14 +431,18 @@ main (int argc, char *const *argv)
      GNUNET_NO, &GNUNET_GETOPT_set_one, &quiet},
     {'T', "timeout", NULL,
      gettext_noop ("timeout for completing current operation"),
-     GNUNET_YES, &GNUNET_GETOPT_set_ulong, &temp_timeout_ms},
+     GNUNET_YES, &GNUNET_GETOPT_set_relative_time, &timeout},
     {'I', "info", NULL, gettext_noop ("List currently running services"),
      GNUNET_NO, &GNUNET_GETOPT_set_one, &list},
+    {'O', "no-stdout", NULL, gettext_noop ("Don't let gnunet-service-arm inherit standard output"),
+     GNUNET_NO, &GNUNET_GETOPT_set_one, &no_stdout},
+    {'E', "no-stderr", NULL, gettext_noop ("Don't let gnunet-service-arm inherit standard error"),
+     GNUNET_NO, &GNUNET_GETOPT_set_one, &no_stderr},
     GNUNET_GETOPT_OPTION_END
   };
 
-  if (temp_timeout_ms > 0)
-    timeout.rel_value = temp_timeout_ms;
+  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+    return 2;
 
   if (GNUNET_OK ==
       GNUNET_PROGRAM_run (argc, argv, "gnunet-arm",