fn = GNUNET_STRINGS_filename_expand (filename);
if (fn == NULL)
return GNUNET_SYSERR;
- GNUNET_DISK_directory_create_for_file (fn);
+ if (GNUNET_OK != GNUNET_DISK_directory_create_for_file (fn))
+ {
+ GNUNET_free (fn);
+ return GNUNET_SYSERR;
+ }
if (NULL == (fp = FOPEN (fn, "w")))
{
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "fopen", fn);
}
+/**
+ * Iterate over all sections in the configuration.
+ *
+ * @param cfg configuration to inspect
+ * @param iter function to call on each section
+ * @param iter_cls closure for iter
+ */
+void
+GNUNET_CONFIGURATION_iterate_sections (const struct GNUNET_CONFIGURATION_Handle *cfg,
+ GNUNET_CONFIGURATION_Section_Iterator iter,
+ void *iter_cls)
+{
+ struct ConfigSection *spos;
+
+ for (spos = cfg->sections; spos != NULL; spos = spos->next)
+ iter (iter_cls, spos->name);
+}
+
+
/**
* Copy a configuration value to the given target configuration.
* Overwrites existing entries.
escaped = escape_name (value);
nw = GNUNET_malloc (strlen (old) + strlen (escaped) + 2);
strcpy (nw, old);
- strcat (nw, " ");
+ if (strlen (old) > 0)
+ strcat (nw, " ");
strcat (nw, escaped);
GNUNET_CONFIGURATION_set_value_string (cfg, section, option, nw);
GNUNET_free (old);
}
old = end[0];
end[0] = '\0';
- if (strlen (pos) > 0)
- {
- if (0 == strcmp (pos, match))
- {
- memmove (pos, &end[1], strlen (&end[1]) + 1);
-
- if (pos != list)
- pos[-1] = ' '; /* previously changed to "\0" */
- GNUNET_CONFIGURATION_set_value_string (cfg,
- section, option, list);
- GNUNET_free (list);
- GNUNET_free (match);
- return GNUNET_OK;
- }
- }
+ if (0 == strcmp (pos, match))
+ {
+ if (old != '\0')
+ memmove (pos, &end[1], strlen (&end[1]) + 1);
+ else
+ {
+ if (pos != list)
+ pos[-1] = '\0';
+ else
+ pos[0] = '\0';
+ }
+ GNUNET_CONFIGURATION_set_value_string (cfg,
+ section, option, list);
+ GNUNET_free (list);
+ GNUNET_free (match);
+ return GNUNET_OK;
+ }
if (old == '\0')
break;
+ end[0] = old;
pos = end + 1;
}
GNUNET_free (list);
* system-specific configuration).
*
* @param cfg configuration to update
- * @param filename name of the configuration file
+ * @param filename name of the configuration file, NULL to load defaults
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int
(GNUNET_OK == GNUNET_CONFIGURATION_parse (cfg, filename)))))
{
GNUNET_free (baseconfig);
- return GNUNET_SYSERR;
+ return (filename == NULL) ? GNUNET_OK : GNUNET_SYSERR;
}
GNUNET_free (baseconfig);
if ( ((GNUNET_YES != GNUNET_CONFIGURATION_have_value (cfg,