* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
*/
-/* initialize a list head/item */
-static inline void uci_list_init(struct uci_list *ptr)
+static void uci_list_set_pos(struct uci_list *head, struct uci_list *ptr, int pos)
{
- ptr->prev = ptr;
- ptr->next = ptr;
-}
-
-/* inserts a new list entry after a given entry */
-static inline void uci_list_insert(struct uci_list *list, struct uci_list *ptr)
-{
- list->next->prev = ptr;
- ptr->prev = list;
- ptr->next = list->next;
- list->next = ptr;
-}
-
-/* inserts a new list entry at the tail of the list */
-static inline void uci_list_add(struct uci_list *head, struct uci_list *ptr)
-{
- /* NB: head->prev points at the tail */
- uci_list_insert(head->prev, ptr);
-}
+ struct uci_list *new_head = head;
+ struct uci_element *p = NULL;
-static inline void uci_list_del(struct uci_list *ptr)
-{
- struct uci_list *next, *prev;
-
- next = ptr->next;
- prev = ptr->prev;
-
- prev->next = next;
- next->prev = prev;
+ uci_list_del(ptr);
+ uci_foreach_element(head, p) {
+ if (pos-- <= 0)
+ break;
+ new_head = &p->list;
+ }
- uci_list_init(ptr);
+ uci_list_add(new_head->next, ptr);
}
static inline void uci_list_fixup(struct uci_list *ptr)
ptr->next->prev = ptr;
}
-/*
+/*
* uci_alloc_generic allocates a new uci_element with payload
* payload is appended to the struct to save memory and reduce fragmentation
*/
-static struct uci_element *
+__private struct uci_element *
uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size)
{
struct uci_element *e;
return e;
}
-static void
+__private void
uci_free_element(struct uci_element *e)
{
- if (e->name)
- free(e->name);
+ free(e->name);
if (!uci_list_empty(&e->list))
uci_list_del(&e->list);
free(e);
return o;
}
+/* Based on an efficient hash function published by D. J. Bernstein */
+static unsigned int djbhash(unsigned int hash, char *str)
+{
+ int len = strlen(str);
+ int i;
+
+ /* initial value */
+ if (hash == ~0)
+ hash = 5381;
+
+ for(i = 0; i < len; i++) {
+ hash = ((hash << 5) + hash) + str[i];
+ }
+ return (hash & 0x7FFFFFFF);
+}
+
/* fix up an unnamed section, e.g. after adding options to it */
-static void uci_fixup_section(struct uci_context *ctx, struct uci_section *s)
+__private void uci_fixup_section(struct uci_context *ctx, struct uci_section *s)
{
unsigned int hash = ~0;
struct uci_element *e;
uci_free_element(&s->e);
}
-__plugin struct uci_package *
+__private 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);
- uci_list_init(&p->saved_history);
+ uci_list_init(&p->delta);
+ uci_list_init(&p->saved_delta);
return p;
}
-static void
+__private void
uci_free_package(struct uci_package **package)
{
struct uci_element *e, *tmp;
if(!p)
return;
- if (p->path)
- free(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_foreach_element_safe(&p->delta, tmp, e) {
+ uci_free_delta(uci_to_delta(e));
}
- uci_foreach_element_safe(&p->saved_history, tmp, e) {
- uci_free_history(uci_to_history(e));
+ uci_foreach_element_safe(&p->saved_delta, tmp, e) {
+ uci_free_delta(uci_to_delta(e));
}
uci_free_element(&p->e);
*package = NULL;
*e = NULL;
}
-static inline struct uci_element *
+__private struct uci_element *
uci_lookup_list(struct uci_list *list, const char *name)
{
struct uci_element *e;
if (!*name)
name = NULL;
- else if (!uci_validate_str(name, false))
+ else if (!uci_validate_type(name))
goto error;
- /* if the given index is negative, it specifies the section number from
+ /* if the given index is negative, it specifies the section number from
* the end of the list */
if (idx < 0) {
c = 0;
goto done;
error:
- e = NULL;
+ free(section);
memset(ptr, 0, sizeof(struct uci_ptr));
UCI_THROW(ctx, UCI_ERR_INVAL);
done:
free(section);
- ptr->section = e->name;
+ if (e)
+ ptr->section = e->name;
return e;
}
int
+uci_lookup_next(struct uci_context *ctx, struct uci_element **e, struct uci_list *list, const char *name)
+{
+ UCI_HANDLE_ERR(ctx);
+
+ *e = uci_lookup_list(list, name);
+ if (!*e)
+ UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+
+ return 0;
+}
+
+int
uci_lookup_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str, bool extended)
{
struct uci_element *e;
ptr->flags |= UCI_LOOKUP_DONE;
/* look up the package first */
- e = uci_lookup_list(&ctx->root, ptr->package);
+ if (ptr->p)
+ e = &ptr->p->e;
+ else
+ e = uci_lookup_list(&ctx->root, ptr->package);
+
if (!e) {
UCI_INTERNAL(uci_load, ctx, ptr->package, &ptr->p);
if (!ptr->p)
ptr->last = e;
}
- if (!ptr->section)
+ if (!ptr->section && !ptr->s)
goto complete;
/* if the section name validates as a regular name, pass through
* to the regular uci_lookup function call */
- if (ptr->flags & UCI_LOOKUP_EXTENDED)
- e = uci_lookup_ext_section(ctx, ptr);
- else
+ if (ptr->s) {
+ e = &ptr->s->e;
+ } else if (ptr->flags & UCI_LOOKUP_EXTENDED) {
+ if (extended)
+ e = uci_lookup_ext_section(ctx, ptr);
+ else
+ UCI_THROW(ctx, UCI_ERR_INVAL);
+ } else {
e = uci_lookup_list(&ptr->p->sections, ptr->section);
+ }
if (!e)
goto abort;
complete:
ptr->flags |= UCI_LOOKUP_COMPLETE;
abort:
- return 0;
+ return UCI_OK;
notfound:
UCI_THROW(ctx, UCI_ERR_NOTFOUND);
- return 0;
-}
-
-int
-uci_fill_ptr(struct uci_context *ctx, struct uci_ptr *ptr, struct uci_element *e, bool complete)
-{
- UCI_HANDLE_ERR(ctx);
- UCI_ASSERT(ctx, ptr != NULL);
- UCI_ASSERT(ctx, e != NULL);
-
- memset(ptr, 0, sizeof(struct uci_ptr));
- switch(e->type) {
- case UCI_TYPE_OPTION:
- ptr->o = uci_to_option(e);
- goto fill_option;
- case UCI_TYPE_SECTION:
- ptr->s = uci_to_section(e);
- goto fill_section;
- case UCI_TYPE_PACKAGE:
- ptr->p = uci_to_package(e);
- goto fill_package;
- default:
- UCI_THROW(ctx, UCI_ERR_INVAL);
- }
-
-fill_option:
- ptr->option = ptr->o->e.name;
- ptr->s = ptr->o->section;
-fill_section:
- ptr->section = ptr->s->e.name;
- ptr->p = ptr->s->package;
-fill_package:
- ptr->package = ptr->p->e.name;
-
- ptr->flags |= UCI_LOOKUP_DONE;
- if (complete)
- ptr->flags |= UCI_LOOKUP_COMPLETE;
-
- return 0;
+ /* not a chance here */
+ return UCI_ERR_NOTFOUND;
}
-static struct uci_element *
-expand_ptr(struct uci_context *ctx, struct uci_ptr *ptr, bool complete)
+__private struct uci_element *
+uci_expand_ptr(struct uci_context *ctx, struct uci_ptr *ptr, bool complete)
{
UCI_ASSERT(ctx, ptr != NULL);
if (!(ptr->flags & UCI_LOOKUP_DONE))
- uci_lookup_ptr(ctx, ptr, NULL, 1);
+ UCI_INTERNAL(uci_lookup_ptr, ctx, ptr, NULL, 1);
if (complete && !(ptr->flags & UCI_LOOKUP_COMPLETE))
UCI_THROW(ctx, UCI_ERR_NOTFOUND);
UCI_ASSERT(ctx, ptr->p != NULL);
struct uci_package *p;
p = ptr->p;
- if (!internal && p->has_history)
- uci_add_history(ctx, &p->history, UCI_CMD_LIST_ADD, ptr->section, ptr->option, ptr->value);
+ 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 history tracking */
- bool internal = ctx->internal;
+ /* NB: UCI_INTERNAL use means without delta tracking */
+ bool internal = ctx && ctx->internal;
struct uci_element *e;
struct uci_package *p;
char *n;
UCI_HANDLE_ERR(ctx);
- e = expand_ptr(ctx, ptr, true);
+ e = uci_expand_ptr(ctx, ptr, true);
p = ptr->p;
UCI_ASSERT(ctx, ptr->s);
UCI_ASSERT(ctx, ptr->value);
- if (!internal && p->has_history)
- uci_add_history(ctx, &p->history, UCI_CMD_RENAME, ptr->section, ptr->option, ptr->value);
+ if (!internal && p->has_delta)
+ uci_add_delta(ctx, &p->delta, UCI_CMD_RENAME, ptr->section, ptr->option, ptr->value);
n = uci_strdup(ctx, ptr->value);
- if (e->name)
- free(e->name);
+ free(e->name);
e->name = n;
+ if (e->type == UCI_TYPE_SECTION)
+ uci_to_section(e)->anonymous = false;
+
+ return 0;
+}
+
+int uci_reorder_section(struct uci_context *ctx, struct uci_section *s, int pos)
+{
+ struct uci_package *p = s->package;
+ bool internal = ctx && ctx->internal;
+ char order[32];
+
+ UCI_HANDLE_ERR(ctx);
+
+ uci_list_set_pos(&s->package->sections, &s->e.list, pos);
+ if (!internal && p->has_delta) {
+ sprintf(order, "%d", pos);
+ uci_add_delta(ctx, &p->delta, UCI_CMD_REORDER, s->e.name, NULL, order);
+ }
+
return 0;
}
int uci_add_section(struct uci_context *ctx, struct uci_package *p, const char *type, struct uci_section **res)
{
- bool internal = ctx->internal;
+ bool internal = ctx && ctx->internal;
struct uci_section *s;
UCI_HANDLE_ERR(ctx);
s = uci_alloc_section(p, type, NULL);
uci_fixup_section(ctx, s);
*res = s;
- if (!internal && p->has_history)
- uci_add_history(ctx, &p->history, UCI_CMD_ADD, s->e.name, NULL, type);
+ if (!internal && p->has_delta)
+ uci_add_delta(ctx, &p->delta, UCI_CMD_ADD, s->e.name, NULL, type);
return 0;
}
int uci_delete(struct uci_context *ctx, struct uci_ptr *ptr)
{
/* NB: pass on internal flag to uci_del_element */
- bool internal = ctx->internal;
+ bool internal = ctx && ctx->internal;
struct uci_package *p;
- struct uci_element *e;
+ struct uci_element *e1, *e2, *tmp;
+ int index;
UCI_HANDLE_ERR(ctx);
- e = expand_ptr(ctx, ptr, true);
+ e1 = uci_expand_ptr(ctx, ptr, true);
p = ptr->p;
UCI_ASSERT(ctx, ptr->s);
- if (!internal && p->has_history)
- uci_add_history(ctx, &p->history, UCI_CMD_REMOVE, ptr->section, ptr->option, NULL);
+ if (ptr->o && ptr->o->type == UCI_TYPE_LIST && ptr->value && *ptr->value) {
+ if (!sscanf(ptr->value, "%d", &index))
+ return 1;
+
+ uci_foreach_element_safe(&ptr->o->v.list, tmp, e2) {
+ if (index == 0) {
+ if (!internal && p->has_delta)
+ uci_add_delta(ctx, &p->delta, UCI_CMD_REMOVE, ptr->section, ptr->option, ptr->value);
+ uci_free_option(uci_to_option(e2));
+ return 0;
+ }
+ index--;
+ }
+
+ return 0;
+ }
+
+ if (!internal && p->has_delta)
+ uci_add_delta(ctx, &p->delta, UCI_CMD_REMOVE, ptr->section, ptr->option, NULL);
+
+ uci_free_any(&e1);
+
+ if (ptr->option)
+ ptr->o = NULL;
+ else if (ptr->section)
+ ptr->s = NULL;
- uci_free_any(&e);
return 0;
}
int uci_add_list(struct uci_context *ctx, struct uci_ptr *ptr)
{
- /* NB: UCI_INTERNAL use means without history tracking */
- bool internal = ctx->internal;
+ /* NB: UCI_INTERNAL use means without delta tracking */
+ bool internal = ctx && ctx->internal;
struct uci_option *prev = NULL;
const char *value2 = NULL;
UCI_HANDLE_ERR(ctx);
- expand_ptr(ctx, ptr, false);
+ uci_expand_ptr(ctx, ptr, false);
UCI_ASSERT(ctx, ptr->s);
UCI_ASSERT(ctx, ptr->value);
return 0;
}
+int uci_del_list(struct uci_context *ctx, struct uci_ptr *ptr)
+{
+ /* NB: pass on internal flag to uci_del_element */
+ bool internal = ctx && ctx->internal;
+ struct uci_element *e, *tmp;
+ struct uci_package *p;
+
+ UCI_HANDLE_ERR(ctx);
+
+ uci_expand_ptr(ctx, ptr, false);
+ UCI_ASSERT(ctx, ptr->s);
+ UCI_ASSERT(ctx, ptr->value);
+
+ if (!(ptr->o && ptr->option))
+ return 0;
+
+ if ((ptr->o->type != UCI_TYPE_LIST))
+ return 0;
+
+ p = ptr->p;
+ if (!internal && p->has_delta)
+ uci_add_delta(ctx, &p->delta, UCI_CMD_LIST_DEL, ptr->section, ptr->option, ptr->value);
+
+ uci_foreach_element_safe(&ptr->o->v.list, tmp, e) {
+ if (!strcmp(ptr->value, uci_to_option(e)->e.name)) {
+ uci_free_option(uci_to_option(e));
+ }
+ }
+
+ return 0;
+}
+
int uci_set(struct uci_context *ctx, struct uci_ptr *ptr)
{
- /* NB: UCI_INTERNAL use means without history tracking */
- bool internal = ctx->internal;
+ /* NB: UCI_INTERNAL use means without delta tracking */
+ bool internal = ctx && ctx->internal;
UCI_HANDLE_ERR(ctx);
- expand_ptr(ctx, ptr, false);
+ uci_expand_ptr(ctx, ptr, false);
UCI_ASSERT(ctx, ptr->value);
UCI_ASSERT(ctx, ptr->s || (!ptr->option && ptr->section));
- if (!ptr->option) {
- UCI_ASSERT(ctx, uci_validate_str(ptr->value, false));
+ if (!ptr->option && ptr->value[0]) {
+ UCI_ASSERT(ctx, uci_validate_type(ptr->value));
+ }
+
+ if (!ptr->o && ptr->s && ptr->option) {
+ struct uci_element *e;
+ e = uci_lookup_list(&ptr->s->options, ptr->option);
+ if (e)
+ ptr->o = uci_to_option(e);
}
+ if (!ptr->value[0]) {
+ /* if setting a nonexistant option/section to a nonexistant value,
+ * exit without errors */
+ if (!(ptr->flags & UCI_LOOKUP_COMPLETE))
+ return 0;
- if (!ptr->o && ptr->option) { /* new option */
+ 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;
} 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))
+ return 0;
uci_free_option(ptr->o);
ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value);
ptr->last = &ptr->o->e;
UCI_THROW(ctx, UCI_ERR_INVAL);
}
- if (!internal && ptr->p->has_history)
- uci_add_history(ctx, &ptr->p->history, UCI_CMD_CHANGE, ptr->section, ptr->option, ptr->value);
+ if (!internal && ptr->p->has_delta)
+ uci_add_delta(ctx, &ptr->p->delta, UCI_CMD_CHANGE, ptr->section, ptr->option, ptr->value);
return 0;
}
projects / project / uci.git / blobdiff