move export functionality to libuci

diff --git a/cli.c b/cli.c
index 4bc0234..afe96e3 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -31,41 +31,6 @@ static void uci_usage(int argc, char **argv)
        exit(255);
 }
 
        exit(255);
 }
 

-static char *uci_escape(char *str)
-{
-       char *s, *p, *t;
-       int pos = 0;
-
-       if (!buf)
-               buf = malloc(buflen);
-
-       s = str;
-       p = strchr(str, '\'');
-       if (!p)
-               return str;
-
-       do {
-               int len = p - s;
-               if (len > 0) {
-                       if (p + 3 - str >= buflen) {
-                               buflen *= 2;
-                               buf = realloc(buf, buflen);
-                               if (!buf) {
-                                       fprintf(stderr, "Out of memory\n");
-                                       exit(255);
-                               }
-                       }
-                       memcpy(&buf[pos], s, len);
-                       pos += len;
-               }
-               strcpy(&buf[pos], "'\\''");
-               pos += 3;
-               s = p + 1;
-       } while ((p = strchr(s, '\'')));
-
-       return buf;
-}
-

 static void uci_show_section(struct uci_section *p)
 {
        struct uci_option *o;
 static void uci_show_section(struct uci_section *p)
 {
        struct uci_option *o;


@@ -79,19 +44,6 @@ static void uci_show_section(struct uci_section *p)
        }
 }
 
        }
 }
 

-static void uci_export_section(struct uci_section *p)
-{
-       struct uci_option *o;
-       const char *name;
-
-       printf("\nconfig '%s'", uci_escape(p->type));
-       printf(" '%s'\n", uci_escape(p->name));
-       uci_foreach_entry(option, &p->options, o) {
-               printf("\toption '%s'", uci_escape(o->name));
-               printf(" '%s'\n", uci_escape(o->value));
-       }
-}
-

 static void foreach_section(const char *configname, const char *section, void (*callback)(struct uci_section *))
 {
        struct uci_config *cfg;
 static void foreach_section(const char *configname, const char *section, void (*callback)(struct uci_section *))
 {
        struct uci_config *cfg;


@@ -102,7 +54,6 @@ static void foreach_section(const char *configname, const char *section, void (*
                return;
        }
 
                return;
        }
 

-       uci_list_empty(&cfg->sections);

        uci_foreach_entry(section, &cfg->sections, p) {
                if (!section || !strcmp(p->name, section))
                        callback(p);
        uci_foreach_entry(section, &cfg->sections, p) {
                if (!section || !strcmp(p->name, section))
                        callback(p);


@@ -126,7 +77,7 @@ static int uci_show(int argc, char **argv)
        return 0;
 }
 
        return 0;
 }
 

-static int uci_export(int argc, char **argv)
+static int uci_do_export(int argc, char **argv)

 {
        char **configs = uci_list_configs();
        char **p;
 {
        char **configs = uci_list_configs();
        char **p;


@@ -136,9 +87,14 @@ static int uci_export(int argc, char **argv)
 
        for (p = configs; *p; p++) {
                if ((argc < 2) || !strcmp(argv[1], *p)) {
 
        for (p = configs; *p; p++) {
                if ((argc < 2) || !strcmp(argv[1], *p)) {

-                       printf("package '%s'\n", uci_escape(*p));
-                       foreach_section(*p, NULL, uci_export_section);
-                       printf("\n");
+                       struct uci_config *cfg = NULL;
+                       int ret;
+
+                       ret = uci_load(ctx, *p, &cfg);
+                       if (ret)
+                               continue;
+                       uci_export(ctx, stdout, cfg);
+                       uci_unload(ctx, *p);

                }
        }
        return 0;
                }
        }
        return 0;


@@ -149,7 +105,7 @@ static int uci_cmd(int argc, char **argv)
        if (!strcasecmp(argv[0], "show"))
                return uci_show(argc, argv);
        if (!strcasecmp(argv[0], "export"))
        if (!strcasecmp(argv[0], "show"))
                return uci_show(argc, argv);
        if (!strcasecmp(argv[0], "export"))

-               return uci_export(argc, argv);
+               return uci_do_export(argc, argv);

        return 255;
 }
 
        return 255;
 }
 

diff --git a/file.c b/file.c
index da72bde..c92e60b 100644 (file)
--- a/file.c
+++ b/file.c
@@ -67,12 +67,17 @@ 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;
 
 {
        struct uci_parse_context *pctx;
 

+       if (ctx->buf) {
+               free(ctx->buf);
+               ctx->bufsz = 0;
+       }
+

        pctx = ctx->pctx;
        if (!pctx)
                return;
        pctx = ctx->pctx;
        if (!pctx)
                return;


@@ -428,12 +433,92 @@ static void uci_parse_line(struct uci_context *ctx)
        }
 }
 
        }
 }
 

+/* 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_config *cfg, FILE *stream)
+{
+       struct uci_context *ctx = cfg->ctx;
+       struct uci_section *s;
+       struct uci_option *o;
+
+       fprintf(stream, "package '%s'\n", uci_escape(ctx, cfg->name));
+       uci_foreach_entry(section, &cfg->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_config *cfg)
+{
+       UCI_HANDLE_ERR(ctx);
+       UCI_ASSERT(ctx, stream != NULL);
+
+       if (cfg) {
+               uci_export_config(cfg, stream);
+               goto done;
+       }
+
+       uci_foreach_entry(config, &ctx->root, cfg) {
+               uci_export_config(cfg, stream);
+       }
+done:
+       return 0;
+}
+

 int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_config **cfg)
 {
        struct uci_parse_context *pctx;
 
        /* make sure no memory from previous parse attempts is leaked */
 int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_config **cfg)
 {
        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;
 
        pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
        ctx->pctx = pctx;


@@ -460,7 +545,7 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
        uci_switch_config(ctx);
 
        /* no error happened, we can get rid of the parser context now */
        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;
 }
 
        return 0;
 }

diff --git a/libuci.c b/libuci.c
index 4a06d71..47c815a 100644 (file)
--- a/libuci.c
+++ b/libuci.c
@@ -109,7 +109,7 @@ void uci_free(struct uci_context *ctx)
 int uci_cleanup(struct uci_context *ctx)
 {
        UCI_HANDLE_ERR(ctx);
 int uci_cleanup(struct uci_context *ctx)
 {
        UCI_HANDLE_ERR(ctx);

-       uci_parse_cleanup(ctx);
+       uci_file_cleanup(ctx);

        return 0;
 }
 
        return 0;
 }
 

diff --git a/uci.h b/uci.h
index 4b792d6..a34a36b 100644 (file)
--- a/uci.h
+++ b/uci.h
@@ -73,6 +73,14 @@ extern void uci_perror(struct uci_context *ctx, const char *str);
 extern int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_config **cfg);
 
 /**
 extern int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_config **cfg);
 
 /**

+ * uci_export: Export one or all uci config packages
+ * @ctx: uci context
+ * @stream: output stream
+ * @cfg: (optional) uci config package to export
+ */
+extern int uci_export(struct uci_context *ctx, FILE *stream, struct uci_config *cfg);
+
+/**

  * uci_load: Parse an uci config file and store it in the uci context
  *
  * @ctx: uci context
  * uci_load: Parse an uci config file and store it in the uci context
  *
  * @ctx: uci context


@@ -115,6 +123,8 @@ struct uci_context
        /* private: */
        int errno;
        jmp_buf trap;
        /* private: */
        int errno;
        jmp_buf trap;

+       char *buf;
+       int bufsz;

 };
 
 struct uci_parse_context
 };
 
 struct uci_parse_context