* 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
return;
if (value)
- size += strlen(section) + 1;
+ size += strlen(value) + 1;
h = uci_alloc_element(ctx, history, option, size);
ptr = uci_dataptr(h);
{
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)
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_name(value));
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;
/* 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)
/* NB: pass on internal flag to uci_del_element */
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);
-
- 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)
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_name(value));
+ }
/*
* look up the package, section and option (if set)
goto notfound;
s = uci_to_section(e);
- if (ctx->pctx)
+ if (ctx->pctx && ctx->pctx->merge)
ctx->pctx->section = s;
if (option) {
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:
/*
uci_alloc_option(s, option, value);
else {
s = uci_alloc_section(p, value, section);
- if (ctx->pctx)
+ if (ctx->pctx && ctx->pctx->merge)
ctx->pctx->section = s;
}
int uci_unload(struct uci_context *ctx, struct uci_package *p)
{
- struct uci_element *e;
-
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, p != NULL);