/**
- * Attempts to delete configuration file and SERVICEHOME
+ * Attempts to delete configuration file and GNUNET_HOME
* on ARM shutdown provided the end and delete options
* were specified when gnunet-arm was run.
*/
"Will attempt to remove configuration file %s and service directory %s\n",
config_file, dir);
- if (UNLINK (config_file) != 0)
+ if (0 != UNLINK (config_file))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to remove configuration file %s\n"), config_file);
+ _("Failed to remove configuration file %s\n"),
+ config_file);
}
- if (GNUNET_DISK_directory_remove (dir) != GNUNET_OK)
+ if (GNUNET_OK != GNUNET_DISK_directory_remove (dir))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to remove servicehome directory %s\n"), dir);
+ _("Failed to remove servicehome directory %s\n"),
+ dir);
}
}
GNUNET_ARM_monitor_disconnect_and_free (m);
m = NULL;
}
- if ((end == GNUNET_YES) && (delete == GNUNET_YES))
- delete_files ();
+ if ((GNUNET_YES == end) && (GNUNET_YES == delete))
+ delete_files ();
GNUNET_CONFIGURATION_destroy (cfg);
cfg = NULL;
}
if (GNUNET_ARM_REQUEST_SENT_OK != rs)
{
- GNUNET_asprintf (&msg, _("Failed to send a request to start the `%s' service: %%s\n"), init);
+ GNUNET_asprintf (&msg,
+ _("Failed to send a request to start the `%s' service: %%s\n"),
+ init);
FPRINTF (stdout, msg, req_string (rs));
GNUNET_free (msg);
GNUNET_SCHEDULER_shutdown ();
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Service %s [re]started successfully\n",
init);
+ GNUNET_free (init);
init = NULL;
GNUNET_SCHEDULER_add_now (&action_loop, NULL);
}
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Service %s stopped successfully\n", term);
+ "Service %s stopped successfully\n",
+ term);
+ GNUNET_free (term);
term = NULL;
GNUNET_SCHEDULER_add_now (&action_loop, NULL);
}
GNUNET_asprintf (&msg, "%s", _("Failed to request a list of services: %s\n"));
FPRINTF (stdout, msg, req_string (rs));
GNUNET_free (msg);
+ ret = 3;
GNUNET_SCHEDULER_shutdown ();
}
if (NULL == list)
{
FPRINTF (stderr, "%s", _("Error communicating with ARM. ARM not running?\n"));
GNUNET_SCHEDULER_shutdown ();
+ ret = 3;
return;
}
FPRINTF (stdout, "%s", _("Running services:\n"));
if (list)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Going to list all running services controlled by ARM.\n");
+ "Going to list all running services controlled by ARM.\n");
GNUNET_ARM_request_service_list (h,
(0 == timeout.rel_value_us) ? LIST_TIMEOUT : timeout,
&list_callback, &list);
cfg = GNUNET_CONFIGURATION_dup (c);
config_file = cfgfile;
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (cfg, "PATHS", "SERVICEHOME", &dir))
+ GNUNET_CONFIGURATION_get_value_string (cfg, "PATHS", "GNUNET_HOME", &dir))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "PATHS", "SERVICEHOME");
+ "PATHS", "GNUNET_HOME");
return;
}
if (NULL != cfgfile)