if(!p)
return;
+ if (p->path)
+ free(p->path);
uci_foreach_element_safe(&p->sections, tmp, e) {
uci_free_section(uci_to_section(e));
}
}
-static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_list *list, char *name)
+static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_list *list, const char *name)
{
struct uci_element *e;
if (!strcmp(e->name, name))
return e;
}
- UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+ return NULL;
}
-int uci_lookup(struct uci_context *ctx, struct uci_element **res, char *package, char *section, char *option)
+int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *p, char *section, char *option)
{
struct uci_element *e;
- struct uci_package *p;
struct uci_section *s;
struct uci_option *o;
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, res != NULL);
- UCI_ASSERT(ctx, package != NULL);
-
- e = uci_lookup_list(ctx, &ctx->root, package);
- if (!section)
- goto found;
+ UCI_ASSERT(ctx, p != NULL);
+ UCI_ASSERT(ctx, section != NULL);
- p = uci_to_package(e);
e = uci_lookup_list(ctx, &p->sections, section);
- if (!option)
- goto found;
+ if (!e)
+ goto notfound;
- s = uci_to_section(e);
- e = uci_lookup_list(ctx, &s->options, option);
+ if (option) {
+ s = uci_to_section(e);
+ e = uci_lookup_list(ctx, &s->options, option);
+ }
-found:
*res = e;
return 0;
+
+notfound:
+ UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+ return 0;
}
int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, char *value)
char *str;
struct uci_list *list;
struct uci_element *e;
+ struct uci_package *p;
+ struct uci_section *s;
+ char *section;
+ char *option;
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, value != NULL);
switch(e->type) {
case UCI_TYPE_SECTION:
size = sizeof(struct uci_section);
+ s = uci_to_section(e);
+ section = e->name;
+ option = NULL;
break;
case UCI_TYPE_OPTION:
size = sizeof(struct uci_option);
+ s = uci_to_option(e)->section;
+ section = s->e.name;
+ option = e->name;
break;
default:
UCI_THROW(ctx, UCI_ERR_INVAL);
- break;
+ return 0;
}
+ p = s->package;
+ uci_add_history(ctx, p, UCI_CMD_CHANGE, section, option, value);
uci_list_del(&e->list);
e = uci_realloc(ctx, e, size);
UCI_ASSERT(ctx, package != NULL);
UCI_ASSERT(ctx, section != NULL);
- fprintf(stderr, "uci_set: '%s' '%s' '%s' = '%s'\n", package, section, option, value);
-
/*
* 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_TRAP_SAVE(ctx, notfound);
e = uci_lookup_list(ctx, &ctx->root, package);
if (!e)
goto notfound;
e = uci_lookup_list(ctx, &p->sections, section);
if (!e)
goto notfound;
- s = uci_to_section(e);
+ s = uci_to_section(e);
if (option) {
e = uci_lookup_list(ctx, &s->options, option);
if (!e)
goto notfound;
o = uci_to_option(e);
}
- UCI_TRAP_RESTORE(ctx);
/*
* no unknown element was supplied, assume that we can just update
else
e = &s->e;
- uci_add_history(ctx, p, UCI_CMD_CHANGE, section, option, value);
return uci_set_element_value(ctx, &e, value);
notfound:
* an option was supplied, but the section wasn't found
*/
if (!p || (!s && option))
- UCI_THROW(ctx, ctx->errno);
+ 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, section, value);
+ uci_alloc_section(p, value, section);
return 0;
}
-int uci_unload(struct uci_context *ctx, const char *name)
+int uci_unload(struct uci_context *ctx, struct uci_package *p)
{
struct uci_element *e;
UCI_HANDLE_ERR(ctx);
- UCI_ASSERT(ctx, name != NULL);
-
- uci_foreach_element(&ctx->root, e) {
- if (!strcmp(e->name, name))
- goto found;
- }
- UCI_THROW(ctx, UCI_ERR_NOTFOUND);
-
-found:
- uci_free_package(uci_to_package(e));
+ UCI_ASSERT(ctx, p != NULL);
+ uci_free_package(p);
return 0;
}