X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=list.c;h=066a9fd789008474e25b7aecd476857018756318;hp=dee6a14ff9f0d2d2a72c87e4c8890efbf269665e;hb=8ea07e430df35634c09dc63d8c0cb644522bbe69;hpb=3f70540dd2f63b866db50a76bbed2e087a276758 diff --git a/list.c b/list.c index dee6a14..066a9fd 100644 --- a/list.c +++ b/list.c @@ -12,6 +12,8 @@ * GNU General Public License for more details. */ +#include + /* initialize a list head/item */ static inline void uci_list_init(struct uci_list *ptr) { @@ -20,19 +22,19 @@ static inline void uci_list_init(struct uci_list *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) +static inline void uci_list_insert(struct uci_list *list, struct uci_list *ptr) { - prev->next = ptr; - next->prev = ptr; - ptr->prev = prev; - ptr->next = next; + 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) @@ -44,75 +46,173 @@ static inline void uci_list_del(struct uci_list *ptr) prev->next = next; next->prev = prev; + + uci_list_init(ptr); } -static void uci_drop_section(struct uci_section *section) +static struct uci_element * +uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size) { - if (!section) + 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 void +uci_free_element(struct uci_element *e) +{ + if (!e) return; - /* TODO: drop options */ - if (section->name) - free(section->name); - if (section->type) - free(section->type); - free(section); + + if (!uci_list_empty(&e->list)) + uci_list_del(&e->list); + free(e); +} + +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; + + 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 struct uci_section *uci_add_section(struct uci_config *cfg, const char *type, const char *name) +static inline void +uci_free_option(struct uci_option *o) { - struct uci_section *section = NULL; - struct uci_context *ctx = cfg->ctx; - - UCI_TRAP_SAVE(ctx, error) - section = (struct uci_section *) uci_malloc(ctx, sizeof(struct uci_section)); - section->config = cfg; - uci_list_init(§ion->list); - uci_list_init(§ion->options); - uci_list_add(&cfg->sections, §ion->list); - section->type = uci_strdup(ctx, type); - if (name) - section->name = uci_strdup(ctx, name); - UCI_TRAP_RESTORE(ctx); - - return section; - -error: - uci_drop_section(section); - UCI_THROW(ctx, ctx->errno); - return NULL; + uci_free_element(&o->e); } -static void uci_drop_file(struct uci_config *cfg) +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]; + + if (!name || !name[0]) { + snprintf(buf, 16, "cfg%d", p->n_section); + name = buf; + } + + 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 void +uci_free_section(struct uci_section *s) +{ + struct uci_element *o, *tmp; + + uci_foreach_element_safe(&s->options, tmp, o) { + uci_free_option(uci_to_option(o)); + } + uci_free_element(&s->e); +} + +static struct uci_package * +uci_alloc_package(struct uci_context *ctx, const char *name) +{ + struct uci_package *p; - if(!cfg) + p = uci_alloc_element(ctx, package, name, 0); + p->ctx = ctx; + uci_list_init(&p->sections); + return p; +} + +static void +uci_free_package(struct uci_package *p) +{ + struct uci_element *e, *tmp; + + if(!p) return; - uci_foreach_entry(section, &cfg->sections, s) { - uci_drop_section(s); + + uci_foreach_element_safe(&p->sections, tmp, e) { + uci_free_section(uci_to_section(e)); } - if (cfg->name) - free(cfg->name); - free(cfg); + uci_free_element(&p->e); } +static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_list *list, char *name) +{ + struct uci_element *e; -static struct uci_config *uci_alloc_file(struct uci_context *ctx, const char *name) + uci_foreach_element(list, e) { + if (!strcmp(e->name, name)) + return e; + } + UCI_THROW(ctx, UCI_ERR_NOTFOUND); +} + +int uci_lookup(struct uci_context *ctx, struct uci_element **res, char *package, char *section, char *option) { - struct uci_config *cfg = NULL; - - UCI_TRAP_SAVE(ctx, error) - cfg = (struct uci_config *) uci_malloc(ctx, sizeof(struct uci_config)); - uci_list_init(&cfg->list); - uci_list_init(&cfg->sections); - cfg->name = uci_strdup(ctx, name); - cfg->ctx = ctx; - UCI_TRAP_RESTORE(ctx); - return cfg; - -error: - uci_drop_file(cfg); - UCI_THROW(ctx, ctx->errno); - return NULL; + struct uci_element *e; + struct uci_package *p; + struct uci_section *s; + struct uci_option *o; + + UCI_HANDLE_ERR(ctx); + UCI_ASSERT(ctx, res != NULL); + UCI_ASSERT(ctx, package != NULL); + + e = uci_lookup_list(ctx, &ctx->root, package); + if (!section) + goto found; + + 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; +} + +int uci_unload(struct uci_context *ctx, const char *name) +{ + struct uci_element *e; + + UCI_HANDLE_ERR(ctx); + UCI_ASSERT(ctx, name != NULL); + + uci_foreach_element(&ctx->root, e) { + if (!strcmp(e->name, name)) + goto found; + } + UCI_THROW(ctx, UCI_ERR_NOTFOUND); + +found: + uci_free_package(uci_to_package(e)); + + return 0; } +