consistency: rename uci_config to uci_package, rename variables as well; add some...

[project/uci.git] / file.c

diff --git a/file.c b/file.c
index 8428462..3ccffb7 100644 (file)
--- a/file.c
+++ b/file.c
@@ -45,7 +45,7 @@ static void uci_getln(struct uci_context *ctx, int offset)
                p[ofs] = 0;
 
                p = fgets(p, pctx->bufsz - ofs, pctx->file);
-               if (!p || !p[ofs])
+               if (!p || !*p)
                        return;
 
                ofs += strlen(p);
@@ -67,20 +67,26 @@ static void uci_getln(struct uci_context *ctx, int offset)
 }
 
 /*
- * Clean up all extra memory used by the parser
+ * Clean up all extra memory used by the parser and exporter
  */
-static void uci_parse_cleanup(struct uci_context *ctx)
+static void uci_file_cleanup(struct uci_context *ctx)
 {
        struct uci_parse_context *pctx;
 
+       if (ctx->buf) {
+               free(ctx->buf);
+               ctx->buf = NULL;
+               ctx->bufsz = 0;
+       }
+
        pctx = ctx->pctx;
        if (!pctx)
                return;
 
        ctx->pctx = NULL;
-       if (pctx->cfg) {
-               uci_list_del(&pctx->cfg->list);
-               uci_drop_config(pctx->cfg);
+       if (pctx->package) {
+               uci_list_del(&pctx->package->list);
+               uci_drop_config(pctx->package);
        }
        if (pctx->buf)
                free(pctx->buf);
@@ -275,10 +281,10 @@ static void uci_switch_config(struct uci_context *ctx)
        name = pctx->name;
 
        /* add the last config to main config file list */
-       if (pctx->cfg) {
-               uci_list_add(&ctx->root, &pctx->cfg->list);
+       if (pctx->package) {
+               uci_list_add(&ctx->root, &pctx->package->list);
 
-               pctx->cfg = NULL;
+               pctx->package = NULL;
                pctx->section = NULL;
        }
 
@@ -295,7 +301,7 @@ static void uci_switch_config(struct uci_context *ctx)
 ignore:
        ctx->errno = 0;
 
-       pctx->cfg = uci_alloc_config(ctx, name);
+       pctx->package = uci_alloc_config(ctx, name);
 }
 
 /*
@@ -330,7 +336,7 @@ static void uci_parse_config(struct uci_context *ctx, char **str)
        char *name = NULL;
        char *type = NULL;
 
-       if (!ctx->pctx->cfg) {
+       if (!ctx->pctx->package) {
                if (!ctx->pctx->name) {
                        ctx->pctx->byte = *str - ctx->pctx->buf;
                        ctx->pctx->reason = "attempting to import a file without a package name";
@@ -346,7 +352,7 @@ static void uci_parse_config(struct uci_context *ctx, char **str)
        type = next_arg(ctx, str, true);
        name = next_arg(ctx, str, false);
        assert_eol(ctx, str);
-       ctx->pctx->section = uci_add_section(ctx->pctx->cfg, type, name);
+       ctx->pctx->section = uci_add_section(ctx->pctx->package, type, name);
        UCI_TRAP_RESTORE(ctx);
        return;
 
@@ -428,12 +434,92 @@ static void uci_parse_line(struct uci_context *ctx)
        }
 }
 
-int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_config **cfg)
+/* max number of characters that escaping adds to the string */
+#define UCI_QUOTE_ESCAPE       "'\\'"
+
+/*
+ * escape an uci string for export
+ */
+static char *uci_escape(struct uci_context *ctx, char *str)
+{
+       char *s, *p, *t;
+       int pos = 0;
+
+       if (!ctx->buf) {
+               ctx->bufsz = LINEBUF;
+               ctx->buf = malloc(LINEBUF);
+       }
+
+       s = str;
+       p = strchr(str, '\'');
+       if (!p)
+               return str;
+
+       do {
+               int len = p - s;
+               if (len > 0) {
+                       if (p + sizeof(UCI_QUOTE_ESCAPE) - str >= ctx->bufsz) {
+                               ctx->bufsz *= 2;
+                               ctx->buf = realloc(ctx->buf, ctx->bufsz);
+                               if (!ctx->buf)
+                                       UCI_THROW(ctx, UCI_ERR_MEM);
+                       }
+                       memcpy(&ctx->buf[pos], s, len);
+                       pos += len;
+               }
+               strcpy(&ctx->buf[pos], UCI_QUOTE_ESCAPE);
+               pos += sizeof(UCI_QUOTE_ESCAPE);
+               s = p + 1;
+       } while ((p = strchr(s, '\'')));
+
+       return ctx->buf;
+}
+
+
+/*
+ * export a single config package to a file stream
+ */
+static void uci_export_config(struct uci_package *package, FILE *stream)
+{
+       struct uci_context *ctx = package->ctx;
+       struct uci_section *s;
+       struct uci_option *o;
+
+       fprintf(stream, "package '%s'\n", uci_escape(ctx, package->name));
+       uci_foreach_entry(section, &package->sections, s) {
+               fprintf(stream, "\nconfig '%s'", uci_escape(ctx, s->type));
+               fprintf(stream, " '%s'\n", uci_escape(ctx, s->name));
+               uci_foreach_entry(option, &s->options, o) {
+                       fprintf(stream, "\toption '%s'", uci_escape(ctx, o->name));
+                       fprintf(stream, " '%s'\n", uci_escape(ctx, o->value));
+               }
+       }
+       fprintf(stream, "\n");
+}
+
+int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *package)
+{
+       UCI_HANDLE_ERR(ctx);
+       UCI_ASSERT(ctx, stream != NULL);
+
+       if (package) {
+               uci_export_config(package, stream);
+               goto done;
+       }
+
+       uci_foreach_entry(package, &ctx->root, package) {
+               uci_export_config(package, stream);
+       }
+done:
+       return 0;
+}
+
+int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package)
 {
        struct uci_parse_context *pctx;
 
        /* make sure no memory from previous parse attempts is leaked */
-       uci_parse_cleanup(ctx);
+       uci_file_cleanup(ctx);
 
        pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
        ctx->pctx = pctx;
@@ -453,19 +539,19 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
                        uci_parse_line(ctx);
        }
 
-       if (cfg)
-               *cfg = pctx->cfg;
+       if (package)
+               *package = pctx->package;
 
        pctx->name = NULL;
        uci_switch_config(ctx);
 
        /* no error happened, we can get rid of the parser context now */
-       uci_parse_cleanup(ctx);
+       uci_file_cleanup(ctx);
 
        return 0;
 }
 
-int uci_load(struct uci_context *ctx, const char *name, struct uci_config **cfg)
+int uci_load(struct uci_context *ctx, const char *name, struct uci_package **package)
 {
        struct stat statbuf;
        char *filename;
@@ -504,6 +590,6 @@ ignore:
        if (!file)
                UCI_THROW(ctx, UCI_ERR_IO);
 
-       return uci_import(ctx, file, name, cfg);
+       return uci_import(ctx, file, name, package);
 }