X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Fconfiguration.c;h=7f1d98902a33a9d9e76623c826f69b0f9b298189;hb=e20eca334a33b8340524a8fa6ad1d6b606e1dd0c;hp=768a8d19599415b87624b8ece06e0f4d049b393d;hpb=019338425afc502fc25aeb1896f404a6c0087a2e;p=oweals%2Fgnunet.git diff --git a/src/util/configuration.c b/src/util/configuration.c index 768a8d195..7f1d98902 100644 --- a/src/util/configuration.c +++ b/src/util/configuration.c @@ -145,16 +145,16 @@ GNUNET_CONFIGURATION_destroy (struct GNUNET_CONFIGURATION_Handle *cfg) * @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_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; @@ -228,13 +228,23 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg, { /* @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 { @@ -311,8 +321,10 @@ GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg, size_t fs; char *fn; char *mem; + char *endsep; int dirty; int ret; + ssize_t sret; fn = GNUNET_STRINGS_filename_expand (filename); LOG (GNUNET_ERROR_TYPE_DEBUG, @@ -322,7 +334,10 @@ GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg, 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", @@ -338,7 +353,11 @@ GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg, } 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"), @@ -350,8 +369,14 @@ GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg, 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 */ @@ -432,7 +457,7 @@ GNUNET_CONFIGURATION_serialize (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) @@ -449,12 +474,12 @@ GNUNET_CONFIGURATION_serialize (const struct GNUNET_CONFIGURATION_Handle *cfg, } 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; } @@ -478,6 +503,7 @@ 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) @@ -488,11 +514,13 @@ GNUNET_CONFIGURATION_write (struct GNUNET_CONFIGURATION_Handle *cfg, 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); @@ -674,7 +702,7 @@ GNUNET_CONFIGURATION_dup (const struct GNUNET_CONFIGURATION_Handle *cfg) */ static struct ConfigSection * find_section (const struct GNUNET_CONFIGURATION_Handle *cfg, - const char *section) + const char *section) { struct ConfigSection *pos; @@ -841,13 +869,20 @@ GNUNET_CONFIGURATION_set_value_string (struct GNUNET_CONFIGURATION_Handle *cfg, */ 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); } @@ -1291,7 +1326,7 @@ GNUNET_CONFIGURATION_expand_dollar (const struct GNUNET_CONFIGURATION_Handle *cf dup = expand_dollar (cfg, dup, 0); len = strlen (dup) + 1; orig = GNUNET_realloc (orig, i + len); - memcpy (orig + i, dup, len); + GNUNET_memcpy (orig + i, dup, len); GNUNET_free (dup); } return orig;