ptr->next = ptr;
}
-/* inserts a new list entry between two consecutive entries */
-static inline void __uci_list_add(struct uci_list *prev, struct uci_list *next, struct uci_list *ptr)
+/* inserts a new list entry after a given entry */
+static inline void uci_list_insert(struct uci_list *list, struct uci_list *ptr)
{
- next->prev = ptr;
- ptr->prev = prev;
- ptr->next = next;
- prev->next = 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_add(head->prev, head, ptr);
+ uci_list_insert(head->prev, ptr);
}
static inline void uci_list_del(struct uci_list *ptr)
prev->next = next;
next->prev = prev;
+
+ uci_list_init(ptr);
}
-static void uci_drop_option(struct uci_option *option)
+/*
+ * 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 *
+uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size)
{
- if (!option)
- return;
- if (option->name)
- free(option->name);
- if (option->value)
- free(option->value);
- free(option);
+ struct uci_element *e;
+ void *ptr;
+
+ ptr = uci_malloc(ctx, size + strlen(name) + 1);
+ e = (struct uci_element *) ptr;
+ e->type = type;
+ e->name = (char *) ptr + size;
+ strcpy(e->name, name);
+ uci_list_init(&e->list);
+
+ return e;
}
-static struct uci_option *uci_add_option(struct uci_section *section, const char *name, const char *value)
+static void
+uci_free_element(struct uci_element *e)
{
- struct uci_package *package = section->package;
- struct uci_context *ctx = package->ctx;
- struct uci_option *option = NULL;
+ if (!uci_list_empty(&e->list))
+ uci_list_del(&e->list);
+ free(e);
+}
- UCI_TRAP_SAVE(ctx, error);
- option = (struct uci_option *) uci_malloc(ctx, sizeof(struct uci_option));
- option->name = uci_strdup(ctx, name);
- option->value = uci_strdup(ctx, value);
- uci_list_add(§ion->options, &option->list);
- UCI_TRAP_RESTORE(ctx);
- return option;
+static struct uci_option *
+uci_alloc_option(struct uci_section *s, const char *name, const char *value)
+{
+ struct uci_package *p = s->package;
+ struct uci_context *ctx = p->ctx;
+ struct uci_option *o;
-error:
- uci_drop_option(option);
- UCI_THROW(ctx, ctx->errno);
- return NULL;
+ o = uci_alloc_element(ctx, option, name, strlen(value) + 1);
+ o->value = uci_dataptr(o);
+ o->section = s;
+ strcpy(o->value, value);
+ uci_list_add(&s->options, &o->e.list);
+
+ return o;
}
-static void uci_drop_section(struct uci_section *section)
+static inline void
+uci_free_option(struct uci_option *o)
{
- struct uci_option *opt;
+ uci_free_element(&o->e);
+}
- if (!section)
- return;
+static struct uci_section *
+uci_alloc_section(struct uci_package *p, const char *type, const char *name)
+{
+ struct uci_context *ctx = p->ctx;
+ struct uci_section *s;
+ char buf[16];
- uci_foreach_entry(option, §ion->options, opt) {
- uci_list_del(&opt->list);
- uci_drop_option(opt);
+ if (!name || !name[0]) {
+ snprintf(buf, 16, "cfg%d", p->n_section);
+ name = buf;
}
- if (section->name)
- free(section->name);
- if (section->type)
- free(section->type);
- free(section);
+ s = uci_alloc_element(ctx, section, name, strlen(type) + 1);
+ s->type = uci_dataptr(s);
+ s->package = p;
+ strcpy(s->type, type);
+ uci_list_init(&s->options);
+ uci_list_add(&p->sections, &s->e.list);
+
+ return s;
}
-static struct uci_section *uci_add_section(struct uci_package *package, const char *type, const char *name)
+static void
+uci_free_section(struct uci_section *s)
{
- struct uci_section *section = NULL;
- struct uci_context *ctx = package->ctx;
+ struct uci_element *o, *tmp;
- UCI_TRAP_SAVE(ctx, error);
- package->n_section++;
- section = (struct uci_section *) uci_malloc(ctx, sizeof(struct uci_section));
- section->package = package;
- uci_list_init(§ion->list);
- uci_list_init(§ion->options);
- section->type = uci_strdup(ctx, type);
- if (name && name[0])
- section->name = uci_strdup(ctx, name);
- else
- asprintf(§ion->name, "cfg%d", package->n_section);
- uci_list_add(&package->sections, §ion->list);
- UCI_TRAP_RESTORE(ctx);
+ uci_foreach_element_safe(&s->options, tmp, o) {
+ uci_free_option(uci_to_option(o));
+ }
+ uci_free_element(&s->e);
+}
- return section;
+static struct uci_package *
+uci_alloc_package(struct uci_context *ctx, const char *name)
+{
+ struct uci_package *p;
-error:
- uci_drop_section(section);
- UCI_THROW(ctx, ctx->errno);
- return NULL;
+ 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_drop_config(struct uci_package *package)
+static void
+uci_free_package(struct uci_package *p)
{
- struct uci_section *s;
+ struct uci_element *e, *tmp;
- if(!package)
+ if(!p)
return;
- uci_foreach_entry(section, &package->sections, s) {
- uci_list_del(&s->list);
- uci_drop_section(s);
+ uci_foreach_element_safe(&p->sections, tmp, e) {
+ uci_free_section(uci_to_section(e));
}
+ uci_free_element(&p->e);
+}
- if (package->name)
- free(package->name);
- free(package);
+/* record a change that was done to a package */
+static inline void
+uci_add_history(struct uci_context *ctx, struct uci_package *p, int cmd, char *section, char *option, char *value)
+{
+ struct uci_history *h = (struct uci_history *) uci_malloc(ctx, sizeof(struct uci_history));
+
+ uci_list_init(&h->list);
+ h->cmd = cmd;
+ h->section = section;
+ h->option = option;
+ h->value = value;
+ uci_list_add(&p->history, &h->list);
}
-static struct uci_package *uci_alloc_config(struct uci_context *ctx, const char *name)
+static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_list *list, char *name)
{
- struct uci_package *package = NULL;
+ struct uci_element *e;
- UCI_TRAP_SAVE(ctx, error);
- package = (struct uci_package *) uci_malloc(ctx, sizeof(struct uci_package));
- uci_list_init(&package->list);
- uci_list_init(&package->sections);
- package->name = uci_strdup(ctx, name);
- package->ctx = ctx;
- UCI_TRAP_RESTORE(ctx);
- return package;
-
-error:
- uci_drop_config(package);
- UCI_THROW(ctx, ctx->errno);
- return NULL;
+ uci_foreach_element(list, e) {
+ if (!strcmp(e->name, name))
+ return e;
+ }
+ UCI_THROW(ctx, UCI_ERR_NOTFOUND);
}
-int uci_unload(struct uci_context *ctx, const char *name)
+int uci_lookup(struct uci_context *ctx, struct uci_element **res, char *package, char *section, char *option)
{
- struct uci_package *package;
+ struct uci_element *e;
+ struct uci_package *p;
+ struct uci_section *s;
+ struct uci_option *o;
UCI_HANDLE_ERR(ctx);
- UCI_ASSERT(ctx, name != NULL);
+ UCI_ASSERT(ctx, res != NULL);
+ UCI_ASSERT(ctx, package != NULL);
- uci_foreach_entry(package, &ctx->root, package) {
- if (!strcmp(package->name, name))
- goto found;
- }
- UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+ e = uci_lookup_list(ctx, &ctx->root, package);
+ if (!section)
+ goto found;
-found:
- uci_list_del(&package->list);
- uci_drop_config(package);
+ p = uci_to_package(e);
+ e = uci_lookup_list(ctx, &p->sections, section);
+ if (!option)
+ goto found;
+
+ s = uci_to_section(e);
+ e = uci_lookup_list(ctx, &s->options, option);
+found:
+ *res = e;
return 0;
}
-static inline char *get_filename(char *path)
+int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, char *value)
{
- char *p;
+ int size;
+ char *str;
+ struct uci_list *list;
+ struct uci_element *e;
- p = strrchr(path, '/');
- p++;
- if (!*p)
- return NULL;
- return p;
+ UCI_HANDLE_ERR(ctx);
+ UCI_ASSERT(ctx, value != NULL);
+ UCI_ASSERT(ctx, element != NULL);
+ UCI_ASSERT(ctx, *element != NULL);
+
+ /* what the 'value' of an element means depends on the type
+ * for a section, the 'value' means its type
+ * for an option, the 'value' means its value string
+ * when changing the value, shrink the element to its actual size
+ * (it may have been allocated with a bigger size, to include
+ * its buffer)
+ * then duplicate the string passed on the command line and
+ * insert it into the structure.
+ */
+ e = *element;
+ list = e->list.prev;
+ switch(e->type) {
+ case UCI_TYPE_SECTION:
+ size = sizeof(struct uci_section);
+ break;
+ case UCI_TYPE_OPTION:
+ size = sizeof(struct uci_option);
+ break;
+ default:
+ UCI_THROW(ctx, UCI_ERR_INVAL);
+ break;
+ }
+
+ uci_list_del(&e->list);
+ e = uci_realloc(ctx, e, size);
+ str = uci_strdup(ctx, value);
+ uci_list_insert(list, &e->list);
+ *element = e;
+
+ switch(e->type) {
+ case UCI_TYPE_SECTION:
+ uci_to_section(e)->type = value;
+ break;
+ case UCI_TYPE_OPTION:
+ uci_to_option(e)->value = value;
+ break;
+ default:
+ break;
+ }
+
+ return 0;
}
-char **uci_list_configs(struct uci_context *ctx)
+int uci_set(struct uci_context *ctx, char *package, char *section, char *option, char *value)
{
- char **configs;
- glob_t globbuf;
- int size, i;
- char *buf;
+ struct uci_element *e;
+ struct uci_package *p = NULL;
+ struct uci_section *s = NULL;
+ struct uci_option *o = NULL;
+ struct uci_history *h;
- if (glob(UCI_CONFDIR "/*", GLOB_MARK, NULL, &globbuf) != 0)
- return NULL;
+ UCI_HANDLE_ERR(ctx);
+ UCI_ASSERT(ctx, package != NULL);
+ UCI_ASSERT(ctx, section != NULL);
+
+ fprintf(stderr, "uci_set: '%s' '%s' '%s' = '%s'\n", package, section, option, 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_TRAP_SAVE(ctx, notfound);
+ e = uci_lookup_list(ctx, &ctx->root, package);
+ if (!e)
+ goto notfound;
+
+ p = uci_to_package(e);
+ e = uci_lookup_list(ctx, &p->sections, section);
+ if (!e)
+ goto notfound;
+ s = uci_to_section(e);
+
+ if (option) {
+ e = uci_lookup_list(ctx, &s->options, option);
+ if (!e)
+ goto notfound;
+ o = uci_to_option(e);
+ }
+ UCI_TRAP_RESTORE(ctx);
- size = sizeof(char *) * (globbuf.gl_pathc + 1);
- for(i = 0; i < globbuf.gl_pathc; i++) {
- char *p;
+ /*
+ * no unknown element was supplied, assume that we can just update
+ * an existing entry
+ */
+ if (o)
+ e = &o->e;
+ else
+ e = &s->e;
+
+ uci_add_history(ctx, p, UCI_CMD_CHANGE, section, option, value);
+ return uci_set_element_value(ctx, &e, value);
+
+notfound:
+ /*
+ * the entry that we need to update was not found,
+ * check if the search failed prematurely.
+ * this can happen if the package was not found, or if
+ * an option was supplied, but the section wasn't found
+ */
+ if (!p || (!s && option))
+ UCI_THROW(ctx, ctx->errno);
+
+ /* now add the missing entry */
+ uci_add_history(ctx, p, UCI_CMD_ADD, section, option, value);
+ if (s)
+ uci_alloc_option(s, option, value);
+ else
+ uci_alloc_section(p, section, value);
- p = get_filename(globbuf.gl_pathv[i]);
- if (!p)
- continue;
+ return 0;
+}
- size += strlen(p) + 1;
- }
+int uci_unload(struct uci_context *ctx, const char *name)
+{
+ struct uci_element *e;
- configs = malloc(size);
- if (!configs)
- return NULL;
+ UCI_HANDLE_ERR(ctx);
+ UCI_ASSERT(ctx, name != NULL);
- memset(configs, 0, size);
- buf = (char *) &configs[globbuf.gl_pathc + 1];
- for(i = 0; i < globbuf.gl_pathc; i++) {
- char *p;
+ uci_foreach_element(&ctx->root, e) {
+ if (!strcmp(e->name, name))
+ goto found;
+ }
+ UCI_THROW(ctx, UCI_ERR_NOTFOUND);
- p = get_filename(globbuf.gl_pathv[i]);
- if (!p)
- continue;
+found:
+ uci_free_package(uci_to_package(e));
- configs[i] = buf;
- strcpy(buf, p);
- buf += strlen(buf) + 1;
- }
- return configs;
+ return 0;
}
projects / project / uci.git / blobdiff