make sure peer launches if default config not found and -c not given

1 files changed, 49 insertions, 71 deletions

diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index e8180e920..69e230f87 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -146,8 +146,8 @@ delete_files ()
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Will attempt to remove configuration file %s and service directory %s\n",
-              config_file, dir);
-
+              config_file,
+              dir);
   if (0 != UNLINK (config_file))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -159,7 +159,6 @@ delete_files ()
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 _("Failed to remove servicehome directory %s\n"),
                 dir);
-
   }
 }
 
@@ -697,13 +696,11 @@ timeout_task_cb (void *cls)
 static void
 run (void *cls,
      char *const *args,
-     const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
   char *armconfig;
 
   cfg = GNUNET_CONFIGURATION_dup (c);
-  config_file = cfgfile;
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (cfg,
                                              "PATHS",
@@ -715,30 +712,18 @@ run (void *cls,
                                "GNUNET_HOME");
     return;
   }
-  if (NULL != cfgfile)
-  {
-    if (GNUNET_OK !=
-        GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                                 "arm",
-                                                 "CONFIG",
-                                                 &armconfig))
-    {
-      GNUNET_CONFIGURATION_set_value_string (cfg,
-                                             "arm",
-                                             "CONFIG",
-                                             cfgfile);
-    }
-    else
-      GNUNET_free (armconfig);
-  }
+  (void) GNUNET_CONFIGURATION_get_value_filename (cfg,
+                                                  "arm",
+                                                  "CONFIG",
+                                                  &config_file);
   if (NULL == (h = GNUNET_ARM_connect (cfg,
                                        &conn_status,
                                        NULL)))
     return;
   if (monitor)
     m = GNUNET_ARM_monitor_start (cfg,
-                            &srv_status,
-                            NULL);
+                                  &srv_status,
+                                  NULL);
   al_task = GNUNET_SCHEDULER_add_now (&action_loop,
                                       NULL);
   GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
@@ -758,84 +743,77 @@ run (void *cls,
  * @return 0 ok, 1 on error, 2 on timeout
  */
 int
-main (int argc, char *const *argv)
+main (int argc,
+      char *const *argv)
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
-
     GNUNET_GETOPT_option_flag ('e',
-                                  "end",
-                                  gettext_noop ("stop all GNUnet services"),
-                                  &end),
-
+                               "end",
+                               gettext_noop ("stop all GNUnet services"),
+                               &end),
     GNUNET_GETOPT_option_string ('i',
                                  "init",
                                  "SERVICE",
                                  gettext_noop ("start a particular service"),
                                  &init),
-
     GNUNET_GETOPT_option_string ('k',
                                  "kill",
                                  "SERVICE",
                                  gettext_noop ("stop a particular service"),
                                  &term),
-
     GNUNET_GETOPT_option_flag ('s',
-                                  "start",
-                                  gettext_noop ("start all GNUnet default services"),
-                                  &start),
-
+                               "start",
+                               gettext_noop ("start all GNUnet default services"),
+                               &start),
     GNUNET_GETOPT_option_flag ('r',
-                                  "restart",
-                                  gettext_noop ("stop and start all GNUnet default services"),
-                                  &restart),
+                               "restart",
+                               gettext_noop ("stop and start all GNUnet default services"),
+                               &restart),
     GNUNET_GETOPT_option_flag ('d',
-                                  "delete",
-                                  gettext_noop ("delete config file and directory on exit"),
-                                  &delete),
-
+                               "delete",
+                               gettext_noop ("delete config file and directory on exit"),
+                               &delete),
     GNUNET_GETOPT_option_flag ('m',
-                                  "monitor",
-                                  gettext_noop ("monitor ARM activities"),
-                                  &monitor),
-
+                               "monitor",
+                               gettext_noop ("monitor ARM activities"),
+                               &monitor),
     GNUNET_GETOPT_option_flag ('q',
-                                  "quiet",
-                                  gettext_noop ("don't print status messages"),
-                                  &quiet),
-
+                               "quiet",
+                               gettext_noop ("don't print status messages"),
+                               &quiet),
     GNUNET_GETOPT_option_relative_time ('T',
-                                            "timeout",
-                                            "DELAY",
-                                            gettext_noop ("exit with error status if operation does not finish after DELAY"),
-                                            &timeout),
-
+                                        "timeout",
+                                        "DELAY",
+                                        gettext_noop ("exit with error status if operation does not finish after DELAY"),
+                                        &timeout),
     GNUNET_GETOPT_option_flag ('I',
-                                  "info",
-                                  gettext_noop ("list currently running services"),
-                                  &list), 
-
+                               "info",
+                               gettext_noop ("list currently running services"),
+                               &list), 
     GNUNET_GETOPT_option_flag ('O',
-                                  "no-stdout",
-                                  gettext_noop ("don't let gnunet-service-arm inherit standard output"),
-                                  &no_stdout),
-
+                               "no-stdout",
+                               gettext_noop ("don't let gnunet-service-arm inherit standard output"),
+                               &no_stdout),
     GNUNET_GETOPT_option_flag ('E',
-                                  "no-stderr",
-                                  gettext_noop ("don't let gnunet-service-arm inherit standard error"),
-                                  &no_stderr),
-
+                               "no-stderr",
+                               gettext_noop ("don't let gnunet-service-arm inherit standard error"),
+                               &no_stderr),
     GNUNET_GETOPT_OPTION_END
   };
 
-  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv,
-                                                 &argc, &argv))
+  if (GNUNET_OK !=
+      GNUNET_STRINGS_get_utf8_args (argc, argv,
+                                    &argc, &argv))
     return 2;
 
   if (GNUNET_OK ==
-      GNUNET_PROGRAM_run (argc, argv, "gnunet-arm",
+      GNUNET_PROGRAM_run (argc,
+                          argv,
+                          "gnunet-arm",
                           gettext_noop
                           ("Control services and the Automated Restart Manager (ARM)"),
-                          options, &run, NULL))
+                          options,
+                          &run, NULL))
   {
     GNUNET_free ((void *) argv);
     return ret;