X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=list.c;h=c4b84e23d8f8bc84e5e3dfcfa039f2d2558e21c3;hp=0cb6daded734eb2a85c04ebc535308616c02ec99;hb=179b6f5fced8a0c1028ee56451efa26e40392961;hpb=4fb6a564b8eebe01f46766b8238a64d6414ed3ba diff --git a/list.c b/list.c index 0cb6dad..c4b84e2 100644 --- a/list.c +++ b/list.c @@ -620,6 +620,12 @@ int uci_set(struct uci_context *ctx, struct uci_ptr *ptr) UCI_ASSERT(ctx, uci_validate_str(ptr->value, false)); } + if (!ptr->o && ptr->s && ptr->option) { + struct uci_element *e; + e = uci_lookup_list(&ptr->s->options, ptr->option); + if (e) + ptr->o = uci_to_option(e); + } if (!ptr->o && ptr->option) { /* new option */ ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value); ptr->last = &ptr->o->e; @@ -627,6 +633,9 @@ int uci_set(struct uci_context *ctx, struct uci_ptr *ptr) ptr->s = uci_alloc_section(ptr->p, ptr->value, ptr->section); ptr->last = &ptr->s->e; } else if (ptr->o && ptr->option) { /* update option */ + if ((ptr->o->type == UCI_TYPE_STRING) && + !strcmp(ptr->o->v.string, ptr->value)) + return 0; uci_free_option(ptr->o); ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value); ptr->last = &ptr->o->e;