delta: preprocess delta line with uci_parse_argument().

[project/uci.git] / delta.c

diff --git a/delta.c b/delta.c
index a041f541dcc404986a677e9bd4976ebdefecdac7..2eb2ae73ade2cac666de39c5a5493362d20b901e 100644 (file)
--- a/delta.c
+++ b/delta.c
@@ -87,17 +87,22 @@ int uci_add_delta_path(struct uci_context *ctx, const char *dir)
 
        UCI_HANDLE_ERR(ctx);
        UCI_ASSERT(ctx, dir != NULL);
+       if (!strcmp(dir, ctx->savedir))
+               return -1;
        e = uci_alloc_generic(ctx, UCI_TYPE_PATH, dir, sizeof(struct uci_element));
        uci_list_add(&ctx->delta_path, &e->list);
 
        return 0;
 }
 
-static inline int uci_parse_delta_tuple(struct uci_context *ctx, char **buf, struct uci_ptr *ptr)
+static inline int uci_parse_delta_tuple(struct uci_context *ctx, struct uci_ptr *ptr)
 {
+       struct uci_parse_context *pctx = ctx->pctx;
+       char *str = pctx_cur_str(pctx), *arg;
        int c = UCI_CMD_CHANGE;
 
-       switch(**buf) {
+       UCI_INTERNAL(uci_parse_argument, ctx, ctx->pctx->file, &str, &arg);
+       switch(*arg) {
        case '^':
                c = UCI_CMD_REORDER;
                break;
@@ -120,9 +125,9 @@ static inline int uci_parse_delta_tuple(struct uci_context *ctx, char **buf, str
        }
 
        if (c != UCI_CMD_CHANGE)
-               *buf += 1;
+               arg += 1;
 
-       UCI_INTERNAL(uci_parse_ptr, ctx, ptr, *buf);
+       UCI_INTERNAL(uci_parse_ptr, ctx, ptr, arg);
 
        if (!ptr->section)
                goto error;
@@ -153,13 +158,13 @@ error:
        return 0;
 }
 
-static void uci_parse_delta_line(struct uci_context *ctx, struct uci_package *p, char *buf)
+static void uci_parse_delta_line(struct uci_context *ctx, struct uci_package *p)
 {
        struct uci_element *e = NULL;
        struct uci_ptr ptr;
        int cmd;
 
-       cmd = uci_parse_delta_tuple(ctx, &buf, &ptr);
+       cmd = uci_parse_delta_tuple(ctx, &ptr);
        if (strcmp(ptr.package, p->e.name) != 0)
                goto error;
 
@@ -212,6 +217,7 @@ static int uci_parse_delta(struct uci_context *ctx, FILE *stream, struct uci_pac
        pctx->file = stream;
 
        while (!feof(pctx->file)) {
+               pctx->pos = 0;
                uci_getln(ctx, 0);
                if (!pctx->buf[0])
                        continue;
@@ -221,7 +227,7 @@ static int uci_parse_delta(struct uci_context *ctx, FILE *stream, struct uci_pac
                 * delta as possible
                 */
                UCI_TRAP_SAVE(ctx, error);
-               uci_parse_delta_line(ctx, p, pctx->buf);
+               uci_parse_delta_line(ctx, p);
                UCI_TRAP_RESTORE(ctx);
                changes++;
 error:
@@ -240,7 +246,7 @@ static int uci_load_delta_file(struct uci_context *ctx, struct uci_package *p, c
        int changes = 0;
 
        UCI_TRAP_SAVE(ctx, done);
-       stream = uci_open_stream(ctx, filename, SEEK_SET, flush, false);
+       stream = uci_open_stream(ctx, filename, NULL, SEEK_SET, flush, false);
        if (p)
                changes = uci_parse_delta(ctx, stream, p);
        UCI_TRAP_RESTORE(ctx);
@@ -282,8 +288,7 @@ __private int uci_load_delta(struct uci_context *ctx, struct uci_package *p, boo
                        UCI_THROW(ctx, UCI_ERR_IO);
                }
        }
-       if (filename)
-               free(filename);
+       free(filename);
        uci_close_stream(f);
        ctx->err = 0;
        return changes;
@@ -306,24 +311,23 @@ static void uci_filter_delta(struct uci_context *ctx, const char *name, const ch
                UCI_THROW(ctx, UCI_ERR_MEM);
 
        UCI_TRAP_SAVE(ctx, done);
-       f = uci_open_stream(ctx, filename, SEEK_SET, true, false);
+       f = uci_open_stream(ctx, filename, NULL, SEEK_SET, true, false);
        pctx->file = f;
        while (!feof(f)) {
                struct uci_element *e;
-               char *buf;
 
+               pctx->pos = 0;
                uci_getln(ctx, 0);
-               buf = pctx->buf;
-               if (!buf[0])
+               if (!pctx->buf[0])
                        continue;
 
-               /* NB: need to allocate the element before the call to 
-                * uci_parse_delta_tuple, otherwise the original string 
+               /* NB: need to allocate the element before the call to
+                * uci_parse_delta_tuple, otherwise the original string
                 * gets modified before it is saved */
                e = uci_alloc_generic(ctx, UCI_TYPE_DELTA, pctx->buf, sizeof(struct uci_element));
                uci_list_add(&list, &e->list);
 
-               uci_parse_delta_tuple(ctx, &buf, &ptr);
+               uci_parse_delta_tuple(ctx, &ptr);
                if (section) {
                        if (!ptr.section || (strcmp(section, ptr.section) != 0))
                                continue;
@@ -347,8 +351,7 @@ static void uci_filter_delta(struct uci_context *ctx, const char *name, const ch
        UCI_TRAP_RESTORE(ctx);
 
 done:
-       if (filename)
-               free(filename);
+       free(filename);
        uci_close_stream(pctx->file);
        uci_foreach_element_safe(&list, tmp, e) {
                uci_free_element(e);
@@ -366,7 +369,7 @@ int uci_revert(struct uci_context *ctx, struct uci_ptr *ptr)
        uci_expand_ptr(ctx, ptr, false);
        UCI_ASSERT(ctx, ptr->p->has_delta);
 
-       /* 
+       /*
         * - flush unwritten changes
         * - save the package name
         * - unload the package
@@ -376,7 +379,7 @@ int uci_revert(struct uci_context *ctx, struct uci_ptr *ptr)
        UCI_TRAP_SAVE(ctx, error);
        UCI_INTERNAL(uci_save, ctx, ptr->p);
 
-       /* NB: need to clone package, section and option names, 
+       /* NB: need to clone package, section and option names,
         * as they may get freed on uci_free_package() */
        package = uci_strdup(ctx, ptr->p->e.name);
        if (ptr->section)
@@ -392,12 +395,9 @@ int uci_revert(struct uci_context *ctx, struct uci_ptr *ptr)
        ctx->err = 0;
 
 error:
-       if (package)
-               free(package);
-       if (section)
-               free(section);
-       if (option)
-               free(option);
+       free(package);
+       free(section);
+       free(option);
        if (ctx->err)
                UCI_THROW(ctx, ctx->err);
        return 0;
@@ -413,7 +413,7 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
        UCI_HANDLE_ERR(ctx);
        UCI_ASSERT(ctx, p != NULL);
 
-       /* 
+       /*
         * if the config file was outside of the /etc/config path,
         * don't save the delta to a file, update the real file
         * directly.
@@ -425,17 +425,22 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
        if (uci_list_empty(&p->delta))
                return 0;
 
-       if (stat(ctx->savedir, &statbuf) < 0)
-               mkdir(ctx->savedir, UCI_DIRMODE);
-       else if ((statbuf.st_mode & S_IFMT) != S_IFDIR)
+       if (stat(ctx->savedir, &statbuf) < 0) {
+               if (stat(ctx->confdir, &statbuf) == 0) {
+                       mkdir(ctx->savedir, statbuf.st_mode);
+               } else {
+                       mkdir(ctx->savedir, UCI_DIRMODE);
+               }
+       } else if ((statbuf.st_mode & S_IFMT) != S_IFDIR) {
                UCI_THROW(ctx, UCI_ERR_IO);
+       }
 
        if ((asprintf(&filename, "%s/%s", ctx->savedir, p->e.name) < 0) || !filename)
                UCI_THROW(ctx, UCI_ERR_MEM);
 
        ctx->err = 0;
        UCI_TRAP_SAVE(ctx, done);
-       f = uci_open_stream(ctx, filename, SEEK_END, true, true);
+       f = uci_open_stream(ctx, filename, NULL, SEEK_END, true, true);
        UCI_TRAP_RESTORE(ctx);
 
        uci_foreach_element_safe(&p->delta, tmp, e) {
@@ -471,15 +476,25 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
 
                if (h->cmd == UCI_CMD_REMOVE && !h->value)
                        fprintf(f, "\n");
-               else
-                       fprintf(f, "=%s\n", h->value);
+               else {
+                       int i;
+
+                       fprintf(f, "='");
+                       for (i = 0; h->value[i]; i++) {
+                               unsigned char c = h->value[i];
+                               if (c != '\'')
+                                       fputc(c, f);
+                               else
+                                       fprintf(f, "'\\''");
+                       }
+                       fprintf(f, "'\n");
+               }
                uci_free_delta(h);
        }
 
 done:
        uci_close_stream(f);
-       if (filename)
-               free(filename);
+       free(filename);
        if (ctx->err)
                UCI_THROW(ctx, ctx->err);