static inline void
uci_free_option(struct uci_option *o)
{
+ if ((o->value != uci_dataptr(o)) &&
+ (o->value != NULL))
+ free(o->value);
uci_free_element(&o->e);
}
uci_foreach_element_safe(&s->options, tmp, o) {
uci_free_option(uci_to_option(o));
}
+ if ((s->type != uci_dataptr(s)) &&
+ (s->type != NULL))
+ free(s->type);
uci_free_element(&s->e);
}
+/* record a change that was done to a package */
+static void
+uci_add_history(struct uci_context *ctx, struct uci_package *p, int cmd, char *section, char *option, char *value)
+{
+ struct uci_history *h;
+ int size = strlen(section) + 1;
+ char *ptr;
+
+ if (!p->confdir)
+ return;
+
+ if (value)
+ size += strlen(section) + 1;
+
+ h = uci_alloc_element(ctx, history, option, size);
+ ptr = uci_dataptr(h);
+ h->cmd = cmd;
+ h->section = strcpy(ptr, section);
+ if (value) {
+ ptr += strlen(ptr) + 1;
+ h->value = strcpy(ptr, value);
+ }
+ uci_list_add(&p->history, &h->e.list);
+}
+
+static void
+uci_free_history(struct uci_history *h)
+{
+ if (!h)
+ return;
+ if ((h->section != NULL) &&
+ (h->section != uci_dataptr(h))) {
+ free(h->section);
+ free(h->value);
+ }
+ uci_free_element(&h->e);
+}
+
static struct uci_package *
uci_alloc_package(struct uci_context *ctx, const char *name)
{
}
static void
-uci_free_package(struct uci_package *p)
+uci_free_package(struct uci_package **package)
{
struct uci_element *e, *tmp;
+ struct uci_package *p = *package;
if(!p)
return;
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_free_element(&p->e);
-}
-
-/* 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;
- int size = 0;
- char *ptr;
-
- h = uci_alloc_element(ctx, history, option, strlen(section) + strlen(value) + 2);
- ptr = uci_dataptr(h);
- h->cmd = cmd;
- h->section = strcpy(ptr, section);
- ptr += strlen(ptr) + 1;
- h->value = strcpy(ptr, value);
- uci_list_add(&p->history, &h->e.list);
+ *package = NULL;
}
static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_list *list, const char *name)
return 0;
}
+int uci_del_element(struct uci_context *ctx, struct uci_element *e)
+{
+ /* NB: UCI_INTERNAL use means without history tracking */
+ bool internal = ctx->internal;
+ struct uci_package *p = NULL;
+ struct uci_section *s = NULL;
+ struct uci_option *o = NULL;
+ struct uci_element *i, *tmp;
+ char *option = NULL;
+
+ UCI_HANDLE_ERR(ctx);
+ UCI_ASSERT(ctx, e != NULL);
+
+ switch(e->type) {
+ case UCI_TYPE_SECTION:
+ s = uci_to_section(e);
+ uci_foreach_element_safe(&s->options, tmp, i) {
+ uci_del_element(ctx, i);
+ }
+ break;
+ case UCI_TYPE_OPTION:
+ o = uci_to_option(e);
+ s = o->section;
+ p = s->package;
+ option = e->name;
+ break;
+ default:
+ UCI_THROW(ctx, UCI_ERR_INVAL);
+ break;
+ }
+
+ p = s->package;
+ if (!internal)
+ uci_add_history(ctx, p, UCI_CMD_REMOVE, s->e.name, option, NULL);
+
+ switch(e->type) {
+ case UCI_TYPE_SECTION:
+ uci_free_section(s);
+ break;
+ case UCI_TYPE_OPTION:
+ uci_free_option(o);
+ break;
+ default:
+ break;
+ }
+ return 0;
+}
+
int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, char *value)
{
+ /* NB: UCI_INTERNAL use means without history tracking */
bool internal = ctx->internal;
struct uci_list *list;
struct uci_element *e;
return 0;
}
-int uci_set(struct uci_context *ctx, char *package, char *section, char *option, char *value)
+int uci_del(struct uci_context *ctx, struct uci_package *p, char *section, char *option)
{
+ /* NB: pass on internal flag to uci_del_element */
+ bool internal = ctx->internal;
struct uci_element *e;
- struct uci_package *p = NULL;
struct uci_section *s = NULL;
struct uci_option *o = NULL;
- struct uci_history *h;
+
+ UCI_HANDLE_ERR(ctx);
+ UCI_ASSERT(ctx, p != NULL);
+ UCI_ASSERT(ctx, section != NULL);
+
+ UCI_INTERNAL(uci_lookup, ctx, &e, p, section, option);
+
+ if (!internal)
+ return uci_del_element(ctx, e);
+ UCI_INTERNAL(uci_del_element, ctx, e);
+
+ return 0;
+}
+
+int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *value)
+{
+ /* NB: UCI_INTERNAL use means without history tracking */
bool internal = ctx->internal;
+ struct uci_element *e = NULL;
+ struct uci_section *s = NULL;
+ struct uci_option *o = NULL;
+ struct uci_history *h;
UCI_HANDLE_ERR(ctx);
- UCI_ASSERT(ctx, package != NULL);
+ UCI_ASSERT(ctx, p != NULL);
UCI_ASSERT(ctx, section != NULL);
UCI_ASSERT(ctx, value != NULL);
* if the section/option is to be modified and it is not found
* create a new element in the appropriate list
*/
- 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;
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, p != NULL);
- uci_free_package(p);
+ uci_free_package(&p);
return 0;
}
projects / project / uci.git / blobdiff