add list support

[project/uci.git] / history.c

diff --git a/history.c b/history.c
index 6be8a9d..2b6dbef 100644 (file)
--- a/history.c
+++ b/history.c
@@ -28,7 +28,7 @@
 
 /* record a change that was done to a package */
 void
-uci_add_history(struct uci_context *ctx, struct uci_list *list, int cmd, char *section, char *option, char *value)
+uci_add_history(struct uci_context *ctx, struct uci_list *list, int cmd, const char *section, const char *option, const char *value)
 {
        struct uci_history *h;
        int size = strlen(section) + 1;
@@ -92,17 +92,25 @@ static inline void uci_parse_history_tuple(struct uci_context *ctx, char **buf,
 {
        int c = UCI_CMD_CHANGE;
 
-       if (**buf == '-') {
+       switch(**buf) {
+       case '-':
                c = UCI_CMD_REMOVE;
-               *buf += 1;
-       } else if (**buf == '@') {
+               break;
+       case '@':
                c = UCI_CMD_RENAME;
-               *buf += 1;
-       } else if (**buf == '+') {
-               /* UCI_CMD_ADD is used for anonymous sections */
+               break;
+       case '+':
+               /* UCI_CMD_ADD is used for anonymous sections or list values */
                c = UCI_CMD_ADD;
-               *buf += 1;
+               break;
+       case '|':
+               c = UCI_CMD_LIST_ADD;
+               break;
        }
+
+       if (c != UCI_CMD_CHANGE)
+               *buf += 1;
+
        if (cmd)
                *cmd = c;
 
@@ -143,6 +151,9 @@ static void uci_parse_history_line(struct uci_context *ctx, struct uci_package *
        case UCI_CMD_REMOVE:
                UCI_INTERNAL(uci_delete, ctx, p, section, option);
                break;
+       case UCI_CMD_LIST_ADD:
+               UCI_INTERNAL(uci_add_list, ctx, p, section, option, value, NULL);
+               break;
        case UCI_CMD_ADD:
        case UCI_CMD_CHANGE:
                UCI_INTERNAL(uci_set, ctx, p, section, option, value, &e);
@@ -239,11 +250,11 @@ static int uci_load_history(struct uci_context *ctx, struct uci_package *p, bool
        if (filename)
                free(filename);
        uci_close_stream(f);
-       ctx->errno = 0;
+       ctx->err = 0;
        return changes;
 }
 
-static void uci_filter_history(struct uci_context *ctx, const char *name, char *section, char *option)
+static void uci_filter_history(struct uci_context *ctx, const char *name, const char *section, const char *option)
 {
        struct uci_parse_context *pctx;
        struct uci_element *e, *tmp;
@@ -312,7 +323,7 @@ done:
        uci_cleanup(ctx);
 }
 
-int uci_revert(struct uci_context *ctx, struct uci_package **pkg, char *section, char *option)
+int uci_revert(struct uci_context *ctx, struct uci_package **pkg, const char *section, const char *option)
 {
        struct uci_package *p;
        char *name = NULL;
@@ -340,13 +351,13 @@ int uci_revert(struct uci_context *ctx, struct uci_package **pkg, char *section,
 
        UCI_INTERNAL(uci_load, ctx, name, &p);
        UCI_TRAP_RESTORE(ctx);
-       ctx->errno = 0;
+       ctx->err = 0;
 
 error:
        if (name)
                free(name);
-       if (ctx->errno)
-               UCI_THROW(ctx, ctx->errno);
+       if (ctx->err)
+               UCI_THROW(ctx, ctx->err);
        return 0;
 }
 
@@ -380,29 +391,33 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
        if ((asprintf(&filename, "%s/%s", ctx->savedir, p->e.name) < 0) || !filename)
                UCI_THROW(ctx, UCI_ERR_MEM);
 
-       ctx->errno = 0;
+       ctx->err = 0;
        UCI_TRAP_SAVE(ctx, done);
        f = uci_open_stream(ctx, filename, SEEK_END, true, true);
        UCI_TRAP_RESTORE(ctx);
 
        uci_foreach_element_safe(&p->history, tmp, e) {
                struct uci_history *h = uci_to_history(e);
+               char *prefix = "";
 
                switch(h->cmd) {
                case UCI_CMD_REMOVE:
-                       fprintf(f, "-");
+                       prefix = "-";
                        break;
                case UCI_CMD_RENAME:
-                       fprintf(f, "@");
+                       prefix = "@";
                        break;
                case UCI_CMD_ADD:
-                       fprintf(f, "+");
+                       prefix = "+";
+                       break;
+               case UCI_CMD_LIST_ADD:
+                       prefix = "|";
                        break;
                default:
                        break;
                }
 
-               fprintf(f, "%s.%s", p->e.name, h->section);
+               fprintf(f, "%s%s.%s", prefix, p->e.name, h->section);
                if (e->name)
                        fprintf(f, ".%s", e->name);
 
@@ -417,8 +432,8 @@ done:
        uci_close_stream(f);
        if (filename)
                free(filename);
-       if (ctx->errno)
-               UCI_THROW(ctx, ctx->errno);
+       if (ctx->err)
+               UCI_THROW(ctx, ctx->err);
 
        return 0;
 }