error:
free(ptr);
- UCI_THROW(ctx, ctx->errno);
+ UCI_THROW(ctx, ctx->err);
done:
return e;
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;
*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;
}
}
p = s->package;
- if (!internal && p->confdir)
+ if (!internal && p->has_history)
uci_add_history(ctx, &p->history, UCI_CMD_REMOVE, s->e.name, option, NULL);
switch(e->type) {
return 0;
}
p = s->package;
- if (!internal && p->confdir)
+ if (!internal && p->has_history)
uci_add_history(ctx, &p->history, UCI_CMD_CHANGE, section, option, value);
uci_list_del(&e->list);
/* NB: p, section, option validated by uci_lookup */
UCI_INTERNAL(uci_lookup, ctx, &e, p, section, option);
- if (!internal && p->confdir)
+ if (!internal && p->has_history)
uci_add_history(ctx, &p->history, UCI_CMD_RENAME, section, option, name);
name = uci_strdup(ctx, name);
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);
s = uci_alloc_section(p, type, NULL);
uci_fixup_section(ctx, s);
*res = s;
- uci_add_history(ctx, &p->history, UCI_CMD_ADD, s->e.name, NULL, type);
+ if (!internal && p->has_history)
+ uci_add_history(ctx, &p->history, UCI_CMD_ADD, s->e.name, NULL, type);
return 0;
}
* 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;
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);
UCI_THROW(ctx, UCI_ERR_NOTFOUND);
/* now add the missing entry */
- if (!internal && p->confdir)
+ 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);