X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Fconfiguration.c;h=af5d43fd0ec2795e1ba112fd7d1735657a248fce;hb=265d10682af1afce58988be998d62e1849a3e545;hp=1e516b825cd034468ac71d9edac3f0050cb3c382;hpb=25e37143ca6ddc3ea7d3c2e3fd7c66002a45e060;p=oweals%2Fgnunet.git diff --git a/src/util/configuration.c b/src/util/configuration.c index 1e516b825..af5d43fd0 100644 --- a/src/util/configuration.c +++ b/src/util/configuration.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2006, 2007, 2008, 2009, 2013 Christian Grothoff (and other contributing authors) + Copyright (C) 2006, 2007, 2008, 2009, 2013 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /** @@ -25,7 +25,10 @@ */ #include "platform.h" -#include "gnunet_util_lib.h" +#include "gnunet_crypto_lib.h" +#include "gnunet_strings_lib.h" +#include "gnunet_configuration_lib.h" +#include "gnunet_disk_lib.h" #define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__) @@ -102,12 +105,12 @@ struct GNUNET_CONFIGURATION_Handle */ struct DiffHandle { - const struct GNUNET_CONFIGURATION_Handle *cfgDefault; + const struct GNUNET_CONFIGURATION_Handle *cfg_default; + struct GNUNET_CONFIGURATION_Handle *cfgDiff; }; - /** * Create a GNUNET_CONFIGURATION_Handle. * @@ -145,7 +148,7 @@ GNUNET_CONFIGURATION_destroy (struct GNUNET_CONFIGURATION_Handle *cfg) * @param allow_inline set to #GNUNET_YES if we recursively load configuration * from inlined configurations; #GNUNET_NO if not and raise warnings * when we come across them - * @return #GNUNET_OK on success, #GNUNET_ERROR on error + * @return #GNUNET_OK on success, #GNUNET_SYSERR on error */ int GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg, @@ -304,7 +307,7 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg, * * @param cfg configuration to update * @param filename name of the configuration file - * @return GNUNET_OK on success, GNUNET_SYSERR on error + * @return #GNUNET_OK on success, #GNUNET_SYSERR on error */ int GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg, @@ -317,14 +320,18 @@ GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg, int dirty; int ret; - LOG (GNUNET_ERROR_TYPE_DEBUG, "Asked to parse config file `%s'\n", filename); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Asked to parse config file `%s'\n", + filename); fn = GNUNET_STRINGS_filename_expand (filename); - LOG (GNUNET_ERROR_TYPE_DEBUG, "Config file name expanded to `%s'\n", fn); - if (fn == NULL) + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Config file name expanded to `%s'\n", + fn); + if (NULL == fn) return GNUNET_SYSERR; dirty = cfg->dirty; /* back up value! */ if (GNUNET_SYSERR == - GNUNET_DISK_file_size (fn, &fs64, GNUNET_YES, GNUNET_YES)) + GNUNET_DISK_file_size (fn, &fs64, GNUNET_YES, GNUNET_YES)) { LOG (GNUNET_ERROR_TYPE_WARNING, "Error while determining the file size of %s\n", fn); @@ -342,12 +349,15 @@ GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg, if (fs != GNUNET_DISK_fn_read (fn, mem, fs)) { LOG (GNUNET_ERROR_TYPE_WARNING, - "Error while reading file %s\n", fn); + "Error while reading file %s\n", + fn); GNUNET_free (fn); GNUNET_free (mem); return GNUNET_SYSERR; } - LOG (GNUNET_ERROR_TYPE_DEBUG, "Deserializing contents of file `%s'\n", fn); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Deserializing contents of file `%s'\n", + fn); GNUNET_free (fn); ret = GNUNET_CONFIGURATION_deserialize (cfg, mem, fs, GNUNET_YES); GNUNET_free (mem); @@ -363,7 +373,7 @@ GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg, * changed since the last save. * * @param cfg configuration to inspect - * @return GNUNET_NO if clean, GNUNET_YES if dirty, GNUNET_SYSERR on error (i.e. last save failed) + * @return #GNUNET_NO if clean, #GNUNET_YES if dirty, #GNUNET_SYSERR on error (i.e. last save failed) */ int GNUNET_CONFIGURATION_is_dirty (const struct GNUNET_CONFIGURATION_Handle *cfg) @@ -467,7 +477,7 @@ GNUNET_CONFIGURATION_serialize (const struct GNUNET_CONFIGURATION_Handle *cfg, * * @param cfg configuration to write * @param filename where to write the configuration - * @return GNUNET_OK on success, GNUNET_SYSERR on error + * @return #GNUNET_OK on success, #GNUNET_SYSERR on error */ int GNUNET_CONFIGURATION_write (struct GNUNET_CONFIGURATION_Handle *cfg, @@ -511,7 +521,7 @@ GNUNET_CONFIGURATION_write (struct GNUNET_CONFIGURATION_Handle *cfg, * * @param cfg configuration to inspect * @param iter function to call on each option - * @param iter_cls closure for iter + * @param iter_cls closure for @a iter */ void GNUNET_CONFIGURATION_iterate (const struct GNUNET_CONFIGURATION_Handle *cfg, @@ -534,7 +544,7 @@ GNUNET_CONFIGURATION_iterate (const struct GNUNET_CONFIGURATION_Handle *cfg, * @param cfg configuration to inspect * @param section the section * @param iter function to call on each option - * @param iter_cls closure for iter + * @param iter_cls closure for @a iter */ void GNUNET_CONFIGURATION_iterate_section_values (const struct @@ -562,13 +572,12 @@ GNUNET_CONFIGURATION_iterate_section_values (const struct * * @param cfg configuration to inspect * @param iter function to call on each section - * @param iter_cls closure for iter + * @param iter_cls closure for @a iter */ void -GNUNET_CONFIGURATION_iterate_sections (const struct GNUNET_CONFIGURATION_Handle - *cfg, - GNUNET_CONFIGURATION_Section_Iterator - iter, void *iter_cls) +GNUNET_CONFIGURATION_iterate_sections (const struct GNUNET_CONFIGURATION_Handle *cfg, + GNUNET_CONFIGURATION_Section_Iterator iter, + void *iter_cls) { struct ConfigSection *spos; struct ConfigSection *next; @@ -582,6 +591,7 @@ GNUNET_CONFIGURATION_iterate_sections (const struct GNUNET_CONFIGURATION_Handle } } + /** * Remove the given section and all options in it. * @@ -628,13 +638,15 @@ GNUNET_CONFIGURATION_remove_section (struct GNUNET_CONFIGURATION_Handle *cfg, * Copy a configuration value to the given target configuration. * Overwrites existing entries. * - * @param cls the destination configuration (struct GNUNET_CONFIGURATION_Handle*) + * @param cls the destination configuration (`struct GNUNET_CONFIGURATION_Handle *`) * @param section section for the value * @param option option name of the value * @param value value to copy */ static void -copy_entry (void *cls, const char *section, const char *option, +copy_entry (void *cls, + const char *section, + const char *option, const char *value) { struct GNUNET_CONFIGURATION_Handle *dst = cls; @@ -663,12 +675,13 @@ GNUNET_CONFIGURATION_dup (const struct GNUNET_CONFIGURATION_Handle *cfg) /** * Find a section entry from a configuration. * - * @param cfg FIXME - * @param section FIXME + * @param cfg configuration to search in + * @param section name of the section to look for * @return matching entry, NULL if not found */ static struct ConfigSection * -findSection (const struct GNUNET_CONFIGURATION_Handle *cfg, const char *section) +find_section (const struct GNUNET_CONFIGURATION_Handle *cfg, + const char *section) { struct ConfigSection *pos; @@ -688,13 +701,14 @@ findSection (const struct GNUNET_CONFIGURATION_Handle *cfg, const char *section) * @return matching entry, NULL if not found */ static struct ConfigEntry * -findEntry (const struct GNUNET_CONFIGURATION_Handle *cfg, const char *section, +find_entry (const struct GNUNET_CONFIGURATION_Handle *cfg, + const char *section, const char *key) { struct ConfigSection *sec; struct ConfigEntry *pos; - if (NULL == (sec = findSection (cfg, section))) + if (NULL == (sec = find_section (cfg, section))) return NULL; pos = sec->entries; while ((pos != NULL) && (0 != strcasecmp (key, pos->key))) @@ -708,19 +722,21 @@ findEntry (const struct GNUNET_CONFIGURATION_Handle *cfg, const char *section, * (default against a new configuration) and write the diffs in a * diff-configuration object (the callback object). * - * @param cls the diff configuration (struct DiffHandle*) + * @param cls the diff configuration (`struct DiffHandle *`) * @param section section for the value (of the default conf.) * @param option option name of the value (of the default conf.) * @param value value to copy (of the default conf.) */ static void -compare_entries (void *cls, const char *section, const char *option, +compare_entries (void *cls, + const char *section, + const char *option, const char *value) { struct DiffHandle *dh = cls; struct ConfigEntry *entNew; - entNew = findEntry (dh->cfgDefault, section, option); + entNew = find_entry (dh->cfg_default, section, option); if ( (NULL != entNew) && (NULL != entNew->val) && (0 == strcmp (entNew->val, value)) ) @@ -732,42 +748,41 @@ compare_entries (void *cls, const char *section, const char *option, /** * Compute configuration with only entries that have been changed * - * @param cfgDefault original configuration - * @param cfgNew new configuration + * @param cfg_default original configuration + * @param cfg_new new configuration * @return configuration with only the differences, never NULL */ struct GNUNET_CONFIGURATION_Handle * -GNUNET_CONFIGURATION_get_diff (const struct GNUNET_CONFIGURATION_Handle - *cfgDefault, - const struct GNUNET_CONFIGURATION_Handle - *cfgNew) +GNUNET_CONFIGURATION_get_diff (const struct GNUNET_CONFIGURATION_Handle *cfg_default, + const struct GNUNET_CONFIGURATION_Handle *cfg_new) { struct DiffHandle diffHandle; diffHandle.cfgDiff = GNUNET_CONFIGURATION_create (); - diffHandle.cfgDefault = cfgDefault; - GNUNET_CONFIGURATION_iterate (cfgNew, &compare_entries, &diffHandle); + diffHandle.cfg_default = cfg_default; + GNUNET_CONFIGURATION_iterate (cfg_new, &compare_entries, &diffHandle); return diffHandle.cfgDiff; } /** * Write only configuration entries that have been changed to configuration file - * @param cfgDefault default configuration - * @param cfgNew new configuration + * + * @param cfg_default default configuration + * @param cfg_new new configuration * @param filename where to write the configuration diff between default and new - * @return GNUNET_OK on success, GNUNET_SYSERR on error + * @return #GNUNET_OK on success, #GNUNET_SYSERR on error */ int GNUNET_CONFIGURATION_write_diffs (const struct GNUNET_CONFIGURATION_Handle - *cfgDefault, + *cfg_default, const struct GNUNET_CONFIGURATION_Handle - *cfgNew, const char *filename) + *cfg_new, const char *filename) { int ret; struct GNUNET_CONFIGURATION_Handle *diff; - diff = GNUNET_CONFIGURATION_get_diff (cfgDefault, cfgNew); + diff = GNUNET_CONFIGURATION_get_diff (cfg_default, cfg_new); ret = GNUNET_CONFIGURATION_write (diff, filename); GNUNET_CONFIGURATION_destroy (diff); return ret; @@ -791,7 +806,7 @@ GNUNET_CONFIGURATION_set_value_string (struct GNUNET_CONFIGURATION_Handle *cfg, struct ConfigEntry *e; char *nv; - e = findEntry (cfg, section, option); + e = find_entry (cfg, section, option); if (NULL != e) { if (NULL == value) @@ -807,7 +822,7 @@ GNUNET_CONFIGURATION_set_value_string (struct GNUNET_CONFIGURATION_Handle *cfg, } return; } - sec = findSection (cfg, section); + sec = find_section (cfg, section); if (sec == NULL) { sec = GNUNET_new (struct ConfigSection); @@ -850,7 +865,7 @@ GNUNET_CONFIGURATION_set_value_number (struct GNUNET_CONFIGURATION_Handle *cfg, * @param section section of interest * @param option option of interest * @param number where to store the numeric value of the option - * @return GNUNET_OK on success, GNUNET_SYSERR on error + * @return #GNUNET_OK on success, #GNUNET_SYSERR on error */ int GNUNET_CONFIGURATION_get_value_number (const struct GNUNET_CONFIGURATION_Handle @@ -860,7 +875,7 @@ GNUNET_CONFIGURATION_get_value_number (const struct GNUNET_CONFIGURATION_Handle { struct ConfigEntry *e; - if (NULL == (e = findEntry (cfg, section, option))) + if (NULL == (e = find_entry (cfg, section, option))) return GNUNET_SYSERR; if (NULL == e->val) return GNUNET_SYSERR; @@ -869,6 +884,33 @@ GNUNET_CONFIGURATION_get_value_number (const struct GNUNET_CONFIGURATION_Handle return GNUNET_OK; } +/** + * Get a configuration value that should be a floating point number. + * + * @param cfg configuration to inspect + * @param section section of interest + * @param option option of interest + * @param number where to store the floating value of the option + * @return #GNUNET_OK on success, #GNUNET_SYSERR on error + */ +int +GNUNET_CONFIGURATION_get_value_float (const struct GNUNET_CONFIGURATION_Handle + *cfg, const char *section, + const char *option, + float *number) +{ + struct ConfigEntry *e; + + if (NULL == (e = find_entry (cfg, section, option))) + return GNUNET_SYSERR; + if (NULL == e->val) + return GNUNET_SYSERR; + if (1 != SSCANF (e->val, "%f", number)) + return GNUNET_SYSERR; + return GNUNET_OK; +} + + /** * Get a configuration value that should be a relative time. @@ -877,17 +919,17 @@ GNUNET_CONFIGURATION_get_value_number (const struct GNUNET_CONFIGURATION_Handle * @param section section of interest * @param option option of interest * @param time set to the time value stored in the configuration - * @return GNUNET_OK on success, GNUNET_SYSERR on error + * @return #GNUNET_OK on success, #GNUNET_SYSERR on error */ int -GNUNET_CONFIGURATION_get_value_time (const struct GNUNET_CONFIGURATION_Handle - *cfg, const char *section, +GNUNET_CONFIGURATION_get_value_time (const struct GNUNET_CONFIGURATION_Handle *cfg, + const char *section, const char *option, struct GNUNET_TIME_Relative *time) { struct ConfigEntry *e; - if (NULL == (e = findEntry (cfg, section, option))) + if (NULL == (e = find_entry (cfg, section, option))) return GNUNET_SYSERR; if (NULL == e->val) return GNUNET_SYSERR; @@ -902,17 +944,17 @@ GNUNET_CONFIGURATION_get_value_time (const struct GNUNET_CONFIGURATION_Handle * @param section section of interest * @param option option of interest * @param size set to the size in bytes as stored in the configuration - * @return GNUNET_OK on success, GNUNET_SYSERR on error + * @return #GNUNET_OK on success, #GNUNET_SYSERR on error */ int -GNUNET_CONFIGURATION_get_value_size (const struct GNUNET_CONFIGURATION_Handle - *cfg, const char *section, +GNUNET_CONFIGURATION_get_value_size (const struct GNUNET_CONFIGURATION_Handle *cfg, + const char *section, const char *option, unsigned long long *size) { struct ConfigEntry *e; - if (NULL == (e = findEntry (cfg, section, option))) + if (NULL == (e = find_entry (cfg, section, option))) return GNUNET_SYSERR; if (NULL == e->val) return GNUNET_SYSERR; @@ -928,17 +970,21 @@ GNUNET_CONFIGURATION_get_value_size (const struct GNUNET_CONFIGURATION_Handle * @param option option of interest * @param value will be set to a freshly allocated configuration * value, or NULL if option is not specified - * @return GNUNET_OK on success, GNUNET_SYSERR on error + * @return #GNUNET_OK on success, #GNUNET_SYSERR on error */ int -GNUNET_CONFIGURATION_get_value_string (const struct GNUNET_CONFIGURATION_Handle - *cfg, const char *section, - const char *option, char **value) +GNUNET_CONFIGURATION_get_value_string (const struct GNUNET_CONFIGURATION_Handle *cfg, + const char *section, + const char *option, + char **value) { struct ConfigEntry *e; - LOG (GNUNET_ERROR_TYPE_DEBUG, "Asked to retrieve string `%s' in section `%s'\n", option, section); - if ( (NULL == (e = findEntry (cfg, section, option))) || + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Asked to retrieve string `%s' in section `%s'\n", + option, + section); + if ( (NULL == (e = find_entry (cfg, section, option))) || (NULL == e->val) ) { *value = NULL; @@ -959,18 +1005,19 @@ GNUNET_CONFIGURATION_get_value_string (const struct GNUNET_CONFIGURATION_Handle * @param choices NULL-terminated list of legal values * @param value will be set to an entry in the legal list, * or NULL if option is not specified and no default given - * @return GNUNET_OK on success, GNUNET_SYSERR on error + * @return #GNUNET_OK on success, #GNUNET_SYSERR on error */ int -GNUNET_CONFIGURATION_get_value_choice (const struct GNUNET_CONFIGURATION_Handle - *cfg, const char *section, - const char *option, const char *const *choices, +GNUNET_CONFIGURATION_get_value_choice (const struct GNUNET_CONFIGURATION_Handle *cfg, + const char *section, + const char *option, + const char *const *choices, const char **value) { struct ConfigEntry *e; unsigned int i; - if (NULL == (e = findEntry (cfg, section, option))) + if (NULL == (e = find_entry (cfg, section, option))) return GNUNET_SYSERR; for (i = 0; NULL != choices[i]; i++) if (0 == strcasecmp (choices[i], e->val)) @@ -979,7 +1026,9 @@ GNUNET_CONFIGURATION_get_value_choice (const struct GNUNET_CONFIGURATION_Handle { LOG (GNUNET_ERROR_TYPE_ERROR, _("Configuration value '%s' for '%s'" - " in section '%s' is not in set of legal choices\n"), e->val, option, + " in section '%s' is not in set of legal choices\n"), + e->val, + option, section); return GNUNET_SYSERR; } @@ -988,8 +1037,57 @@ GNUNET_CONFIGURATION_get_value_choice (const struct GNUNET_CONFIGURATION_Handle } +/** + * Get crockford32-encoded fixed-size binary data from a configuration. + * + * @param cfg configuration to access + * @param section section to access + * @param option option to access + * @param buf where to store the decoded binary result + * @param buf_size exact number of bytes to store in @a buf + * @return #GNUNET_OK on success + * #GNUNET_NO is the value does not exist + * #GNUNET_SYSERR on decoding error + */ +int +GNUNET_CONFIGURATION_get_data (const struct GNUNET_CONFIGURATION_Handle *cfg, + const char *section, + const char *option, + void *buf, + size_t buf_size) +{ + char *enc; + int res; + size_t data_size; + + if (GNUNET_OK != + (res = GNUNET_CONFIGURATION_get_value_string (cfg, + section, + option, + &enc))) + return res; + data_size = (strlen (enc) * 5) / 8; + if (data_size != buf_size) + { + GNUNET_free (enc); + return GNUNET_SYSERR; + } + if (GNUNET_OK != + GNUNET_STRINGS_string_to_data (enc, + strlen (enc), + buf, buf_size)) + { + GNUNET_free (enc); + return GNUNET_SYSERR; + } + GNUNET_free (enc); + return GNUNET_OK; +} + + /** * Test if we have a value for a particular option + * * @param cfg configuration to inspect * @param section section of interest * @param option option of interest @@ -997,11 +1095,12 @@ GNUNET_CONFIGURATION_get_value_choice (const struct GNUNET_CONFIGURATION_Handle */ int GNUNET_CONFIGURATION_have_value (const struct GNUNET_CONFIGURATION_Handle *cfg, - const char *section, const char *option) + const char *section, + const char *option) { struct ConfigEntry *e; - if ((NULL == (e = findEntry (cfg, section, option))) || (NULL == e->val)) + if ((NULL == (e = find_entry (cfg, section, option))) || (NULL == e->val)) return GNUNET_NO; return GNUNET_YES; } @@ -1036,7 +1135,12 @@ expand_dollar (const struct GNUNET_CONFIGURATION_Handle *cfg, char *def; char *end; unsigned int lopen; + char erased_char; + char *erased_pos; + size_t len; + if (NULL == orig) + return NULL; if (depth > 128) { LOG (GNUNET_ERROR_TYPE_WARNING, @@ -1052,6 +1156,8 @@ expand_dollar (const struct GNUNET_CONFIGURATION_Handle *cfg, "Doesn't start with $ - not expanding\n"); return orig; } + erased_char = 0; + erased_pos = NULL; if ('{' == orig[1]) { start = &orig[2]; @@ -1078,6 +1184,8 @@ expand_dollar (const struct GNUNET_CONFIGURATION_Handle *cfg, break; } } + erased_char = *end; + erased_pos = end; *end = '\0'; post = end + 1; def = strchr (orig, ':'); @@ -1098,7 +1206,8 @@ expand_dollar (const struct GNUNET_CONFIGURATION_Handle *cfg, i = 0; while ( (orig[i] != '/') && (orig[i] != '\\') && - (orig[i] != '\0') ) + (orig[i] != '\0') && + (orig[i] != ' ') ) i++; if (orig[i] == '\0') { @@ -1106,6 +1215,8 @@ expand_dollar (const struct GNUNET_CONFIGURATION_Handle *cfg, } else { + erased_char = orig[i]; + erased_pos = &orig[i]; orig[i] = '\0'; post = &orig[i + 1]; } @@ -1116,10 +1227,10 @@ expand_dollar (const struct GNUNET_CONFIGURATION_Handle *cfg, post, def); if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_filename (cfg, - "PATHS", - start, - &prefix)) + GNUNET_CONFIGURATION_get_value_string (cfg, + "PATHS", + start, + &prefix)) { LOG (GNUNET_ERROR_TYPE_DEBUG, "Filename for `%s' is not in PATHS config section\n", @@ -1135,23 +1246,30 @@ expand_dollar (const struct GNUNET_CONFIGURATION_Handle *cfg, } if (NULL == env) { - orig[strlen (orig)] = DIR_SEPARATOR; - LOG (GNUNET_ERROR_TYPE_DEBUG, - "Expanded to `%s' (returning orig)\n", - orig); + start = GNUNET_strdup (start); + if (erased_pos) + *erased_pos = erased_char; + LOG (GNUNET_ERROR_TYPE_WARNING, + _("Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined as an environmental variable\n"), + start, orig); + GNUNET_free (start); return orig; } prefix = GNUNET_strdup (env); } + prefix = GNUNET_CONFIGURATION_expand_dollar (cfg, prefix); LOG (GNUNET_ERROR_TYPE_DEBUG, "Prefix is `%s'\n", prefix); - result = GNUNET_malloc (strlen (prefix) + strlen (post) + 2); + if ( (erased_pos) && ('}' != erased_char) ) + { + len = strlen (prefix) + 1; + prefix = GNUNET_realloc (prefix, len + 1); + prefix[len - 1] = erased_char; + prefix[len] = '\0'; + } + result = GNUNET_malloc (strlen (prefix) + strlen (post) + 1); strcpy (result, prefix); - if ( (0 == strlen (prefix)) || - ( (prefix[strlen (prefix) - 1] != DIR_SEPARATOR) && - (strlen (post) > 0) ) ) - strcat (result, DIR_SEPARATOR_STR); strcat (result, post); GNUNET_free_non_null (def); GNUNET_free (prefix); @@ -1174,14 +1292,31 @@ expand_dollar (const struct GNUNET_CONFIGURATION_Handle *cfg, * to VAR2. * * @param cfg configuration to use for path expansion - * @param orig string to $-expand (will be freed!) + * @param orig string to $-expand (will be freed!). Note that multiple + * $-expressions can be present in this string. They will all be + * $-expanded. * @return $-expanded string */ char * GNUNET_CONFIGURATION_expand_dollar (const struct GNUNET_CONFIGURATION_Handle *cfg, char *orig) { - return expand_dollar (cfg, orig, 0); + char *dup; + size_t i; + size_t len; + + for (i = 0; '\0' != orig[i]; i++) + { + if ('$' != orig[i]) + continue; + dup = GNUNET_strdup (orig + i); + dup = expand_dollar (cfg, dup, 0); + len = strlen (dup) + 1; + orig = GNUNET_realloc (orig, i + len); + memcpy (orig + i, dup, len); + GNUNET_free (dup); + } + return orig; } @@ -1193,21 +1328,25 @@ GNUNET_CONFIGURATION_expand_dollar (const struct GNUNET_CONFIGURATION_Handle *cf * @param option option of interest * @param value will be set to a freshly allocated configuration * value, or NULL if option is not specified - * @return GNUNET_OK on success, GNUNET_SYSERR on error + * @return #GNUNET_OK on success, #GNUNET_SYSERR on error */ int -GNUNET_CONFIGURATION_get_value_filename (const struct - GNUNET_CONFIGURATION_Handle *cfg, +GNUNET_CONFIGURATION_get_value_filename (const struct GNUNET_CONFIGURATION_Handle *cfg, const char *section, - const char *option, char **value) + const char *option, + char **value) { char *tmp; - LOG (GNUNET_ERROR_TYPE_DEBUG, "Asked to retrieve filename `%s' in section `%s'\n", option, section); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Asked to retrieve filename `%s' in section `%s'\n", + option, + section); if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, section, option, &tmp)) { - LOG (GNUNET_ERROR_TYPE_DEBUG, "Failed to retrieve filename\n"); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Failed to retrieve filename\n"); *value = NULL; return GNUNET_SYSERR; } @@ -1225,16 +1364,16 @@ GNUNET_CONFIGURATION_get_value_filename (const struct /** * Get a configuration value that should be in a set of - * "GNUNET_YES" or "GNUNET_NO". + * "YES" or "NO". * * @param cfg configuration to inspect * @param section section of interest * @param option option of interest - * @return GNUNET_YES, GNUNET_NO or GNUNET_SYSERR + * @return #GNUNET_YES, #GNUNET_NO or #GNUNET_SYSERR */ int -GNUNET_CONFIGURATION_get_value_yesno (const struct GNUNET_CONFIGURATION_Handle - *cfg, const char *section, +GNUNET_CONFIGURATION_get_value_yesno (const struct GNUNET_CONFIGURATION_Handle *cfg, + const char *section, const char *option) { static const char *yesno[] = { "YES", "NO", NULL }; @@ -1258,12 +1397,11 @@ GNUNET_CONFIGURATION_get_value_yesno (const struct GNUNET_CONFIGURATION_Handle * @param section section of interest * @param option option of interest * @param cb function to call on each filename - * @param cb_cls closure for cb + * @param cb_cls closure for @a cb * @return number of filenames iterated over, -1 on error */ int -GNUNET_CONFIGURATION_iterate_value_filenames (const struct - GNUNET_CONFIGURATION_Handle *cfg, +GNUNET_CONFIGURATION_iterate_value_filenames (const struct GNUNET_CONFIGURATION_Handle *cfg, const char *section, const char *option, GNUNET_FileNameCallback cb, @@ -1369,7 +1507,7 @@ escape_name (const char *value) * * @param cls string we compare with (const char*) * @param fn filename we are currently looking at - * @return GNUNET_OK if the names do not match, GNUNET_SYSERR if they do + * @return #GNUNET_OK if the names do not match, #GNUNET_SYSERR if they do */ static int test_match (void *cls, const char *fn) @@ -1388,13 +1526,13 @@ test_match (void *cls, const char *fn) * @param section section of interest * @param option option of interest * @param value filename to append - * @return GNUNET_OK on success, - * GNUNET_NO if the filename already in the list - * GNUNET_SYSERR on error + * @return #GNUNET_OK on success, + * #GNUNET_NO if the filename already in the list + * #GNUNET_SYSERR on error */ int -GNUNET_CONFIGURATION_append_value_filename (struct GNUNET_CONFIGURATION_Handle - *cfg, const char *section, +GNUNET_CONFIGURATION_append_value_filename (struct GNUNET_CONFIGURATION_Handle *cfg, + const char *section, const char *option, const char *value) { @@ -1432,9 +1570,9 @@ GNUNET_CONFIGURATION_append_value_filename (struct GNUNET_CONFIGURATION_Handle * @param section section of interest * @param option option of interest * @param value filename to remove - * @return GNUNET_OK on success, - * GNUNET_NO if the filename is not in the list, - * GNUNET_SYSERR on error + * @return #GNUNET_OK on success, + * #GNUNET_NO if the filename is not in the list, + * #GNUNET_SYSERR on error */ int GNUNET_CONFIGURATION_remove_value_filename (struct GNUNET_CONFIGURATION_Handle @@ -1510,11 +1648,13 @@ GNUNET_CONFIGURATION_remove_value_filename (struct GNUNET_CONFIGURATION_Handle /** - * Wrapper around GNUNET_CONFIGURATION_parse. + * Wrapper around #GNUNET_CONFIGURATION_parse. Called on each + * file in a directory, we trigger parsing on those files that + * end with ".conf". * * @param cls the cfg * @param filename file to parse - * @return GNUNET_OK on success + * @return #GNUNET_OK on success */ static int parse_configuration_file (void *cls, const char *filename) @@ -1527,7 +1667,9 @@ parse_configuration_file (void *cls, const char *filename) ext = strrchr (filename, '.'); if ((NULL == ext) || (0 != strcmp (ext, ".conf"))) { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Skipping file `%s'\n", filename); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Skipping file `%s'\n", + filename); return GNUNET_OK; } @@ -1542,7 +1684,7 @@ parse_configuration_file (void *cls, const char *filename) * * @param cfg configuration to update * @param defaults_d directory with the defaults - * @return GNUNET_OK on success, GNUNET_SYSERR on error + * @return #GNUNET_OK on success, #GNUNET_SYSERR on error */ int GNUNET_CONFIGURATION_load_from (struct GNUNET_CONFIGURATION_Handle *cfg, @@ -1555,48 +1697,4 @@ GNUNET_CONFIGURATION_load_from (struct GNUNET_CONFIGURATION_Handle *cfg, } -/** - * Load configuration (starts with defaults, then loads - * system-specific configuration). - * - * @param cfg configuration to update - * @param filename name of the configuration file, NULL to load defaults - * @return GNUNET_OK on success, GNUNET_SYSERR on error - */ -int -GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg, - const char *filename) -{ - char *baseconfig; - char *ipath; - - ipath = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR); - if (ipath == NULL) - return GNUNET_SYSERR; - baseconfig = NULL; - GNUNET_asprintf (&baseconfig, "%s%s", ipath, "config.d"); - GNUNET_free (ipath); - if (GNUNET_SYSERR == - GNUNET_DISK_directory_scan (baseconfig, &parse_configuration_file, cfg)) - { - GNUNET_free (baseconfig); - return GNUNET_SYSERR; /* no configuration at all found */ - } - GNUNET_free (baseconfig); - if ((filename != NULL) && - (GNUNET_OK != GNUNET_CONFIGURATION_parse (cfg, filename))) - { - /* specified configuration not found */ - return GNUNET_SYSERR; - } - if (((GNUNET_YES != - GNUNET_CONFIGURATION_have_value (cfg, "PATHS", "DEFAULTCONFIG"))) && - (filename != NULL)) - GNUNET_CONFIGURATION_set_value_string (cfg, "PATHS", "DEFAULTCONFIG", - filename); - return GNUNET_OK; -} - - - /* end of configuration.c */