X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=file.c;h=23ea9595974826c8a8cf85fb37909794c12d4a00;hp=980189fd1edf7597fa161e3ae2c5603851c07519;hb=28caa37a5d52cdf2a99201c32a9ccba59661a1af;hpb=71a0126dff93c4e7f81b9fe7d3629b4b706bd162 diff --git a/file.c b/file.c index 980189f..23ea959 100644 --- a/file.c +++ b/file.c @@ -16,8 +16,10 @@ * This file contains the code for parsing uci config files */ +#define _GNU_SOURCE #include #include +#include #include #include #include @@ -244,11 +246,16 @@ static char *next_arg(struct uci_context *ctx, char **str, bool required, bool n val = ptr = *str; skip_whitespace(ctx, str); parse_str(ctx, str, &ptr); - if (required && !*val) - uci_parse_error(ctx, *str, "insufficient arguments"); + if (!*val) { + if (required) + uci_parse_error(ctx, *str, "insufficient arguments"); + goto done; + } + if (name && !uci_validate_name(val)) uci_parse_error(ctx, val, "invalid character in field"); +done: return val; } @@ -261,7 +268,7 @@ static void assert_eol(struct uci_context *ctx, char **str) char *tmp; tmp = next_arg(ctx, str, false, false); - if (tmp && *tmp) + if (tmp && *tmp && (ctx->flags & UCI_FLAG_STRICT)) uci_parse_error(ctx, *str, "too many arguments"); } @@ -318,14 +325,60 @@ static void uci_parse_package(struct uci_context *ctx, char **str, bool single) uci_switch_config(ctx); } +/* Based on an efficient hash function published by D. J. Bernstein */ +static unsigned int djbhash(unsigned int hash, char *str) +{ + int len = strlen(str); + int i; + + /* initial value */ + if (hash == ~0) + hash = 5381; + + for(i = 0; i < len; i++) { + hash = ((hash << 5) + hash) + str[i]; + } + return (hash & 0x7FFFFFFF); +} + +/* fix up an unnamed section */ +static void uci_fixup_section(struct uci_context *ctx, struct uci_section *s) +{ + unsigned int hash = ~0; + struct uci_element *e; + char buf[16]; + + if (!s || s->e.name) + return; + + /* + * Generate a name for unnamed sections. This is used as reference + * when locating or updating the section from apps/scripts. + * To make multiple concurrent versions somewhat safe for updating, + * the name is generated from a hash of its type and name/value + * pairs of its option, and it is prefixed by a counter value. + * If the order of the unnamed sections changes for some reason, + * updates to them will be rejected. + */ + hash = djbhash(hash, s->type); + uci_foreach_element(&s->options, e) { + hash = djbhash(hash, e->name); + hash = djbhash(hash, uci_to_option(e)->value); + } + sprintf(buf, "cfg%02x%04x", ++s->package->n_section, hash % (1 << 16)); + s->e.name = uci_strdup(ctx, buf); +} + /* * parse the 'config' uci command (open a section) */ static void uci_parse_config(struct uci_context *ctx, char **str) { + struct uci_parse_context *pctx = ctx->pctx; char *name = NULL; char *type = NULL; + uci_fixup_section(ctx, ctx->pctx->section); if (!ctx->pctx->package) { if (!ctx->pctx->name) uci_parse_error(ctx, *str, "attempting to import a file without a package name"); @@ -339,7 +392,16 @@ static void uci_parse_config(struct uci_context *ctx, char **str) type = next_arg(ctx, str, true, true); name = next_arg(ctx, str, false, true); assert_eol(ctx, str); - ctx->pctx->section = uci_alloc_section(ctx->pctx->package, type, name); + + if (pctx->merge) { + UCI_TRAP_SAVE(ctx, error); + uci_set(ctx, pctx->package, name, NULL, type); + UCI_TRAP_RESTORE(ctx); + return; +error: + UCI_THROW(ctx, ctx->errno); + } else + pctx->section = uci_alloc_section(pctx->package, type, name); } /* @@ -347,10 +409,11 @@ static void uci_parse_config(struct uci_context *ctx, char **str) */ static void uci_parse_option(struct uci_context *ctx, char **str) { + struct uci_parse_context *pctx = ctx->pctx; char *name = NULL; char *value = NULL; - if (!ctx->pctx->section) + if (!pctx->section) uci_parse_error(ctx, *str, "option command found before the first section"); /* command string null-terminated by strtok */ @@ -359,7 +422,16 @@ static void uci_parse_option(struct uci_context *ctx, char **str) name = next_arg(ctx, str, true, true); value = next_arg(ctx, str, true, false); assert_eol(ctx, str); - uci_alloc_option(ctx->pctx->section, name, value); + + if (pctx->merge) { + UCI_TRAP_SAVE(ctx, error); + uci_set(ctx, pctx->package, pctx->section->e.name, name, value); + UCI_TRAP_RESTORE(ctx); + return; +error: + UCI_THROW(ctx, ctx->errno); + } else + uci_alloc_option(pctx->section, name, value); } @@ -453,7 +525,9 @@ static void uci_export_package(struct uci_package *p, FILE *stream, bool header) uci_foreach_element(&p->sections, s) { struct uci_section *sec = uci_to_section(s); fprintf(stream, "\nconfig '%s'", uci_escape(ctx, sec->type)); - fprintf(stream, " '%s'\n", uci_escape(ctx, sec->e.name)); + if (!sec->anonymous || (ctx->flags & UCI_FLAG_EXPORT_NAME)) + fprintf(stream, " '%s'", uci_escape(ctx, sec->e.name)); + fprintf(stream, "\n"); uci_foreach_element(&sec->options, o) { struct uci_option *opt = uci_to_option(o); fprintf(stream, "\toption '%s'", uci_escape(ctx, opt->e.name)); @@ -484,6 +558,7 @@ int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *packag int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package, bool single) { struct uci_parse_context *pctx; + UCI_HANDLE_ERR(ctx); /* make sure no memory from previous parse attempts is leaked */ uci_file_cleanup(ctx); @@ -491,14 +566,20 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context)); ctx->pctx = pctx; pctx->file = stream; + if (*package && single) { + pctx->package = *package; + pctx->merge = true; + } /* * If 'name' was supplied, assume that the supplied stream does not contain * the appropriate 'package ' string to specify the config name * NB: the config file can still override the package name */ - if (name) + if (name) { + UCI_ASSERT(ctx, uci_validate_name(name)); pctx->name = name; + } while (!feof(pctx->file)) { uci_getln(ctx, 0); @@ -515,8 +596,11 @@ error: UCI_THROW(ctx, ctx->errno); } + uci_fixup_section(ctx, ctx->pctx->section); if (package) *package = pctx->package; + if (pctx->merge) + pctx->package = NULL; pctx->name = NULL; uci_switch_config(ctx); @@ -585,6 +669,7 @@ static void uci_close_stream(FILE *stream) static void uci_parse_history_line(struct uci_context *ctx, struct uci_package *p, char *buf) { bool delete = false; + bool rename = false; char *package = NULL; char *section = NULL; char *option = NULL; @@ -593,20 +678,25 @@ static void uci_parse_history_line(struct uci_context *ctx, struct uci_package * if (buf[0] == '-') { delete = true; buf++; + } else if (buf[0] == '@') { + rename = true; + buf++; } UCI_INTERNAL(uci_parse_tuple, ctx, buf, &package, §ion, &option, &value); - if (!package || !section || (!delete && !value)) - goto error; - if (strcmp(package, p->e.name) != 0) + if (!package || (strcmp(package, p->e.name) != 0)) goto error; if (!uci_validate_name(section)) goto error; if (option && !uci_validate_name(option)) goto error; + if ((rename || !delete) && !uci_validate_name(value)) + goto error; - if (delete) - UCI_INTERNAL(uci_del, ctx, p, section, option); + if (rename) + UCI_INTERNAL(uci_rename, ctx, p, section, option, value); + else if (delete) + UCI_INTERNAL(uci_delete, ctx, p, section, option); else UCI_INTERNAL(uci_set, ctx, p, section, option, value); @@ -653,12 +743,14 @@ static void uci_load_history(struct uci_context *ctx, struct uci_package *p, boo if (!p->confdir) return; + if ((asprintf(&filename, "%s/%s", UCI_SAVEDIR, p->e.name) < 0) || !filename) UCI_THROW(ctx, UCI_ERR_MEM); UCI_TRAP_SAVE(ctx, done); f = uci_open_stream(ctx, filename, SEEK_SET, flush, false); - uci_parse_history(ctx, f, p); + if (p) + uci_parse_history(ctx, f, p); UCI_TRAP_RESTORE(ctx); done: @@ -673,6 +765,17 @@ done: } +static char *uci_config_path(struct uci_context *ctx, const char *name) +{ + char *filename; + + UCI_ASSERT(ctx, uci_validate_name(name)); + filename = uci_malloc(ctx, strlen(name) + sizeof(UCI_CONFDIR) + 2); + sprintf(filename, UCI_CONFDIR "/%s", name); + + return filename; +} + int uci_load(struct uci_context *ctx, const char *name, struct uci_package **package) { char *filename; @@ -680,7 +783,6 @@ int uci_load(struct uci_context *ctx, const char *name, struct uci_package **pac FILE *file = NULL; UCI_HANDLE_ERR(ctx); - UCI_ASSERT(ctx, name != NULL); switch (name[0]) { case '.': @@ -696,10 +798,7 @@ int uci_load(struct uci_context *ctx, const char *name, struct uci_package **pac break; default: /* config in /etc/config */ - if (strchr(name, '/')) - UCI_THROW(ctx, UCI_ERR_INVAL); - filename = uci_malloc(ctx, strlen(name) + sizeof(UCI_CONFDIR) + 2); - sprintf(filename, UCI_CONFDIR "/%s", name); + filename = uci_config_path(ctx, name); confdir = true; break; } @@ -707,7 +806,7 @@ int uci_load(struct uci_context *ctx, const char *name, struct uci_package **pac file = uci_open_stream(ctx, filename, SEEK_SET, false, false); ctx->errno = 0; UCI_TRAP_SAVE(ctx, done); - uci_import(ctx, file, name, package, true); + UCI_INTERNAL(uci_import, ctx, file, name, package, true); UCI_TRAP_RESTORE(ctx); if (*package) { @@ -737,7 +836,7 @@ int uci_save(struct uci_context *ctx, struct uci_package *p) * does not modify the uci_package pointer */ if (!p->confdir) - return uci_commit(ctx, &p); + return uci_commit(ctx, &p, false); if (uci_list_empty(&p->history)) return 0; @@ -755,6 +854,8 @@ int uci_save(struct uci_context *ctx, struct uci_package *p) if (h->cmd == UCI_CMD_REMOVE) fprintf(f, "-"); + else if (h->cmd == UCI_CMD_RENAME) + fprintf(f, "@"); fprintf(f, "%s.%s", p->e.name, h->section); if (e->name) @@ -777,7 +878,7 @@ done: return 0; } -int uci_commit(struct uci_context *ctx, struct uci_package **package) +int uci_commit(struct uci_context *ctx, struct uci_package **package, bool overwrite) { struct uci_package *p; FILE *f = NULL; @@ -789,7 +890,13 @@ int uci_commit(struct uci_context *ctx, struct uci_package **package) p = *package; UCI_ASSERT(ctx, p != NULL); - UCI_ASSERT(ctx, p->path != NULL); + if (!p->path) { + if (overwrite) + p->path = uci_config_path(ctx, p->e.name); + else + UCI_THROW(ctx, UCI_ERR_INVAL); + } + /* open the config file for writing now, so that it is locked */ f = uci_open_stream(ctx, p->path, SEEK_SET, true, true); @@ -797,23 +904,34 @@ int uci_commit(struct uci_context *ctx, struct uci_package **package) /* flush unsaved changes and reload from history file */ UCI_TRAP_SAVE(ctx, done); if (p->confdir) { - name = uci_strdup(ctx, p->e.name); - path = uci_strdup(ctx, p->path); - if (!uci_list_empty(&p->history)) - UCI_INTERNAL(uci_save, ctx, p); - uci_free_package(&p); - uci_file_cleanup(ctx); - UCI_INTERNAL(uci_import, ctx, f, name, &p, true); - - p->path = path; - p->confdir = true; - *package = p; - - /* freed together with the uci_package */ - path = NULL; - - /* check for updated history, just in case */ - uci_load_history(ctx, p, true); + if (!overwrite) { + name = uci_strdup(ctx, p->e.name); + path = uci_strdup(ctx, p->path); + /* dump our own changes to the history file */ + if (!uci_list_empty(&p->history)) + UCI_INTERNAL(uci_save, ctx, p); + + /* + * other processes might have modified the config + * as well. dump and reload + */ + uci_free_package(&p); + uci_file_cleanup(ctx); + UCI_INTERNAL(uci_import, ctx, f, name, &p, true); + + p->path = path; + p->confdir = true; + *package = p; + + /* freed together with the uci_package */ + path = NULL; + + /* check for updated history, just in case */ + uci_load_history(ctx, p, true); + } else { + /* flush history */ + uci_load_history(ctx, NULL, true); + } } rewind(f);