* 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)
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 */
__private void uci_fixup_section(struct uci_context *ctx, struct uci_section *s)
{
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;
}
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;
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)
{
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;
return 0;
}
-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);
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 */
+ /* NB: UCI_INTERNAL use means without delta tracking */
bool internal = ctx->internal;
struct uci_element *e;
struct uci_package *p;
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)
UCI_HANDLE_ERR(ctx);
uci_list_set_pos(&s->package->sections, &s->e.list, pos);
- if (!ctx->internal && p->has_history) {
+ if (!ctx->internal && p->has_delta) {
sprintf(order, "%d", pos);
- uci_add_history(ctx, &p->history, UCI_CMD_REORDER, s->e.name, NULL, order);
+ uci_add_delta(ctx, &p->delta, UCI_CMD_REORDER, s->e.name, NULL, order);
}
return 0;
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;
}
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);
- if (!internal && p->has_history)
- uci_add_history(ctx, &p->history, UCI_CMD_REMOVE, ptr->section, ptr->option, NULL);
+ if (!internal && p->has_delta)
+ uci_add_delta(ctx, &p->delta, UCI_CMD_REMOVE, ptr->section, ptr->option, NULL);
uci_free_any(&e);
int uci_add_list(struct uci_context *ctx, struct uci_ptr *ptr)
{
- /* NB: UCI_INTERNAL use means without history tracking */
+ /* NB: UCI_INTERNAL use means without delta tracking */
bool internal = 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);
int uci_set(struct uci_context *ctx, struct uci_ptr *ptr)
{
- /* NB: UCI_INTERNAL use means without history tracking */
+ /* NB: UCI_INTERNAL use means without delta tracking */
bool internal = 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 && ptr->value[0]) {
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;
}