X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=list.c;h=e817118472f06db1ef3476b88d93ba3ab8f18881;hp=334bc324d7584f41f972431329ec6c9df573dd6d;hb=031b620e1f3a16078da45ce00352508764902786;hpb=01ca9e5e467e4f324f52fd80a2ec4db999b3db48 diff --git a/list.c b/list.c index 334bc32..e817118 100644 --- a/list.c +++ b/list.c @@ -2,9 +2,9 @@ * libuci - Library for the Unified Configuration Interface * Copyright (C) 2008 Felix Fietkau * - * 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 @@ -61,23 +61,30 @@ uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size) int datalen = size; void *ptr; - if (name) - datalen += strlen(name) + 1; ptr = uci_malloc(ctx, datalen); e = (struct uci_element *) ptr; e->type = type; if (name) { - e->name = (char *) ptr + size; - strcpy(e->name, 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->errno); + +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); @@ -113,18 +120,18 @@ 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; + uci_list_add(&p->sections, &s->e.list); return s; @@ -144,44 +151,6 @@ uci_free_section(struct uci_section *s) 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 * uci_alloc_package(struct uci_context *ctx, const char *name) { @@ -191,13 +160,15 @@ uci_alloc_package(struct uci_context *ctx, const char *name) 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; @@ -210,7 +181,11 @@ uci_free_package(struct uci_package *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) @@ -228,12 +203,13 @@ int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_pac { 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, uci_validate_name(section)); + if (option) + UCI_ASSERT(ctx, uci_validate_name(option)); e = uci_lookup_list(ctx, &p->sections, section); if (!e) @@ -284,8 +260,8 @@ int uci_del_element(struct uci_context *ctx, struct uci_element *e) } p = s->package; - if (!internal) - uci_add_history(ctx, p, UCI_CMD_REMOVE, s->e.name, option, NULL); + if (!internal && p->confdir) + uci_add_history(ctx, &p->history, UCI_CMD_REMOVE, s->e.name, option, NULL); switch(e->type) { case UCI_TYPE_SECTION: @@ -314,9 +290,7 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, 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 @@ -331,12 +305,14 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, 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; break; case UCI_TYPE_OPTION: + UCI_ASSERT(ctx, value != NULL); size = sizeof(struct uci_option); s = uci_to_option(e)->section; section = s->e.name; @@ -347,8 +323,8 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, return 0; } p = s->package; - if (!internal) - uci_add_history(ctx, p, UCI_CMD_CHANGE, section, option, value); + if (!internal && p->confdir) + uci_add_history(ctx, &p->history, UCI_CMD_CHANGE, section, option, value); uci_list_del(&e->list); e = uci_realloc(ctx, e, size); @@ -370,27 +346,44 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, return 0; } -int uci_del(struct uci_context *ctx, struct uci_package *p, char *section, char *option) +int uci_rename(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *name) { - /* NB: pass on internal flag to uci_del_element */ + /* NB: UCI_INTERNAL use means without history tracking */ bool internal = ctx->internal; struct uci_element *e; - struct uci_section *s = NULL; - struct uci_option *o = NULL; UCI_HANDLE_ERR(ctx); - UCI_ASSERT(ctx, p != NULL); - UCI_ASSERT(ctx, section != NULL); + /* 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); + if (!internal && p->confdir) + 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_delete(struct uci_context *ctx, struct uci_package *p, char *section, 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, char *section, char *option, char *value) { /* NB: UCI_INTERNAL use means without history tracking */ @@ -398,20 +391,30 @@ int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char 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, p != NULL); - UCI_ASSERT(ctx, section != NULL); - UCI_ASSERT(ctx, value != 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 */ - UCI_INTERNAL(uci_lookup, ctx, &e, p, section, NULL); + e = uci_lookup_list(ctx, &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); if (!e) @@ -428,11 +431,8 @@ int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char else e = &s->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, &e, value); notfound: /* @@ -445,24 +445,25 @@ 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 (!internal && p->confdir) + uci_add_history(ctx, &p->history, UCI_CMD_ADD, section, option, value); if (s) uci_alloc_option(s, option, value); - else - uci_alloc_section(p, value, section); + else { + s = uci_alloc_section(p, value, section); + 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; }