From: Felix Fietkau Date: Tue, 18 Aug 2009 19:00:34 +0000 (+0200) Subject: when running uci set with an empty value, fall back to uci remove X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=83300a90f50a2af5592edbfb2952ac4009041d20;p=uci.git when running uci set with an empty value, fall back to uci remove --- diff --git a/list.c b/list.c index adff017..352596d 100644 --- a/list.c +++ b/list.c @@ -656,7 +656,7 @@ int uci_set(struct uci_context *ctx, struct uci_ptr *ptr) expand_ptr(ctx, ptr, false); UCI_ASSERT(ctx, ptr->value); UCI_ASSERT(ctx, ptr->s || (!ptr->option && ptr->section)); - if (!ptr->option) { + if (!ptr->option && ptr->value[0]) { UCI_ASSERT(ctx, uci_validate_type(ptr->value)); } @@ -666,7 +666,9 @@ int uci_set(struct uci_context *ctx, struct uci_ptr *ptr) if (e) ptr->o = uci_to_option(e); } - if (!ptr->o && ptr->option) { /* new option */ + if (!ptr->value[0]) { + return uci_delete(ctx, ptr); + } else if (!ptr->o && ptr->option) { /* new option */ ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value); ptr->last = &ptr->o->e; } else if (!ptr->s && ptr->section) { /* new section */