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;
+ struct uci_section *s;
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");
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_INTERNAL(uci_set, ctx, pctx->package, name, NULL, type);
+ else
+ pctx->section = uci_alloc_section(pctx->package, type, name);
}
/*
*/
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 */
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_INTERNAL(uci_set, ctx, pctx->package, pctx->section->e.name, name, value);
+ else
+ uci_alloc_option(pctx->section, name, value);
}
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)
+ 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));
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);
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
UCI_THROW(ctx, ctx->errno);
}
+ uci_fixup_section(ctx, ctx->pctx->section);
if (package)
*package = pctx->package;
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;
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 (option && !uci_validate_name(option))
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);
FILE *file = NULL;
UCI_HANDLE_ERR(ctx);
- UCI_ASSERT(ctx, name != NULL);
+ UCI_ASSERT(ctx, uci_validate_name(name));
switch (name[0]) {
case '.':
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) {
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)
projects / project / uci.git / blobdiff