* GNU General Public License for more details.
*/
#include <strings.h>
+#include <stdbool.h>
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
enum ucimap_type type;
union {
void **ptr;
- struct list_head *list;
} data;
};
struct uci_fixup {
struct list_head list;
- struct uci_sectmap *sm;
+ struct uci_sectionmap *sm;
const char *name;
- struct uci_alloc target;
+ enum ucimap_type type;
+ union ucimap_data *data;
};
-struct uci_sectmap_data {
- struct list_head list;
- struct uci_map *map;
- struct uci_sectmap *sm;
- const char *section_name;
+#define ucimap_foreach_option(_sm, _o) \
+ if (!(_sm)->options_size) \
+ (_sm)->options_size = sizeof(struct uci_optmap); \
+ for (_o = &(_sm)->options[0]; \
+ ((char *)(_o)) < ((char *) &(_sm)->options[0] + \
+ (_sm)->options_size * (_sm)->n_options); \
+ _o = (struct uci_optmap *) ((char *)(_o) + \
+ (_sm)->options_size))
- /* list of allocations done by ucimap */
- struct uci_alloc *allocmap;
- unsigned long allocmap_len;
- /* map for changed fields */
- unsigned char *cmap;
- bool done;
-};
+static inline bool
+ucimap_is_alloc(enum ucimap_type type)
+{
+ switch(type & UCIMAP_SUBTYPE) {
+ case UCIMAP_STRING:
+ return true;
+ default:
+ return false;
+ }
+}
+static inline bool
+ucimap_is_fixup(enum ucimap_type type)
+{
+ switch(type & UCIMAP_SUBTYPE) {
+ case UCIMAP_SECTION:
+ return true;
+ default:
+ return false;
+ }
+}
+
+static inline bool
+ucimap_is_simple(enum ucimap_type type)
+{
+ return ((type & UCIMAP_TYPE) == UCIMAP_SIMPLE);
+}
+
+static inline bool
+ucimap_is_list(enum ucimap_type type)
+{
+ return ((type & UCIMAP_TYPE) == UCIMAP_LIST);
+}
+
+static inline bool
+ucimap_is_custom(enum ucimap_type type)
+{
+ return ((type & UCIMAP_SUBTYPE) == UCIMAP_CUSTOM);
+}
+
+static inline void *
+ucimap_section_ptr(struct ucimap_section_data *sd)
+{
+ return ((char *) sd - sd->sm->smap_offset);
+}
+
+static inline union ucimap_data *
+ucimap_get_data(struct ucimap_section_data *sd, struct uci_optmap *om)
+{
+ void *data;
+
+ data = (char *) ucimap_section_ptr(sd) + om->offset;
+ return data;
+}
int
ucimap_init(struct uci_map *map)
static void
ucimap_free_item(struct uci_alloc *a)
{
- struct list_head *p, *tmp;
switch(a->type & UCIMAP_TYPE) {
case UCIMAP_SIMPLE:
- free(a->data.ptr);
- break;
case UCIMAP_LIST:
- list_for_each_safe(p, tmp, a->data.list) {
- struct uci_listmap *l = list_entry(p, struct uci_listmap, list);
- list_del(p);
- free(l);
- }
+ free(a->data.ptr);
break;
}
}
-static inline void
-ucimap_add_alloc(struct uci_alloc *a, void *ptr)
+static void
+ucimap_add_alloc(struct ucimap_section_data *sd, void *ptr)
{
+ struct uci_alloc *a = &sd->allocmap[sd->allocmap_len++];
a->type = UCIMAP_SIMPLE;
a->data.ptr = ptr;
}
static void
-ucimap_free_section(struct uci_map *map, struct uci_sectmap_data *sd)
+ucimap_free_section(struct uci_map *map, struct ucimap_section_data *sd)
{
- void *section = sd;
+ void *section;
int i;
- section = (char *) section + sizeof(struct uci_sectmap_data);
+ section = ucimap_section_ptr(sd);
if (!list_empty(&sd->list))
list_del(&sd->list);
- if (sd->sm->free_section)
- sd->sm->free_section(map, section);
+ if (sd->sm->free)
+ sd->sm->free(map, section);
for (i = 0; i < sd->allocmap_len; i++) {
ucimap_free_item(&sd->allocmap[i]);
struct list_head *ptr, *tmp;
list_for_each_safe(ptr, tmp, &map->sdata) {
- struct uci_sectmap_data *sd = list_entry(ptr, struct uci_sectmap_data, list);
+ struct ucimap_section_data *sd = list_entry(ptr, struct ucimap_section_data, list);
ucimap_free_section(map, sd);
}
}
static void
-ucimap_add_fixup(struct uci_map *map, void *data, struct uci_optmap *om, const char *str)
+ucimap_add_fixup(struct uci_map *map, union ucimap_data *data, struct uci_optmap *om, const char *str)
{
struct uci_fixup *f;
INIT_LIST_HEAD(&f->list);
f->sm = om->data.sm;
f->name = str;
- f->target.type = om->type;
- f->target.data.ptr = data;
+ f->type = om->type;
+ f->data = data;
list_add(&f->list, &map->fixup);
}
static void
-ucimap_add_value(union uci_datamap *data, struct uci_optmap *om, struct uci_sectmap_data *sd, const char *str)
+ucimap_add_value(union ucimap_data *data, struct uci_optmap *om, struct ucimap_section_data *sd, const char *str)
{
- union uci_datamap tdata;
- struct list_head *list = NULL;
+ union ucimap_data tdata = *data;
char *eptr = NULL;
char *s;
int val;
- if ((om->type & UCIMAP_TYPE) == UCIMAP_LIST) {
- if ((om->type & UCIMAP_SUBTYPE) == UCIMAP_SECTION) {
- ucimap_add_fixup(sd->map, data, om, str);
- return;
- }
- memset(&tdata, 0, sizeof(tdata));
- list = &data->list;
- data = &tdata;
- }
+ if (ucimap_is_list(om->type) && !ucimap_is_fixup(om->type))
+ data = &data->list->item[data->list->n_items++];
switch(om->type & UCIMAP_SUBTYPE) {
case UCIMAP_STRING:
return;
s = strdup(str);
- data->s = s;
- ucimap_add_alloc(&sd->allocmap[sd->allocmap_len++], s);
+ tdata.s = s;
+ ucimap_add_alloc(sd, s);
break;
case UCIMAP_BOOL:
val = -1;
if (val == -1)
return;
- data->b = val;
+ tdata.b = val;
break;
case UCIMAP_INT:
val = strtol(str, &eptr, om->data.i.base);
if (!eptr || *eptr == '\0')
- data->i = val;
+ tdata.i = val;
else
return;
break;
case UCIMAP_SECTION:
ucimap_add_fixup(sd->map, data, om, str);
+ return;
+ case UCIMAP_CUSTOM:
+ tdata.s = (char *) data;
break;
}
-
- if ((om->type & UCIMAP_TYPE) == UCIMAP_LIST) {
- struct uci_listmap *item;
-
- item = malloc(sizeof(struct uci_listmap));
- if (!item)
+ if (om->parse) {
+ if (om->parse(ucimap_section_ptr(sd), om, &tdata, str) < 0)
return;
-
- INIT_LIST_HEAD(&item->list);
- memcpy(&item->data, &tdata, sizeof(tdata));
- list_add(&item->list, list);
}
+ if (ucimap_is_custom(om->type))
+ return;
+ memcpy(data, &tdata, sizeof(union ucimap_data));
}
static int
-ucimap_parse_options(struct uci_map *map, struct uci_sectmap *sm, struct uci_sectmap_data *sd, struct uci_section *s)
+ucimap_parse_options(struct uci_map *map, struct uci_sectionmap *sm, struct ucimap_section_data *sd, struct uci_section *s)
{
struct uci_element *e, *l;
struct uci_option *o;
- unsigned long section;
- union uci_datamap *data;
- int i;
+ union ucimap_data *data;
- section = (unsigned long) sd + sizeof(struct uci_sectmap_data);
uci_foreach_element(&s->options, e) {
- struct uci_optmap *om = NULL;
- void *ptr = sm->options;
- int size = sm->options_size;
-
- if (!size)
- size = sizeof(struct uci_optmap);
-
- for (i = 0; i < sm->n_options; i++) {
- struct uci_optmap *tmp = ptr;
+ struct uci_optmap *om = NULL, *tmp;
+ ucimap_foreach_option(sm, tmp) {
if (strcmp(e->name, tmp->name) == 0) {
- om = ptr;
+ om = tmp;
break;
}
- ptr = (unsigned char *)ptr + size;
}
if (!om)
continue;
- data = (union uci_datamap *) (section + om->offset);
+ data = ucimap_get_data(sd, om);
o = uci_to_option(e);
- if ((o->type == UCI_TYPE_STRING) && ((om->type & UCIMAP_TYPE) == UCIMAP_SIMPLE)) {
+ if ((o->type == UCI_TYPE_STRING) && ucimap_is_simple(om->type)) {
ucimap_add_value(data, om, sd, o->v.string);
- continue;
- }
- if ((o->type == UCI_TYPE_LIST) && ((om->type & UCIMAP_TYPE) == UCIMAP_LIST)) {
- struct list_head *list;
-
- list = (struct list_head *) (section + om->offset);
- INIT_LIST_HEAD(list);
- sd->allocmap[sd->allocmap_len].type = UCIMAP_LIST;
- sd->allocmap[sd->allocmap_len++].data.list = list;
+ } else if ((o->type == UCI_TYPE_LIST) && ucimap_is_list(om->type)) {
uci_foreach_element(&o->v.list, l) {
ucimap_add_value(data, om, sd, l->name);
}
- continue;
}
}
static int
-ucimap_parse_section(struct uci_map *map, struct uci_sectmap *sm, struct uci_section *s)
+ucimap_parse_section(struct uci_map *map, struct uci_sectionmap *sm, struct uci_section *s)
{
- struct uci_sectmap_data *sd = NULL;
- void *section = NULL;
+ struct ucimap_section_data *sd = NULL;
+ struct uci_optmap *om;
char *section_name;
+ void *section;
+ int n_alloc = 2;
int err;
- sd = malloc(sm->alloc_len + sizeof(struct uci_sectmap_data));
+ if (sm->alloc) {
+ sd = sm->alloc(map, sm, s);
+ memset(sd, 0, sizeof(struct ucimap_section_data));
+ } else {
+ sd = malloc(sm->alloc_len);
+ memset(sd, 0, sm->alloc_len);
+ }
+
if (!sd)
return UCI_ERR_MEM;
- memset(sd, 0, sm->alloc_len + sizeof(struct uci_sectmap_data));
INIT_LIST_HEAD(&sd->list);
-
sd->map = map;
sd->sm = sm;
- sd->allocmap = malloc(sm->n_options * sizeof(struct uci_alloc));
+
+ ucimap_foreach_option(sm, om) {
+ if (ucimap_is_list(om->type)) {
+ union ucimap_data *data;
+ struct uci_element *e;
+ int n_elements = 0;
+ int size;
+
+ data = ucimap_get_data(sd, om);
+ uci_foreach_element(&s->options, e) {
+ struct uci_option *o = uci_to_option(e);
+ struct uci_element *tmp;
+
+ if (strcmp(e->name, om->name) != 0)
+ continue;
+
+ uci_foreach_element(&o->v.list, tmp) {
+ n_elements++;
+ }
+ break;
+ }
+ n_alloc += n_elements + 1;
+ size = sizeof(struct ucimap_list) +
+ n_elements * sizeof(union ucimap_data);
+ data->list = malloc(size);
+ memset(data->list, 0, size);
+ } else if (ucimap_is_alloc(om->type)) {
+ n_alloc++;
+ }
+ }
+
+ sd->allocmap = malloc(n_alloc * sizeof(struct uci_alloc));
if (!sd->allocmap)
goto error_mem;
goto error_mem;
memset(sd->cmap, 0, BITFIELD_SIZE(sm->n_options));
- ucimap_add_alloc(&sd->allocmap[sd->allocmap_len++], (void *)section_name);
- ucimap_add_alloc(&sd->allocmap[sd->allocmap_len++], (void *)sd->cmap);
+ ucimap_add_alloc(sd, (void *)section_name);
+ ucimap_add_alloc(sd, (void *)sd->cmap);
+ ucimap_foreach_option(sm, om) {
+ if (!ucimap_is_list(om->type))
+ continue;
- section = (char *)sd + sizeof(struct uci_sectmap_data);
+ ucimap_add_alloc(sd, ucimap_get_data(sd, om)->list);
+ }
- err = sm->init_section(map, section, s);
+ section = ucimap_section_ptr(sd);
+ err = sm->init(map, section, s);
if (err)
goto error;
}
void
-ucimap_set_changed(void *section, void *field)
+ucimap_set_changed(struct ucimap_section_data *sd, void *field)
{
- char *sptr = (char *)section - sizeof(struct uci_sectmap_data);
- struct uci_sectmap_data *sd = (struct uci_sectmap_data *) sptr;
- struct uci_sectmap *sm = sd->sm;
+ void *section = ucimap_section_ptr(sd);
+ struct uci_sectionmap *sm = sd->sm;
+ struct uci_optmap *om;
int ofs = (char *)field - (char *)section;
- int i;
+ int i = 0;
- for (i = 0; i < sm->n_options; i++) {
- if (sm->options[i].offset == ofs) {
+ ucimap_foreach_option(sm, om) {
+ if (om->offset == ofs) {
SET_BIT(sd->cmap, i);
break;
}
+ i++;
}
}
int
-ucimap_store_section(struct uci_map *map, struct uci_package *p, void *section)
+ucimap_store_section(struct uci_map *map, struct uci_package *p, struct ucimap_section_data *sd)
{
- char *sptr = (char *)section - sizeof(struct uci_sectmap_data);
- struct uci_sectmap_data *sd = (struct uci_sectmap_data *) sptr;
- struct uci_sectmap *sm = sd->sm;
+ struct uci_sectionmap *sm = sd->sm;
struct uci_section *s = NULL;
+ struct uci_optmap *om;
struct uci_element *e;
struct uci_ptr ptr;
- int i, ret;
+ int i = 0;
+ int ret;
uci_foreach_element(&p->sections, e) {
if (!strcmp(e->name, sd->section_name)) {
if (!s)
return UCI_ERR_NOTFOUND;
- for (i = 0; i < sm->n_options; i++) {
- struct uci_optmap *om = &sm->options[i];
+ ucimap_foreach_option(sm, om) {
+ union ucimap_data *data;
static char buf[32];
- const char *str = NULL;
- void *p = (char *)section + om->offset;
+ char *str = NULL;
+
+ i++;
+ if (ucimap_is_list(om->type))
+ continue;
- if (!TEST_BIT(sd->cmap, i))
+ data = ucimap_get_data(sd, om);
+ if (!TEST_BIT(sd->cmap, i - 1))
continue;
ucimap_fill_ptr(&ptr, s, om->name);
switch(om->type & UCIMAP_SUBTYPE) {
case UCIMAP_STRING:
- str = *((char **) p);
+ str = data->s;
break;
case UCIMAP_INT:
- sprintf(buf, "%d", *((int *) p));
+ sprintf(buf, "%d", data->i);
str = buf;
break;
case UCIMAP_BOOL:
- sprintf(buf, "%d", !!*((bool *)p));
+ sprintf(buf, "%d", !!data->b);
str = buf;
break;
+ case UCIMAP_CUSTOM:
+ break;
+ default:
+ continue;
}
+ if (om->format) {
+ union ucimap_data tdata, *data;
+
+ data = ucimap_get_data(sd, om);
+ if (ucimap_is_custom(om->type)) {
+ tdata.s = (char *)data;
+ data = &tdata;
+ }
+
+ if (om->format(ucimap_section_ptr(sd), om, data, &str) < 0)
+ continue;
+ }
+ if (!str)
+ continue;
ptr.value = str;
ret = uci_set(s->package->ctx, &ptr);
if (ret)
return ret;
- CLR_BIT(sd->cmap, i);
+ CLR_BIT(sd->cmap, i - 1);
}
return 0;
void *
ucimap_find_section(struct uci_map *map, struct uci_fixup *f)
{
- struct uci_sectmap_data *sd;
+ struct ucimap_section_data *sd;
struct list_head *p;
- void *ret;
list_for_each(p, &map->sdata) {
- sd = list_entry(p, struct uci_sectmap_data, list);
+ sd = list_entry(p, struct ucimap_section_data, list);
if (sd->sm != f->sm)
continue;
if (strcmp(f->name, sd->section_name) != 0)
continue;
- ret = (char *)sd + sizeof(struct uci_sectmap_data);
- return ret;
+ return ucimap_section_ptr(sd);
}
return NULL;
}
list_for_each_safe(p, tmp, &map->fixup) {
struct uci_fixup *f = list_entry(p, struct uci_fixup, list);
void *ptr = ucimap_find_section(map, f);
- struct uci_listmap *li;
+ struct ucimap_list *list;
if (!ptr)
continue;
- switch(f->target.type & UCIMAP_TYPE) {
+ switch(f->type & UCIMAP_TYPE) {
case UCIMAP_SIMPLE:
- *f->target.data.ptr = ptr;
+ f->data->section = ptr;
break;
case UCIMAP_LIST:
- li = malloc(sizeof(struct uci_listmap));
- memset(li, 0, sizeof(struct uci_listmap));
- INIT_LIST_HEAD(&li->list);
- li->data.section = ptr;
- list_add(&li->list, f->target.data.list);
+ list = f->data->list;
+ list->item[list->n_items++].section = ptr;
break;
}
+ free(f);
}
list_for_each_safe(p, tmp, &map->sdata) {
- struct uci_sectmap_data *sd = list_entry(p, struct uci_sectmap_data, list);
+ struct ucimap_section_data *sd = list_entry(p, struct ucimap_section_data, list);
void *section;
if (sd->done)
continue;
- section = (char *) sd + sizeof(struct uci_sectmap_data);
- if (sd->sm->add_section(map, section) != 0)
+ section = ucimap_section_ptr(sd);
+ if (sd->sm->add(map, section) != 0)
ucimap_free_section(map, sd);
}
}
projects / project / uci.git / blobdiff