* 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);
+
+ return (old_head != new_head);
}
static inline void uci_list_fixup(struct uci_list *ptr)
}
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;
}
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];
- if (!s || !s->anonymous)
+ if (!s || s->e.name)
return;
/*
break;
}
}
- sprintf(buf, "cfg%02x%04x", s->package->name_index, hash % (1 << 16));
+ sprintf(buf, "cfg%02x%04x", s->package->n_section, hash % (1 << 16));
s->e.name = uci_strdup(ctx, buf);
}
+/* fix up option list HEAD pointers and pointer to section in options */
+static void uci_section_fixup_options(struct uci_section *s, bool no_options)
+{
+ struct uci_element *e;
+
+ if (no_options) {
+ /*
+ * enforce empty list pointer state (s->next == s) when original
+ * section had no options in the first place
+ */
+ uci_list_init(&s->options);
+ return;
+ }
+
+ /* fix pointers to HEAD at end/beginning of list */
+ uci_list_fixup(&s->options);
+
+ /* fix back pointer to section in options */
+ uci_foreach_element(&s->options, e) {
+ struct uci_option *o;
+
+ o = uci_to_option(e);
+ o->section = s;
+ }
+}
+
static struct uci_section *
uci_alloc_section(struct uci_package *p, const char *type, const char *name)
{
struct uci_element *e;
uci_foreach_element(list, e) {
- if (e->name && !strcmp(e->name, name))
+ if (!strcmp(e->name, name))
return e;
}
return NULL;
{
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);
+ 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_option *volatile prev = NULL;
+ const char *volatile value2 = NULL;
UCI_HANDLE_ERR(ctx);
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->o = uci_alloc_option(ptr->s, ptr->option, ptr->value, NULL);
ptr->last = &ptr->o->e;
} else if (!ptr->s && ptr->section) { /* new section */
ptr->s = uci_alloc_section(ptr->p, ptr->value, ptr->section);
ptr->last = &ptr->s->e;
} 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);
+ ptr->last = &ptr->o->e;
+ }
} else if (ptr->s && ptr->section) { /* update section */
char *s = uci_strdup(ctx, ptr->value);
if (ptr->s->type == uci_dataptr(ptr->s)) {
+ /* drop the in-section storage of type name */
+ bool no_options;
+
+ no_options = uci_list_empty(&ptr->s->options);
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);
+ uci_section_fixup_options(ptr->s, no_options);
} else {
free(ptr->s->type);
}