delta: fix outputing of delta entries occupying multiple lines.

[project/uci.git] / delta.c

diff --git a/delta.c b/delta.c
index 2eb2ae7..cdd46bc 100644 (file)
--- a/delta.c
+++ b/delta.c
@@ -66,6 +66,35 @@ uci_free_delta(struct uci_delta *h)
        uci_free_element(&h->e);
 }
 
+static void uci_delta_save(struct uci_context *ctx, FILE *f,
+                       const char *name, const struct uci_delta *h)
+{
+       const struct uci_element *e = &h->e;
+       char prefix[2] = {0, 0};
+
+       if (h->cmd <= __UCI_CMD_LAST)
+               prefix[0] = uci_command_char[h->cmd];
+
+       fprintf(f, "%s%s.%s", prefix, name, h->section);
+       if (e->name)
+               fprintf(f, ".%s", e->name);
+
+       if (h->cmd == UCI_CMD_REMOVE && !h->value)
+               fprintf(f, "\n");
+       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");
+       }
+}
 
 int uci_set_savedir(struct uci_context *ctx, const char *dir)
 {
@@ -95,34 +124,29 @@ int uci_add_delta_path(struct uci_context *ctx, const char *dir)
        return 0;
 }
 
+char const uci_command_char[] = {
+       [UCI_CMD_ADD] = '+',
+       [UCI_CMD_REMOVE] = '-',
+       [UCI_CMD_CHANGE] = 0,
+       [UCI_CMD_RENAME] = '@',
+       [UCI_CMD_REORDER] = '^',
+       [UCI_CMD_LIST_ADD] = '|',
+       [UCI_CMD_LIST_DEL] = '~'
+};
+
 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;
+       int c;
 
        UCI_INTERNAL(uci_parse_argument, ctx, ctx->pctx->file, &str, &arg);
-       switch(*arg) {
-       case '^':
-               c = UCI_CMD_REORDER;
-               break;
-       case '-':
-               c = UCI_CMD_REMOVE;
-               break;
-       case '@':
-               c = UCI_CMD_RENAME;
-               break;
-       case '+':
-               /* UCI_CMD_ADD is used for anonymous sections or list values */
-               c = UCI_CMD_ADD;
-               break;
-       case '|':
-               c = UCI_CMD_LIST_ADD;
-               break;
-       case '~':
-               c = UCI_CMD_LIST_DEL;
-               break;
+       for (c = 0; c <= __UCI_CMD_LAST; c++) {
+               if (uci_command_char[c] == *arg)
+                       break;
        }
+       if (c > __UCI_CMD_LAST)
+               c = UCI_CMD_CHANGE;
 
        if (c != UCI_CMD_CHANGE)
                arg += 1;
@@ -314,30 +338,29 @@ static void uci_filter_delta(struct uci_context *ctx, const char *name, const ch
        f = uci_open_stream(ctx, filename, NULL, SEEK_SET, true, false);
        pctx->file = f;
        while (!feof(f)) {
-               struct uci_element *e;
+               enum uci_command c;
+               bool match;
 
                pctx->pos = 0;
                uci_getln(ctx, 0);
                if (!pctx->buf[0])
                        continue;
 
-               /* 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, &ptr);
+               c = uci_parse_delta_tuple(ctx, &ptr);
+               match = true;
                if (section) {
                        if (!ptr.section || (strcmp(section, ptr.section) != 0))
-                               continue;
+                               match = false;
                }
-               if (option) {
+               if (match && option) {
                        if (!ptr.option || (strcmp(option, ptr.option) != 0))
-                               continue;
+                               match = false;
+               }
+
+               if (!match) {
+                       uci_add_delta(ctx, &list, c,
+                               ptr.section, ptr.option, ptr.value);
                }
-               /* match, drop this element again */
-               uci_free_element(e);
        }
 
        /* rebuild the delta file */
@@ -345,8 +368,9 @@ static void uci_filter_delta(struct uci_context *ctx, const char *name, const ch
        if (ftruncate(fileno(f), 0) < 0)
                UCI_THROW(ctx, UCI_ERR_IO);
        uci_foreach_element_safe(&list, tmp, e) {
-               fprintf(f, "%s\n", e->name);
-               uci_free_element(e);
+               struct uci_delta *h = uci_to_delta(e);
+               uci_delta_save(ctx, f, name, h);
+               uci_free_delta(h);
        }
        UCI_TRAP_RESTORE(ctx);
 
@@ -354,7 +378,7 @@ done:
        free(filename);
        uci_close_stream(pctx->file);
        uci_foreach_element_safe(&list, tmp, e) {
-               uci_free_element(e);
+               uci_free_delta(uci_to_delta(e));
        }
        uci_cleanup(ctx);
 }
@@ -445,50 +469,7 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
 
        uci_foreach_element_safe(&p->delta, tmp, e) {
                struct uci_delta *h = uci_to_delta(e);
-               char *prefix = "";
-
-               switch(h->cmd) {
-               case UCI_CMD_REMOVE:
-                       prefix = "-";
-                       break;
-               case UCI_CMD_RENAME:
-                       prefix = "@";
-                       break;
-               case UCI_CMD_ADD:
-                       prefix = "+";
-                       break;
-               case UCI_CMD_REORDER:
-                       prefix = "^";
-                       break;
-               case UCI_CMD_LIST_ADD:
-                       prefix = "|";
-                       break;
-               case UCI_CMD_LIST_DEL:
-                       prefix = "~";
-                       break;
-               default:
-                       break;
-               }
-
-               fprintf(f, "%s%s.%s", prefix, p->e.name, h->section);
-               if (e->name)
-                       fprintf(f, ".%s", e->name);
-
-               if (h->cmd == UCI_CMD_REMOVE && !h->value)
-                       fprintf(f, "\n");
-               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_delta_save(ctx, f, p->e.name, h);
                uci_free_delta(h);
        }