* GNU General Public License for more details.
*/
-#include <glob.h>
-
/* initialize a list head/item */
static inline void uci_list_init(struct uci_list *ptr)
{
struct uci_option *o;
o = uci_alloc_element(ctx, option, name, strlen(value) + 1);
- o->value = uci_dataptr(o);
+ o->type = UCI_TYPE_STRING;
+ o->v.string = uci_dataptr(o);
o->section = s;
- strcpy(o->value, value);
+ strcpy(o->v.string, value);
uci_list_add(&s->options, &o->e.list);
return o;
static inline void
uci_free_option(struct uci_option *o)
{
- if ((o->value != uci_dataptr(o)) &&
- (o->value != NULL))
- free(o->value);
+ struct uci_element *e, *tmp;
+
+ switch(o->type) {
+ case UCI_TYPE_STRING:
+ if ((o->v.string != uci_dataptr(o)) &&
+ (o->v.string != NULL))
+ free(o->v.string);
+ break;
+ case UCI_TYPE_LIST:
+ uci_foreach_element_safe(&o->v.list, tmp, e) {
+ uci_free_element(e);
+ }
+ break;
+ default:
+ break;
+ }
uci_free_element(&o->e);
}
+static struct uci_option *
+uci_alloc_list(struct uci_section *s, const char *name)
+{
+ struct uci_package *p = s->package;
+ struct uci_context *ctx = p->ctx;
+ struct uci_option *o;
+
+ o = uci_alloc_element(ctx, option, name, 0);
+ o->type = UCI_TYPE_LIST;
+ o->section = s;
+ uci_list_init(&o->v.list);
+ uci_list_add(&s->options, &o->e.list);
+
+ return o;
+}
+
/* 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)
{
*/
hash = djbhash(hash, s->type);
uci_foreach_element(&s->options, e) {
+ struct uci_option *o;
hash = djbhash(hash, e->name);
- hash = djbhash(hash, uci_to_option(e)->value);
+ o = uci_to_option(e);
+ switch(o->type) {
+ case UCI_TYPE_STRING:
+ hash = djbhash(hash, o->v.string);
+ break;
+ default:
+ break;
+ }
}
sprintf(buf, "cfg%02x%04x", ++s->package->n_section, hash % (1 << 16));
s->e.name = uci_strdup(ctx, buf);
return NULL;
}
-int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *p, char *section, char *option)
+int uci_lookup_ext(struct uci_context *ctx, struct uci_element **res, char *ptr)
+{
+ struct uci_package *p = NULL;
+ struct uci_element *e;
+ struct uci_section *s;
+ char *package = NULL;
+ char *section = NULL;
+ char *option = NULL;
+ char *idxstr, *t;
+ int idx, c;
+
+ UCI_HANDLE_ERR(ctx);
+ UCI_ASSERT(ctx, res != NULL);
+ UCI_ASSERT(ctx, ptr != NULL);
+
+ UCI_INTERNAL(uci_parse_tuple, ctx, ptr, &package, §ion, &option, NULL);
+
+ /* look up the package first */
+ e = uci_lookup_list(&ctx->root, package);
+ if (!e) {
+ UCI_INTERNAL(uci_load, ctx, package, &p);
+ if (!p)
+ goto notfound;
+ e = &p->e;
+ } else {
+ p = uci_to_package(e);
+ }
+
+ if (!section)
+ goto done;
+
+ /* if the section name validates as a regular name, pass through
+ * to the regular uci_lookup function call */
+ if (!*section || uci_validate_name(section)) {
+ UCI_INTERNAL(uci_lookup, ctx, &e, p, section, option);
+ goto done;
+ }
+
+ /* name did not validate, that means we have an extended lookup call
+ * parse it here. for now only the section index syntax is supported */
+ if (section[0] != '@')
+ goto error;
+
+ section++;
+
+ /* parse the section index part */
+ idxstr = strchr(section, '[');
+ if (!idxstr)
+ goto error;
+ *idxstr = 0;
+ idxstr++;
+
+ t = strchr(idxstr, ']');
+ if (!t)
+ goto error;
+ if (t[1] != 0)
+ goto error;
+ *t = 0;
+
+ t = NULL;
+ idx = strtol(idxstr, &t, 10);
+ if (t && *t)
+ goto error;
+
+ if (!*section)
+ section = NULL;
+ if (section && !uci_validate_str(section, false))
+ goto error;
+
+ /* if the given index is negative, it specifies the section number from
+ * the end of the list */
+ if (idx < 0) {
+ c = 0;
+ uci_foreach_element(&p->sections, e) {
+ s = uci_to_section(e);
+ if (section && (strcmp(s->type, section) != 0))
+ continue;
+
+ c++;
+ }
+ idx += c;
+ }
+
+ c = 0;
+ uci_foreach_element(&p->sections, e) {
+ s = uci_to_section(e);
+ if (section && (strcmp(s->type, section) != 0))
+ continue;
+
+ if (idx == c)
+ goto found;
+ c++;
+ }
+ goto notfound;
+
+found:
+ if (option)
+ e = uci_lookup_list(&s->options, option);
+done:
+ *res = e;
+ return 0;
+
+notfound:
+ UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+error:
+ UCI_THROW(ctx, UCI_ERR_INVAL);
+ return 0;
+}
+
+int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *p, const char *section, const char *option)
{
struct uci_element *e;
struct uci_section *s;
default:
break;
}
+
return 0;
}
-int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, char *value)
+int uci_add_element_list(struct uci_context *ctx, struct uci_option *o, const char *value)
+{
+ struct uci_element *e;
+ struct uci_package *p;
+ struct uci_section *s;
+ bool internal = ctx->internal;
+
+ UCI_HANDLE_ERR(ctx);
+ UCI_ASSERT(ctx, (o != NULL) && (o->type == UCI_TYPE_LIST) && uci_validate_text(value));
+
+ s = o->section;
+ p = s->package;
+
+ if (!internal && p->has_history)
+ uci_add_history(ctx, &p->history, UCI_CMD_LIST_ADD, s->e.name, o->e.name, value);
+
+ e = uci_alloc_generic(ctx, UCI_TYPE_ITEM, value, sizeof(struct uci_option));
+ uci_list_add(&o->v.list, &e->list);
+
+ return 0;
+}
+
+int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, const char *value)
{
/* NB: UCI_INTERNAL use means without history tracking */
bool internal = ctx->internal;
struct uci_element *e;
struct uci_package *p;
struct uci_section *s;
+ struct uci_option *o;
char *section;
char *option;
char *str;
- int size;
+ int size = 0;
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, (element != NULL) && (*element != NULL));
*/
e = *element;
list = e->list.prev;
+
switch(e->type) {
case UCI_TYPE_SECTION:
UCI_ASSERT(ctx, uci_validate_str(value, false));
s = uci_to_section(e);
section = e->name;
option = NULL;
+ /* matches the currently set value */
+ if (!strcmp(value, s->type))
+ return 0;
break;
+
case UCI_TYPE_OPTION:
UCI_ASSERT(ctx, value != NULL);
- size = sizeof(struct uci_option);
- s = uci_to_option(e)->section;
+ o = uci_to_option(e);
+ s = o->section;
section = s->e.name;
- option = e->name;
+ option = o->e.name;
+ switch(o->type) {
+ case UCI_TYPE_STRING:
+ size = sizeof(struct uci_option);
+ /* matches the currently set value */
+ if (!strcmp(value, o->v.string))
+ return 0;
+ break;
+ default:
+ /* default action for non-string datatypes is to delete
+ * the existing entry, then re-create it as a string */
+ break;
+ }
break;
+
default:
UCI_THROW(ctx, UCI_ERR_INVAL);
return 0;
if (!internal && p->has_history)
uci_add_history(ctx, &p->history, UCI_CMD_CHANGE, section, option, value);
+ if ((e->type == UCI_TYPE_OPTION) && (size == 0)) {
+ o = uci_alloc_option(s, option, value);
+ UCI_INTERNAL(uci_del_element, ctx, e);
+ *element = &o->e;
+ goto done;
+ }
+
uci_list_del(&e->list);
e = uci_realloc(ctx, e, size);
str = uci_strdup(ctx, value);
uci_to_section(e)->type = str;
break;
case UCI_TYPE_OPTION:
- uci_to_option(e)->value = str;
+ uci_to_option(e)->v.string = str;
break;
default:
break;
}
+done:
return 0;
}
return 0;
}
-int uci_add_section(struct uci_context *ctx, struct uci_package *p, char *type, struct uci_section **res)
+int uci_add_section(struct uci_context *ctx, struct uci_package *p, const char *type, struct uci_section **res)
{
bool internal = ctx->internal;
struct uci_section *s;
return 0;
}
-int uci_delete(struct uci_context *ctx, struct uci_package *p, char *section, char *option)
+int uci_delete(struct uci_context *ctx, struct uci_package *p, const char *section, const char *option)
{
/* NB: pass on internal flag to uci_del_element */
bool internal = ctx->internal;
return uci_del_element(ctx, e);
}
-int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *value, struct uci_element **result)
+int uci_add_list(struct uci_context *ctx, struct uci_package *p, const char *section, const char *option, const char *value, struct uci_option **result)
+{
+ /* NB: UCI_INTERNAL use means without history tracking */
+ bool internal = ctx->internal;
+ struct uci_element *e;
+ struct uci_section *s;
+ struct uci_option *o;
+ struct uci_option *prev = NULL;
+ const char *value2 = NULL;
+
+ UCI_HANDLE_ERR(ctx);
+ UCI_ASSERT(ctx, p && section && option && value && uci_validate_text(value));
+
+ /* look up the section first */
+ UCI_INTERNAL(uci_lookup, ctx, &e, p, section, NULL);
+ s = uci_to_section(e);
+
+ e = uci_lookup_list(&s->options, option);
+ if (e) {
+ o = uci_to_option(e);
+ switch (o->type) {
+ case UCI_TYPE_STRING:
+ /* we already have a string value, let's convert that to a list */
+ prev = o;
+ value2 = value;
+ value = o->v.string;
+ break;
+ case UCI_TYPE_LIST:
+ if (result)
+ *result = o;
+
+ ctx->internal = internal;
+ return uci_add_element_list(ctx, o, value);
+ default:
+ UCI_THROW(ctx, UCI_ERR_INVAL);
+ break;
+ }
+ }
+
+ o = uci_alloc_list(s, option);
+ if (result)
+ *result = o;
+ if (prev) {
+ UCI_INTERNAL(uci_add_element_list, ctx, o, value);
+ uci_free_option(prev);
+ value = value2;
+ }
+
+ ctx->internal = internal;
+ return uci_add_element_list(ctx, o, value);
+}
+
+int uci_set(struct uci_context *ctx, struct uci_package *p, const char *section, const char *option, const char *value, struct uci_element **result)
{
/* NB: UCI_INTERNAL use means without history tracking */
bool internal = ctx->internal;
projects / project / uci.git / blobdiff