From 6ae6536eddd7605135a5e18c92fefc3e442943bd Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 23 Aug 2008 13:36:39 +0200 Subject: [PATCH] filter out duplicate changes when using uci_set to change option values --- list.c | 9 +++++++++ 1 file changed, 9 insertions(+) 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; -- 2.11.0