/*
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
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.
*/
/**
*/
#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__)
*/
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.
*
* @param cfg configuration to update
* @param mem the memory block of serialized configuration
* @param size the size of the memory block
- * @param allow_inline set to #GNUNET_YES if we recursively load configuration
- * from inlined configurations; #GNUNET_NO if not and raise warnings
+ * @param basedir set to path from which we recursively load configuration
+ * from inlined configurations; NULL 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,
const char *mem,
- const size_t size,
- int allow_inline)
+ size_t size,
+ const char *basedir)
{
char *line;
char *line_orig;
char *tag;
char *value;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Deserializing config file\n");
ret = GNUNET_OK;
section = GNUNET_strdup ("");
nr = 0;
{
/* @INLINE@ value */
value = &line[strlen ("@INLINE@ ")];
- if (GNUNET_YES == allow_inline)
+ if (NULL != basedir)
{
- if (GNUNET_OK != GNUNET_CONFIGURATION_parse (cfg, value))
+ char *fn;
+
+ GNUNET_asprintf (&fn,
+ "%s/%s",
+ basedir,
+ value);
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_parse (cfg,
+ fn))
{
+ GNUNET_free (fn);
ret = GNUNET_SYSERR; /* failed to parse included config */
break;
}
+ GNUNET_free (fn);
}
else
{
value = &line[1];
GNUNET_free (section);
section = GNUNET_strdup (value);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Config section `%s'\n",
- section);
continue;
}
if (NULL != (eq = strchr (line, '=')))
value[strlen (value) - 1] = '\0';
value++;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Config value %s=\"%s\"\n", tag, value);
GNUNET_CONFIGURATION_set_value_string (cfg, section, tag, &value[i]);
GNUNET_free (tag);
continue;
ret = GNUNET_SYSERR;
break;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Finished deserializing config\n");
GNUNET_free_non_null (line_orig);
GNUNET_free (section);
GNUNET_assert ( (GNUNET_OK != ret) || (r_bytes == size) );
*
* @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,
size_t fs;
char *fn;
char *mem;
+ char *endsep;
int dirty;
int ret;
+ ssize_t sret;
- 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,
+ "Asked to parse config file `%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);
+ "Error while determining the file size of `%s'\n",
+ fn);
GNUNET_free (fn);
return GNUNET_SYSERR;
}
}
fs = fs64;
mem = GNUNET_malloc (fs);
- if (fs != GNUNET_DISK_fn_read (fn, mem, fs))
+ sret = GNUNET_DISK_fn_read (fn,
+ mem,
+ fs);
+ if ( (sret < 0) ||
+ (fs != (size_t) sret) )
{
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);
+ endsep = strrchr (fn, (int) '/');
+ if (NULL != endsep)
+ *endsep = '\0';
+ ret = GNUNET_CONFIGURATION_deserialize (cfg,
+ mem,
+ fs,
+ fn);
GNUNET_free (fn);
- ret = GNUNET_CONFIGURATION_deserialize (cfg, mem, fs, GNUNET_YES);
GNUNET_free (mem);
/* restore dirty flag - anything we set in the meantime
* came from disk */
* 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)
{
len = GNUNET_asprintf (&cbuf, "[%s]\n", sec->name);
GNUNET_assert (0 < len);
- memcpy (mem + c_size, cbuf, len);
+ GNUNET_memcpy (mem + c_size, cbuf, len);
c_size += len;
GNUNET_free (cbuf);
for (ent = sec->entries; NULL != ent; ent = ent->next)
}
len = GNUNET_asprintf (&cbuf, "%s = %s\n", ent->key, val);
GNUNET_free (val);
- memcpy (mem + c_size, cbuf, len);
+ GNUNET_memcpy (mem + c_size, cbuf, len);
c_size += len;
GNUNET_free (cbuf);
}
}
- memcpy (mem + c_size, "\n", 1);
+ GNUNET_memcpy (mem + c_size, "\n", 1);
c_size ++;
sec = sec->next;
}
*
* @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,
char *fn;
char *cfg_buf;
size_t size;
+ ssize_t sret;
fn = GNUNET_STRINGS_filename_expand (filename);
if (fn == NULL)
return GNUNET_SYSERR;
}
cfg_buf = GNUNET_CONFIGURATION_serialize (cfg, &size);
- if (size != GNUNET_DISK_fn_write (fn, cfg_buf, size,
- GNUNET_DISK_PERM_USER_READ
- | GNUNET_DISK_PERM_USER_WRITE
- | GNUNET_DISK_PERM_GROUP_READ
- | GNUNET_DISK_PERM_GROUP_WRITE))
+ sret = GNUNET_DISK_fn_write (fn, cfg_buf, size,
+ GNUNET_DISK_PERM_USER_READ
+ | GNUNET_DISK_PERM_USER_WRITE
+ | GNUNET_DISK_PERM_GROUP_READ
+ | GNUNET_DISK_PERM_GROUP_WRITE);
+ if ( (sret < 0) ||
+ (size != (size_t) sret) )
{
GNUNET_free (fn);
GNUNET_free (cfg_buf);
LOG (GNUNET_ERROR_TYPE_WARNING,
- "Writing configration to file: %s failed\n", filename);
+ "Writing configration to file `%s' failed\n",
+ filename);
cfg->dirty = GNUNET_SYSERR; /* last write failed */
return GNUNET_SYSERR;
}
*
* @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,
* @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
*
* @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;
}
}
+
/**
* Remove the given section and all options in it.
*
* 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;
/**
* 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;
* @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)))
* (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)) )
/**
* 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;
struct ConfigEntry *e;
char *nv;
- e = findEntry (cfg, section, option);
+ e = find_entry (cfg, section, option);
if (NULL != e)
{
if (NULL == value)
}
return;
}
- sec = findSection (cfg, section);
+ sec = find_section (cfg, section);
if (sec == NULL)
{
sec = GNUNET_new (struct ConfigSection);
*/
void
GNUNET_CONFIGURATION_set_value_number (struct GNUNET_CONFIGURATION_Handle *cfg,
- const char *section, const char *option,
+ const char *section,
+ const char *option,
unsigned long long number)
{
char s[64];
- GNUNET_snprintf (s, 64, "%llu", number);
- GNUNET_CONFIGURATION_set_value_string (cfg, section, option, s);
+ GNUNET_snprintf (s,
+ 64,
+ "%llu",
+ number);
+ GNUNET_CONFIGURATION_set_value_string (cfg,
+ section,
+ option,
+ s);
}
* @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
{
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;
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.
* @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;
* @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;
* @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))) ||
+ if ( (NULL == (e = find_entry (cfg, section, option))) ||
(NULL == e->val) )
{
*value = NULL;
* @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))
{
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;
}
}
+/**
+ * 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
*/
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;
}
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,
return orig;
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Asked to $-expand %s\n", orig);
+ "Asked to $-expand %s\n",
+ orig);
if ('$' != orig[0])
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Doesn't start with $ - not expanding\n");
return orig;
}
+ erased_char = 0;
+ erased_pos = NULL;
if ('{' == orig[1])
{
start = &orig[2];
break;
}
}
+ erased_char = *end;
+ erased_pos = end;
*end = '\0';
post = end + 1;
def = strchr (orig, ':');
i = 0;
while ( (orig[i] != '/') &&
(orig[i] != '\\') &&
- (orig[i] != '\0') )
+ (orig[i] != '\0') &&
+ (orig[i] != ' ') )
i++;
if (orig[i] == '\0')
{
}
else
{
+ erased_char = orig[i];
+ erased_pos = &orig[i];
orig[i] = '\0';
post = &orig[i + 1];
}
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",
- start);
if (NULL == (env = getenv (start)))
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "`%s' is not an environment variable\n",
- start);
/* try default */
def = expand_dollar (cfg, def, depth + 1);
env = def;
}
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);
}
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Prefix is `%s'\n",
- prefix);
- result = GNUNET_malloc (strlen (prefix) + strlen (post) + 2);
+ prefix = GNUNET_CONFIGURATION_expand_dollar (cfg, prefix);
+ 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);
GNUNET_free (orig);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Expanded to `%s'\n",
- result);
return result;
}
* 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);
+ GNUNET_memcpy (orig + i, dup, len);
+ GNUNET_free (dup);
+ }
+ return orig;
}
* @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);
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;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Retrieved filename `%s', $-expanding\n", tmp);
tmp = GNUNET_CONFIGURATION_expand_dollar (cfg, tmp);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Expanded to filename `%s', *nix-expanding\n", tmp);
*value = GNUNET_STRINGS_filename_expand (tmp);
GNUNET_free (tmp);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Filename result is `%s'\n", *value);
if (*value == NULL)
return GNUNET_SYSERR;
return GNUNET_OK;
/**
* 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 };
* @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,
*
* @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)
* @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)
{
* @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
/**
- * 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)
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;
}
*
* @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,
}
-/**
- * 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 */
projects / oweals / gnunet.git / blobdiff