asserts

[oweals/gnunet.git] / src / util / configuration.c

diff --git a/src/util/configuration.c b/src/util/configuration.c
index bdcc231e17ab56504055eddbf749603e8d962285..a244d5f011b77a5eabd778a6d69e12a5a0a00c5d 100644 (file)
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -106,7 +106,7 @@ struct GNUNET_CONFIGURATION_Handle
 struct DiffHandle
 {
   const struct GNUNET_CONFIGURATION_Handle *cfgDefault;
-  const struct GNUNET_CONFIGURATION_Handle *cfgDiff;
+  struct GNUNET_CONFIGURATION_Handle *cfgDiff;
 };
 
 
@@ -209,7 +209,7 @@ GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg,
       if (1 == sscanf (line, "@INLINE@ %191[^\n]", value))
         {
           /* @INLINE@ value */
-          if (0 != GNUNET_CONFIGURATION_parse (cfg, value))
+          if (GNUNET_OK != GNUNET_CONFIGURATION_parse (cfg, value))
             ret = GNUNET_SYSERR;        /* failed to parse included config */
         }
       else if (1 == sscanf (line, "[%99[^]]]", value))
@@ -495,6 +495,7 @@ compareEntries (void *cls,
        (strcmp (entNew->val, value) == 0) )
     return;
   GNUNET_CONFIGURATION_set_value_string (dh->cfgDiff,
+                                        section,
                                         option,
                                         value);
 }
@@ -764,9 +765,9 @@ GNUNET_CONFIGURATION_expand_dollar (const struct GNUNET_CONFIGURATION_Handle
       orig[i] = '\0';
       post = &orig[i + 1];
     }
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg,
-                                                          "PATHS",
-                                                          &orig[1], &prefix))
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg,
+                                                           "PATHS",
+                                                           &orig[1], &prefix))
     {
       if (NULL == (env = getenv (&orig[1])))
         {
@@ -1143,6 +1144,14 @@ GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg,
       return GNUNET_SYSERR;
     }
   GNUNET_free (baseconfig);
+  if ( ((GNUNET_YES != GNUNET_CONFIGURATION_have_value (cfg,
+                                                       "PATHS",
+                                                       "DEFAULTCONFIG"))) &&
+       (filename != NULL) )
+    GNUNET_CONFIGURATION_set_value_string (cfg,
+                                          "PATHS",
+                                          "DEFAULTCONFIG",
+                                          filename);
   if ((GNUNET_YES == GNUNET_CONFIGURATION_have_value (cfg,
                                                       "TESTING",
                                                       "WEAKRANDOM")) &&