* libuci - Library for the Unified Configuration Interface
* Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
*
- * this program is free software; you can redistribute it and/or modify
- * it under the terms of the gnu lesser general public license version 2.1
- * as published by the free software foundation
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1
+ * as published by the Free Software Foundation
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
error:
free(ptr);
- UCI_THROW(ctx, ctx->errno);
+ UCI_THROW(ctx, ctx->err);
done:
return e;
uci_free_element(&o->e);
}
+/* fix up an unnamed section, e.g. after adding options to it */
+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);
+}
+
static struct uci_section *
uci_alloc_section(struct uci_package *p, const char *type, const char *name)
{
strcpy(s->type, type);
if (name == NULL)
s->anonymous = true;
+ p->n_section++;
uci_list_add(&p->sections, &s->e.list);
uci_free_element(&s->e);
}
-/* record a change that was done to a package */
-static void
-uci_add_history(struct uci_context *ctx, struct uci_package *p, int cmd, char *section, char *option, char *value)
-{
- struct uci_history *h;
- int size = strlen(section) + 1;
- char *ptr;
-
- if (!p->confdir)
- return;
-
- if (value)
- size += strlen(section) + 1;
-
- h = uci_alloc_element(ctx, history, option, size);
- ptr = uci_dataptr(h);
- h->cmd = cmd;
- h->section = strcpy(ptr, section);
- if (value) {
- ptr += strlen(ptr) + 1;
- h->value = strcpy(ptr, value);
- }
- uci_list_add(&p->history, &h->e.list);
-}
-
-static void
-uci_free_history(struct uci_history *h)
-{
- if (!h)
- return;
- if ((h->section != NULL) &&
- (h->section != uci_dataptr(h))) {
- free(h->section);
- free(h->value);
- }
- uci_free_element(&h->e);
-}
-
-static struct uci_package *
+__plugin struct uci_package *
uci_alloc_package(struct uci_context *ctx, const char *name)
{
struct uci_package *p;
p->ctx = ctx;
uci_list_init(&p->sections);
uci_list_init(&p->history);
+ uci_list_init(&p->saved_history);
return p;
}
uci_foreach_element_safe(&p->history, tmp, e) {
uci_free_history(uci_to_history(e));
}
+ uci_foreach_element_safe(&p->saved_history, tmp, e) {
+ uci_free_history(uci_to_history(e));
+ }
uci_free_element(&p->e);
*package = NULL;
}
-static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_list *list, const char *name)
+static struct uci_element *uci_lookup_list(struct uci_list *list, const char *name)
{
struct uci_element *e;
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, res != NULL);
UCI_ASSERT(ctx, p != NULL);
- UCI_ASSERT(ctx, uci_validate_name(section));
+ UCI_ASSERT(ctx, section && uci_validate_name(section));
if (option)
UCI_ASSERT(ctx, uci_validate_name(option));
- e = uci_lookup_list(ctx, &p->sections, section);
+ e = uci_lookup_list(&p->sections, section);
if (!e)
goto notfound;
if (option) {
s = uci_to_section(e);
- e = uci_lookup_list(ctx, &s->options, option);
+ e = uci_lookup_list(&s->options, option);
+ if (!e)
+ goto notfound;
}
*res = e;
}
p = s->package;
- if (!internal)
- uci_add_history(ctx, p, UCI_CMD_REMOVE, s->e.name, option, NULL);
+ if (!internal && p->has_history)
+ uci_add_history(ctx, &p->history, UCI_CMD_REMOVE, s->e.name, option, NULL);
switch(e->type) {
case UCI_TYPE_SECTION:
list = e->list.prev;
switch(e->type) {
case UCI_TYPE_SECTION:
- UCI_ASSERT(ctx, uci_validate_name(value));
+ UCI_ASSERT(ctx, uci_validate_str(value, false));
size = sizeof(struct uci_section);
s = uci_to_section(e);
section = e->name;
return 0;
}
p = s->package;
- if (!internal)
- uci_add_history(ctx, p, UCI_CMD_CHANGE, section, option, value);
+ if (!internal && p->has_history)
+ uci_add_history(ctx, &p->history, UCI_CMD_CHANGE, section, option, value);
uci_list_del(&e->list);
e = uci_realloc(ctx, e, size);
/* NB: p, section, option validated by uci_lookup */
UCI_INTERNAL(uci_lookup, ctx, &e, p, section, option);
- if (!internal)
- uci_add_history(ctx, p, UCI_CMD_RENAME, section, option, name);
+ if (!internal && p->has_history)
+ uci_add_history(ctx, &p->history, UCI_CMD_RENAME, section, option, name);
name = uci_strdup(ctx, name);
if (e->name)
return 0;
}
+int uci_add_section(struct uci_context *ctx, struct uci_package *p, char *type, struct uci_section **res)
+{
+ bool internal = ctx->internal;
+ struct uci_section *s;
+
+ UCI_HANDLE_ERR(ctx);
+ UCI_ASSERT(ctx, p != NULL);
+ s = uci_alloc_section(p, type, NULL);
+ uci_fixup_section(ctx, s);
+ *res = s;
+ if (!internal && p->has_history)
+ uci_add_history(ctx, &p->history, UCI_CMD_ADD, s->e.name, NULL, type);
+
+ return 0;
+}
int uci_delete(struct uci_context *ctx, struct uci_package *p, char *section, char *option)
{
/* NB: p, section, option validated by uci_lookup */
UCI_INTERNAL(uci_lookup, ctx, &e, p, section, option);
- if (!internal)
- return uci_del_element(ctx, e);
- UCI_INTERNAL(uci_del_element, ctx, e);
-
- return 0;
+ ctx->internal = internal;
+ return uci_del_element(ctx, e);
}
-int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *value)
+int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *value, struct uci_element **result)
{
/* NB: UCI_INTERNAL use means without history tracking */
bool internal = ctx->internal;
UCI_ASSERT(ctx, uci_validate_name(option));
UCI_ASSERT(ctx, value != NULL);
} else {
- UCI_ASSERT(ctx, uci_validate_name(value));
+ UCI_ASSERT(ctx, uci_validate_str(value, false));
}
/*
* if the section/option is to be modified and it is not found
* create a new element in the appropriate list
*/
- e = uci_lookup_list(ctx, &p->sections, section);
+ e = uci_lookup_list(&p->sections, section);
if (!e)
goto notfound;
s = uci_to_section(e);
- if (ctx->pctx)
+ if (ctx->pctx && ctx->pctx->merge)
ctx->pctx->section = s;
if (option) {
- e = uci_lookup_list(ctx, &s->options, option);
+ e = uci_lookup_list(&s->options, option);
if (!e)
goto notfound;
o = uci_to_option(e);
e = &o->e;
else
e = &s->e;
+ if (result)
+ *result = e;
+ else
+ result = &e;
- if (!internal)
- return uci_set_element_value(ctx, &e, value);
-
- UCI_INTERNAL(uci_set_element_value, ctx, &e, value);
- return 0;
+ ctx->internal = internal;
+ return uci_set_element_value(ctx, result, value);
notfound:
/*
UCI_THROW(ctx, UCI_ERR_NOTFOUND);
/* now add the missing entry */
- if (!internal)
- uci_add_history(ctx, p, UCI_CMD_ADD, section, option, value);
- if (s)
- uci_alloc_option(s, option, value);
- else {
+ if (!internal && p->has_history)
+ uci_add_history(ctx, &p->history, UCI_CMD_CHANGE, section, option, value);
+ if (s) {
+ o = uci_alloc_option(s, option, value);
+ if (result)
+ *result = &o->e;
+ } else {
s = uci_alloc_section(p, value, section);
- if (ctx->pctx)
+ if (result)
+ *result = &s->e;
+ if (ctx->pctx && ctx->pctx->merge)
ctx->pctx->section = s;
}
projects / project / uci.git / blobdiff