add import merging functionality, fix error handling in uci_import

diff --git a/file.c b/file.c
index fe52876fa446001cfa1562653b157fc9a9bc6178..afa57bfcbca66d0ab7f4dcc61f13d22fda24d390 100644 (file)
--- a/file.c
+++ b/file.c
@@ -372,6 +372,7 @@ static void uci_fixup_section(struct uci_context *ctx, struct uci_section *s)
  */
 static void uci_parse_config(struct uci_context *ctx, char **str)
 {
+       struct uci_parse_context *pctx = ctx->pctx;
        struct uci_section *s;
        char *name = NULL;
        char *type = NULL;
@@ -390,7 +391,11 @@ static void uci_parse_config(struct uci_context *ctx, char **str)
        type = next_arg(ctx, str, true, true);
        name = next_arg(ctx, str, false, true);
        assert_eol(ctx, str);
-       ctx->pctx->section = uci_alloc_section(ctx->pctx->package, type, name);
+
+       if (pctx->merge)
+               UCI_INTERNAL(uci_set, ctx, pctx->package, name, NULL, type);
+       else
+               pctx->section = uci_alloc_section(pctx->package, type, name);
 }
 
 /*
@@ -398,10 +403,11 @@ static void uci_parse_config(struct uci_context *ctx, char **str)
  */
 static void uci_parse_option(struct uci_context *ctx, char **str)
 {
+       struct uci_parse_context *pctx = ctx->pctx;
        char *name = NULL;
        char *value = NULL;
 
-       if (!ctx->pctx->section)
+       if (!pctx->section)
                uci_parse_error(ctx, *str, "option command found before the first section");
 
        /* command string null-terminated by strtok */
@@ -410,7 +416,11 @@ static void uci_parse_option(struct uci_context *ctx, char **str)
        name = next_arg(ctx, str, true, true);
        value = next_arg(ctx, str, true, false);
        assert_eol(ctx, str);
-       uci_alloc_option(ctx->pctx->section, name, value);
+
+       if (pctx->merge)
+               UCI_INTERNAL(uci_set, ctx, pctx->package, pctx->section->e.name, name, value);
+       else
+               uci_alloc_option(pctx->section, name, value);
 }
 
 
@@ -537,6 +547,7 @@ int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *packag
 int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package, bool single)
 {
        struct uci_parse_context *pctx;
+       UCI_HANDLE_ERR(ctx);
 
        /* make sure no memory from previous parse attempts is leaked */
        uci_file_cleanup(ctx);
@@ -544,6 +555,10 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
        pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
        ctx->pctx = pctx;
        pctx->file = stream;
+       if (*package && single) {
+               pctx->package = *package;
+               pctx->merge = true;
+       }
 
        /*
         * If 'name' was supplied, assume that the supplied stream does not contain

diff --git a/list.c b/list.c
index ae7fce841695056895152e845fa2fe64095806ee..4ff4f7b342bf340c9c5eb82b8d1a3f2d2a6ee779 100644 (file)
--- a/list.c
+++ b/list.c
@@ -455,6 +455,8 @@ int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char
                if (!e)
                        goto notfound;
                o = uci_to_option(e);
+       } else if (internal && ctx->pctx) {
+               ctx->pctx->section = s;
        }
 
        /* 

diff --git a/uci.h b/uci.h
index 93f8bce9730726c14a2627cc004724e4b4dd939a..6b5de9a598f3bd19237912fcd46d85f61d7e927f 100644 (file)
--- a/uci.h
+++ b/uci.h
@@ -105,6 +105,7 @@ extern void uci_perror(struct uci_context *ctx, const char *str);
  * @single: ignore the 'package' keyword and parse everything into a single package
  *
  * the name parameter is for config files that don't explicitly use the 'package <...>' keyword
+ * if 'package' points to a non-null struct pointer, enable history tracking and merge 
  */
 extern int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package, bool single);
 
@@ -276,6 +277,7 @@ struct uci_parse_context
        /* private: */
        struct uci_package *package;
        struct uci_section *section;
+       bool merge;
        FILE *file;
        const char *name;
        char *buf;