* GNU Lesser General Public License for more details.
*/
-static void uci_list_set_pos(struct uci_list *head, struct uci_list *ptr, int pos)
+static bool uci_list_set_pos(struct uci_list *head, struct uci_list *ptr, int pos)
{
+ struct uci_list *old_head = ptr->prev;
struct uci_list *new_head = head;
struct uci_element *p = NULL;
}
uci_list_add(new_head->next, ptr);
-}
-static inline void uci_list_fixup(struct uci_list *ptr)
-{
- ptr->prev->next = ptr;
- ptr->next->prev = ptr;
+ return (old_head != new_head);
}
/*
}
static struct uci_option *
-uci_alloc_option(struct uci_section *s, const char *name, const char *value)
+uci_alloc_option(struct uci_section *s, const char *name, const char *value, struct uci_list *after)
{
struct uci_package *p = s->package;
struct uci_context *ctx = p->ctx;
o->v.string = uci_dataptr(o);
o->section = s;
strcpy(o->v.string, value);
- uci_list_add(&s->options, &o->e.list);
+ uci_list_insert(after ? after : s->options.prev, &o->e.list);
return o;
}
}
static struct uci_option *
-uci_alloc_list(struct uci_section *s, const char *name)
+uci_alloc_list(struct uci_section *s, const char *name, struct uci_list *after)
{
struct uci_package *p = s->package;
struct uci_context *ctx = p->ctx;
o->type = UCI_TYPE_LIST;
o->section = s;
uci_list_init(&o->v.list);
- uci_list_add(&s->options, &o->e.list);
+ uci_list_insert(after ? after : s->options.prev, &o->e.list);
return o;
}
int i;
/* initial value */
- if (hash == ~0)
+ if (hash == ~0U)
hash = 5381;
for(i = 0; i < len; i++) {
}
/* fix up an unnamed section, e.g. after adding options to it */
-__private void uci_fixup_section(struct uci_context *ctx, struct uci_section *s)
+static void uci_fixup_section(struct uci_context *ctx, struct uci_section *s)
{
- unsigned int hash = ~0;
+ unsigned int hash = ~0U;
struct uci_element *e;
char buf[16];
break;
}
}
- sprintf(buf, "cfg%02x%04x", ++s->package->n_section, hash % (1 << 16));
+ sprintf(buf, "cfg%02x%04x", s->package->n_section, hash % (1 << 16));
s->e.name = uci_strdup(ctx, buf);
}
+/* transfer options between two sections */
+static void uci_section_transfer_options(struct uci_section *dst, struct uci_section *src)
+{
+ struct uci_element *e;
+
+ /* transfer the option list by inserting the new list HEAD and removing the old */
+ uci_list_insert(&src->options, &dst->options);
+ uci_list_del(&src->options);
+
+ /* update pointer to section in options */
+ uci_foreach_element(&dst->options, e) {
+ struct uci_option *o;
+
+ o = uci_to_option(e);
+ o->section = dst;
+ }
+}
+
static struct uci_section *
-uci_alloc_section(struct uci_package *p, const char *type, const char *name)
+uci_alloc_section(struct uci_package *p, const char *type, const char *name, struct uci_list *after)
{
struct uci_context *ctx = p->ctx;
struct uci_section *s;
s->anonymous = true;
p->n_section++;
- uci_list_add(&p->sections, &s->e.list);
+ uci_list_insert(after ? after : p->sections.prev, &s->e.list);
return s;
}
goto done;
error:
- e = NULL;
+ free(section);
memset(ptr, 0, sizeof(struct uci_ptr));
UCI_THROW(ctx, UCI_ERR_INVAL);
done:
complete:
ptr->flags |= UCI_LOOKUP_COMPLETE;
abort:
- return 0;
+ return UCI_OK;
notfound:
UCI_THROW(ctx, UCI_ERR_NOTFOUND);
- return 0;
+ /* not a chance here */
+ return UCI_ERR_NOTFOUND;
}
__private struct uci_element *
return NULL;
}
-static void uci_add_element_list(struct uci_context *ctx, struct uci_ptr *ptr, bool internal)
-{
- struct uci_element *e;
- struct uci_package *p;
-
- p = ptr->p;
- if (!internal && p->has_delta)
- uci_add_delta(ctx, &p->delta, UCI_CMD_LIST_ADD, ptr->section, ptr->option, ptr->value);
-
- e = uci_alloc_generic(ctx, UCI_TYPE_ITEM, ptr->value, sizeof(struct uci_option));
- uci_list_add(&ptr->o->v.list, &e->list);
-}
-
int uci_rename(struct uci_context *ctx, struct uci_ptr *ptr)
{
/* NB: UCI_INTERNAL use means without delta tracking */
{
struct uci_package *p = s->package;
bool internal = ctx && ctx->internal;
+ bool changed = false;
char order[32];
UCI_HANDLE_ERR(ctx);
- uci_list_set_pos(&s->package->sections, &s->e.list, pos);
- if (!internal && p->has_delta) {
+ changed = uci_list_set_pos(&s->package->sections, &s->e.list, pos);
+ if (!internal && p->has_delta && changed) {
sprintf(order, "%d", pos);
uci_add_delta(ctx, &p->delta, UCI_CMD_REORDER, s->e.name, NULL, order);
}
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, p != NULL);
- s = uci_alloc_section(p, type, NULL);
- uci_fixup_section(ctx, s);
+ s = uci_alloc_section(p, type, NULL, NULL);
+ if (s && s->anonymous)
+ uci_fixup_section(ctx, s);
*res = s;
if (!internal && p->has_delta)
uci_add_delta(ctx, &p->delta, UCI_CMD_ADD, s->e.name, NULL, type);
{
/* NB: UCI_INTERNAL use means without delta tracking */
bool internal = ctx && ctx->internal;
- struct uci_option *prev = NULL;
- const char *value2 = NULL;
+ struct uci_element *volatile e1 = NULL, *volatile e2 = NULL;
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, ptr->s);
UCI_ASSERT(ctx, ptr->value);
- if (ptr->o) {
- switch (ptr->o->type) {
- case UCI_TYPE_STRING:
- /* we already have a string value, convert that to a list */
- prev = ptr->o;
- value2 = ptr->value;
- ptr->value = ptr->o->v.string;
- break;
- case UCI_TYPE_LIST:
- uci_add_element_list(ctx, ptr, internal);
- return 0;
- default:
- UCI_THROW(ctx, UCI_ERR_INVAL);
- break;
- }
+ if (ptr->o && ptr->o->type != UCI_TYPE_LIST && ptr->o->type != UCI_TYPE_STRING) {
+ UCI_THROW(ctx, UCI_ERR_INVAL);
}
- ptr->o = uci_alloc_list(ptr->s, ptr->option);
- if (prev) {
- uci_add_element_list(ctx, ptr, true);
- uci_free_option(prev);
- ptr->value = value2;
+ /* create new item */
+ e1 = uci_alloc_generic(ctx, UCI_TYPE_ITEM, ptr->value, sizeof(struct uci_option));
+
+ if (!ptr->o) {
+ /* create new list */
+ UCI_TRAP_SAVE(ctx, error);
+ ptr->o = uci_alloc_list(ptr->s, ptr->option, NULL);
+ UCI_TRAP_RESTORE(ctx);
+ } else if (ptr->o->type == UCI_TYPE_STRING) {
+ /* create new list and add old string value as item to list */
+ struct uci_option *old = ptr->o;
+ UCI_TRAP_SAVE(ctx, error);
+ e2 = uci_alloc_generic(ctx, UCI_TYPE_ITEM, old->v.string, sizeof(struct uci_option));
+ ptr->o = uci_alloc_list(ptr->s, ptr->option, &old->e.list);
+ UCI_TRAP_RESTORE(ctx);
+ uci_list_add(&ptr->o->v.list, &e2->list);
+
+ /* remove old option */
+ if (ptr->option == old->e.name)
+ ptr->option = ptr->o->e.name;
+ uci_free_option(old);
}
- uci_add_element_list(ctx, ptr, internal);
+
+ /* add new item to list */
+ uci_list_add(&ptr->o->v.list, &e1->list);
+
+ if (!internal && ptr->p->has_delta)
+ uci_add_delta(ctx, &ptr->p->delta, UCI_CMD_LIST_ADD, ptr->section, ptr->option, ptr->value);
return 0;
+error:
+ if (e1 != NULL)
+ uci_free_element(e1);
+ if (e2 != NULL)
+ uci_free_element(e2);
+ UCI_THROW(ctx, ctx->err);
}
int uci_del_list(struct uci_context *ctx, struct uci_ptr *ptr)
return uci_delete(ctx, ptr);
} else if (!ptr->o && ptr->option) { /* new option */
- ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value);
- ptr->last = &ptr->o->e;
+ ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value, NULL);
} else if (!ptr->s && ptr->section) { /* new section */
- ptr->s = uci_alloc_section(ptr->p, ptr->value, ptr->section);
- ptr->last = &ptr->s->e;
+ ptr->s = uci_alloc_section(ptr->p, ptr->value, ptr->section, NULL);
} else if (ptr->o && ptr->option) { /* update option */
- if ((ptr->o->type == UCI_TYPE_STRING) &&
- !strcmp(ptr->o->v.string, ptr->value))
+ if (ptr->o->type == UCI_TYPE_STRING && !strcmp(ptr->o->v.string, ptr->value))
return 0;
- uci_free_option(ptr->o);
- ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value);
- ptr->last = &ptr->o->e;
+
+ if (ptr->o->type == UCI_TYPE_STRING && strlen(ptr->o->v.string) == strlen(ptr->value)) {
+ strcpy(ptr->o->v.string, ptr->value);
+ } else {
+ struct uci_option *old = ptr->o;
+ ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value, &old->e.list);
+ if (ptr->option == old->e.name)
+ ptr->option = ptr->o->e.name;
+ uci_free_option(old);
+ }
} else if (ptr->s && ptr->section) { /* update section */
- char *s = uci_strdup(ctx, ptr->value);
+ if (!strcmp(ptr->s->type, ptr->value))
+ return 0;
- if (ptr->s->type == uci_dataptr(ptr->s)) {
- ptr->last = NULL;
- ptr->last = uci_realloc(ctx, ptr->s, sizeof(struct uci_section));
- ptr->s = uci_to_section(ptr->last);
- uci_list_fixup(&ptr->s->e.list);
+ if (strlen(ptr->s->type) == strlen(ptr->value)) {
+ strcpy(ptr->s->type, ptr->value);
} else {
- free(ptr->s->type);
+ struct uci_section *old = ptr->s;
+ ptr->s = uci_alloc_section(ptr->p, ptr->value, old->e.name, &old->e.list);
+ uci_section_transfer_options(ptr->s, old);
+ if (ptr->section == old->e.name)
+ ptr->section = ptr->s->e.name;
+ uci_free_section(old);
+ ptr->s->package->n_section--;
}
- ptr->s->type = s;
} else {
UCI_THROW(ctx, UCI_ERR_INVAL);
}
projects / project / uci.git / blobdiff