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);
{
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_free_element(&s->e);
}
-static struct uci_package *
-uci_alloc_package(struct uci_context *ctx, const char *name)
-{
- struct uci_package *p;
-
- p = uci_alloc_element(ctx, package, name, 0);
- p->ctx = ctx;
- uci_list_init(&p->sections);
- uci_list_init(&p->history);
- return p;
-}
-
-static void
-uci_free_package(struct uci_package *p)
-{
- struct uci_element *e, *tmp;
-
- 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_free_element(&p->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)
uci_free_element(&h->e);
}
+static struct uci_package *
+uci_alloc_package(struct uci_context *ctx, const char *name)
+{
+ struct uci_package *p;
+
+ p = uci_alloc_element(ctx, package, name, 0);
+ p->ctx = ctx;
+ uci_list_init(&p->sections);
+ uci_list_init(&p->history);
+ return p;
+}
+
+static void
+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;
+}
+
static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_list *list, const char *name)
{
struct uci_element *e;
{
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;
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);
+ 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;
+
+ 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 */
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)
* 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->section = s;
+
if (option) {
e = uci_lookup_list(ctx, &s->options, option);
if (!e)
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_add_history(ctx, p, 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->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;
}
projects / project / uci.git / blobdiff