migrating towards XDG configuration specification (#3000)

3 files changed, 13 insertions, 13 deletions

diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in
index b9a33242f..1b079c98c 100644
--- a/src/arm/arm.conf.in
+++ b/src/arm/arm.conf.in
@@ -2,7 +2,6 @@
 [arm]
 @UNIXONLY@ PORT = 2087
 HOSTNAME = localhost
-HOME = $SERVICEHOME
 BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -16,7 +15,7 @@ UNIX_MATCH_GID = YES
 # service.  Thus the following option would introduce per-service
 # logging with a new log file each day.  Note that only the last 3
 # log files are preserved.
-# GLOBAL_POSTFIX = -l $SERVICEHOME/{}-%Y-%m-%d.log
+# GLOBAL_POSTFIX = -l $GNUNET_CACHE_HOME/{}-%Y-%m-%d.log
 GLOBAL_PREFIX = @MONKEYPREFIX@
 # USERNAME =
 # MAXBUF =
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index 80d3e9c03..a492fac5b 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -147,7 +147,7 @@ static unsigned int no_stderr;
 
 
 /**
- * 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.
  */
@@ -158,15 +158,17 @@ delete_files ()
               "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);
 
   }
 }
@@ -192,8 +194,8 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     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;
 }
@@ -588,7 +590,7 @@ action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
       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);
@@ -673,10 +675,10 @@ run (void *cls,
   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)
diff --git a/src/arm/test_arm_api_data.conf b/src/arm/test_arm_api_data.conf
index 157a03027..1f1ac282f 100644
--- a/src/arm/test_arm_api_data.conf
+++ b/src/arm/test_arm_api_data.conf
@@ -16,7 +16,6 @@ PORT = 23355
 AUTOSTART = NO
 PORT = 2223
 HOSTNAME = localhost
-HOME = $SERVICEHOME
 BINARY = /will/be/overwritten/by/test_exponential_backoff
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;