* 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
uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size)
{
struct uci_element *e;
+ int datalen = size;
void *ptr;
- ptr = uci_malloc(ctx, size + strlen(name) + 1);
+ ptr = uci_malloc(ctx, datalen);
e = (struct uci_element *) ptr;
e->type = type;
- e->name = (char *) ptr + size;
- strcpy(e->name, name);
+ if (name) {
+ UCI_TRAP_SAVE(ctx, error);
+ e->name = uci_strdup(ctx, name);
+ UCI_TRAP_RESTORE(ctx);
+ }
uci_list_init(&e->list);
+ goto done;
+
+error:
+ free(ptr);
+ UCI_THROW(ctx, ctx->err);
+done:
return e;
}
static void
uci_free_element(struct uci_element *e)
{
+ if (e->name)
+ free(e->name);
if (!uci_list_empty(&e->list))
uci_list_del(&e->list);
free(e);
static inline void
uci_free_option(struct uci_option *o)
{
+ if ((o->value != uci_dataptr(o)) &&
+ (o->value != NULL))
+ free(o->value);
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)
{
struct uci_context *ctx = p->ctx;
struct uci_section *s;
- char buf[16];
- if (!name || !name[0]) {
- snprintf(buf, 16, "cfg%d", p->n_section);
- name = buf;
- }
+ if (name && !name[0])
+ name = NULL;
s = uci_alloc_element(ctx, section, name, strlen(type) + 1);
+ uci_list_init(&s->options);
s->type = uci_dataptr(s);
s->package = p;
strcpy(s->type, type);
- uci_list_init(&s->options);
+ if (name == NULL)
+ s->anonymous = true;
+ p->n_section++;
+
uci_list_add(&p->sections, &s->e.list);
return s;
uci_foreach_element_safe(&s->options, tmp, o) {
uci_free_option(uci_to_option(o));
}
+ if ((s->type != uci_dataptr(s)) &&
+ (s->type != NULL))
+ free(s->type);
uci_free_element(&s->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;
}
static void
-uci_free_package(struct uci_package *p)
+uci_free_package(struct uci_package **package)
{
struct uci_element *e, *tmp;
+ struct uci_package *p = *package;
if(!p)
return;
uci_foreach_element_safe(&p->sections, tmp, e) {
uci_free_section(uci_to_section(e));
}
+ 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;
}
-/* record a change that was done to a package */
-static inline void
-uci_add_history(struct uci_context *ctx, struct uci_package *p, int cmd, char *section, char *option, char *value)
-{
- struct uci_history *h = (struct uci_history *) uci_malloc(ctx, sizeof(struct uci_history));
-
- uci_list_init(&h->list);
- h->cmd = cmd;
- h->section = section;
- h->option = option;
- h->value = value;
- uci_list_add(&p->history, &h->list);
-}
-
-
-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;
return NULL;
}
-int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *p, char *section, char *option)
+int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *p, const char *section, const char *option)
{
struct uci_element *e;
struct uci_section *s;
- struct uci_option *o;
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, res != NULL);
UCI_ASSERT(ctx, p != NULL);
- UCI_ASSERT(ctx, section != NULL);
+ 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;
return 0;
}
-int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, char *value)
+int uci_del_element(struct uci_context *ctx, struct uci_element *e)
{
- int size;
- char *str;
+ /* NB: UCI_INTERNAL use means without history tracking */
+ bool internal = ctx->internal;
+ struct uci_package *p = NULL;
+ struct uci_section *s = NULL;
+ struct uci_option *o = NULL;
+ struct uci_element *i, *tmp;
+ char *option = NULL;
+
+ UCI_HANDLE_ERR(ctx);
+ UCI_ASSERT(ctx, e != NULL);
+
+ switch(e->type) {
+ case UCI_TYPE_SECTION:
+ s = uci_to_section(e);
+ uci_foreach_element_safe(&s->options, tmp, i) {
+ uci_del_element(ctx, i);
+ }
+ break;
+ case UCI_TYPE_OPTION:
+ o = uci_to_option(e);
+ s = o->section;
+ p = s->package;
+ option = e->name;
+ break;
+ default:
+ UCI_THROW(ctx, UCI_ERR_INVAL);
+ break;
+ }
+
+ p = s->package;
+ 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:
+ uci_free_section(s);
+ break;
+ case UCI_TYPE_OPTION:
+ uci_free_option(o);
+ break;
+ default:
+ break;
+ }
+ return 0;
+}
+
+int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, const char *value)
+{
+ /* NB: UCI_INTERNAL use means without history tracking */
+ bool internal = ctx->internal;
struct uci_list *list;
struct uci_element *e;
+ struct uci_package *p;
+ struct uci_section *s;
+ struct uci_option *o;
+ char *section;
+ char *option;
+ char *str;
+ int size;
UCI_HANDLE_ERR(ctx);
- UCI_ASSERT(ctx, value != NULL);
- UCI_ASSERT(ctx, element != NULL);
- UCI_ASSERT(ctx, *element != NULL);
+ UCI_ASSERT(ctx, (element != NULL) && (*element != NULL));
/* what the 'value' of an element means depends on the type
* for a section, the 'value' means its type
list = e->list.prev;
switch(e->type) {
case UCI_TYPE_SECTION:
+ UCI_ASSERT(ctx, uci_validate_str(value, false));
size = sizeof(struct uci_section);
+ s = uci_to_section(e);
+ section = e->name;
+ option = NULL;
+ /* matches the currently set value */
+ if (!strcmp(value, s->type))
+ return 0;
break;
case UCI_TYPE_OPTION:
+ UCI_ASSERT(ctx, value != NULL);
size = sizeof(struct uci_option);
+ o = uci_to_option(e);
+ s = o->section;
+ section = s->e.name;
+ option = o->e.name;
+ /* matches the currently set value */
+ if (!strcmp(value, o->value))
+ return 0;
break;
default:
UCI_THROW(ctx, UCI_ERR_INVAL);
- break;
+ return 0;
}
+ p = s->package;
+ 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);
switch(e->type) {
case UCI_TYPE_SECTION:
- uci_to_section(e)->type = value;
+ uci_to_section(e)->type = str;
break;
case UCI_TYPE_OPTION:
- uci_to_option(e)->value = value;
+ uci_to_option(e)->value = str;
break;
default:
break;
return 0;
}
-int uci_set(struct uci_context *ctx, char *package, char *section, char *option, char *value)
+int uci_rename(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *name)
{
+ /* NB: UCI_INTERNAL use means without history tracking */
+ bool internal = ctx->internal;
struct uci_element *e;
- struct uci_package *p = NULL;
+
+ UCI_HANDLE_ERR(ctx);
+
+ /* NB: p, section, option validated by uci_lookup */
+ UCI_INTERNAL(uci_lookup, ctx, &e, p, section, option);
+
+ 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)
+ free(e->name);
+ e->name = name;
+
+ return 0;
+}
+
+int uci_add_section(struct uci_context *ctx, struct uci_package *p, const 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, const char *section, const char *option)
+{
+ /* NB: pass on internal flag to uci_del_element */
+ bool internal = ctx->internal;
+ struct uci_element *e;
+
+ UCI_HANDLE_ERR(ctx);
+
+ /* NB: p, section, option validated by uci_lookup */
+ UCI_INTERNAL(uci_lookup, ctx, &e, p, section, option);
+
+ ctx->internal = internal;
+ return uci_del_element(ctx, e);
+}
+
+int uci_set(struct uci_context *ctx, struct uci_package *p, const char *section, const char *option, const char *value, struct uci_element **result)
+{
+ /* NB: UCI_INTERNAL use means without history tracking */
+ bool internal = ctx->internal;
+ struct uci_element *e = NULL;
struct uci_section *s = NULL;
struct uci_option *o = NULL;
- struct uci_history *h;
UCI_HANDLE_ERR(ctx);
- UCI_ASSERT(ctx, package != NULL);
- UCI_ASSERT(ctx, section != NULL);
+ UCI_ASSERT(ctx, p != NULL);
+ UCI_ASSERT(ctx, uci_validate_name(section));
+ if (option) {
+ UCI_ASSERT(ctx, uci_validate_name(option));
+ UCI_ASSERT(ctx, value != NULL);
+ } else {
+ UCI_ASSERT(ctx, uci_validate_str(value, false));
+ }
/*
* look up the package, section and option (if set)
* 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, &ctx->root, package);
- if (!e)
- goto notfound;
-
- p = uci_to_package(e);
- 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 && 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;
- uci_add_history(ctx, p, UCI_CMD_CHANGE, section, option, value);
- return uci_set_element_value(ctx, &e, value);
+ ctx->internal = internal;
+ return uci_set_element_value(ctx, result, value);
notfound:
/*
UCI_THROW(ctx, UCI_ERR_NOTFOUND);
/* now add the missing entry */
- uci_add_history(ctx, p, UCI_CMD_ADD, section, option, value);
- if (s)
- uci_alloc_option(s, option, value);
- else
- uci_alloc_section(p, value, section);
+ 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 (result)
+ *result = &s->e;
+ if (ctx->pctx && ctx->pctx->merge)
+ ctx->pctx->section = s;
+ }
return 0;
}
int uci_unload(struct uci_context *ctx, struct uci_package *p)
{
- struct uci_element *e;
-
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, p != NULL);
- uci_free_package(p);
+ uci_free_package(&p);
return 0;
}
projects / project / uci.git / blobdiff