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->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);
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);
}
{
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;
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);
}
+/* 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)
{
}
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;
+ if (p->path)
+ free(p->path);
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_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, 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_del_element(struct uci_context *ctx, struct uci_element *e)
+{
+ /* 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)
+ uci_add_history(ctx, p, 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, char *value)
{
- int size;
- char *str;
+ /* 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;
+ char *section;
+ char *option;
+ char *str;
+ int size;
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;
+ if (!internal)
+ uci_add_history(ctx, p, 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_section *s = NULL;
+ struct uci_option *o = NULL;
+
+ UCI_HANDLE_ERR(ctx);
+ UCI_ASSERT(ctx, p != NULL);
+ UCI_ASSERT(ctx, section != NULL);
+
+ UCI_INTERNAL(uci_lookup, ctx, &e, p, section, option);
+
+ if (!internal)
+ uci_add_history(ctx, p, 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;
- struct uci_package *p = 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, p != NULL);
UCI_ASSERT(ctx, section != NULL);
- fprintf(stderr, "uci_set: '%s' '%s' '%s' = '%s'\n", package, section, option, value);
+ 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;
+}
+
+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 */
+ 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, p != NULL);
+ UCI_ASSERT(ctx, section != NULL);
+ UCI_ASSERT(ctx, value != NULL);
/*
* 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;
-
- p = uci_to_package(e);
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);
+ if (!internal)
+ return uci_set_element_value(ctx, &e, value);
+
+ UCI_INTERNAL(uci_set_element_value, ctx, &e, value);
+ return 0;
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 (!internal)
+ 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;
}
projects / project / uci.git / blobdiff