overhaul package and section type validation - makes it easier to read and fixes...

[project/uci.git] / history.c

diff --git a/history.c b/history.c
index 4e97524..a31dbfa 100644 (file)
--- a/history.c
+++ b/history.c
@@ -150,17 +150,18 @@ static void uci_parse_history_line(struct uci_context *ctx, struct uci_package *
 
        switch(cmd) {
        case UCI_CMD_RENAME:
-               UCI_INTERNAL(uci_rename, ctx, p, ptr.section, ptr.option, ptr.value);
+               UCI_INTERNAL(uci_rename, ctx, &ptr);
                break;
        case UCI_CMD_REMOVE:
-               UCI_INTERNAL(uci_delete, ctx, p, ptr.section, ptr.option);
+               UCI_INTERNAL(uci_delete, ctx, &ptr);
                break;
        case UCI_CMD_LIST_ADD:
-               UCI_INTERNAL(uci_add_list, ctx, p, ptr.section, ptr.option, ptr.value, NULL);
+               UCI_INTERNAL(uci_add_list, ctx, &ptr);
                break;
        case UCI_CMD_ADD:
        case UCI_CMD_CHANGE:
-               UCI_INTERNAL(uci_set, ctx, p, ptr.section, ptr.option, ptr.value, &e);
+               UCI_INTERNAL(uci_set, ctx, &ptr);
+               e = ptr.last;
                if (!ptr.option && e && (cmd == UCI_CMD_ADD))
                        uci_to_section(e)->anonymous = true;
                break;
@@ -317,23 +318,22 @@ static void uci_filter_history(struct uci_context *ctx, const char *name, const
 done:
        if (filename)
                free(filename);
-       uci_close_stream(f);
+       uci_close_stream(pctx->file);
        uci_foreach_element_safe(&list, tmp, e) {
                uci_free_element(e);
        }
        uci_cleanup(ctx);
 }
 
-int uci_revert(struct uci_context *ctx, struct uci_package **pkg, const char *section, const char *option)
+int uci_revert(struct uci_context *ctx, struct uci_ptr *ptr)
 {
-       struct uci_package *p;
-       char *name = NULL;
+       char *package = NULL;
+       char *section = NULL;
+       char *option = NULL;
 
        UCI_HANDLE_ERR(ctx);
-       UCI_ASSERT(ctx, pkg != NULL);
-       p = *pkg;
-       UCI_ASSERT(ctx, p != NULL);
-       UCI_ASSERT(ctx, p->has_history);
+       expand_ptr(ctx, ptr, false);
+       UCI_ASSERT(ctx, ptr->p->has_history);
 
        /* 
         * - flush unwritten changes
@@ -343,20 +343,30 @@ int uci_revert(struct uci_context *ctx, struct uci_package **pkg, const char *se
         * - reload the package
         */
        UCI_TRAP_SAVE(ctx, error);
-       UCI_INTERNAL(uci_save, ctx, p);
-       name = uci_strdup(ctx, p->e.name);
+       UCI_INTERNAL(uci_save, ctx, ptr->p);
+
+       /* 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)
+               section = uci_strdup(ctx, ptr->section);
+       if (ptr->option)
+               option = uci_strdup(ctx, ptr->option);
 
-       *pkg = NULL;
-       uci_free_package(&p);
-       uci_filter_history(ctx, name, section, option);
+       uci_free_package(&ptr->p);
+       uci_filter_history(ctx, package, section, option);
 
-       UCI_INTERNAL(uci_load, ctx, name, &p);
+       UCI_INTERNAL(uci_load, ctx, package, &ptr->p);
        UCI_TRAP_RESTORE(ctx);
        ctx->err = 0;
 
 error:
-       if (name)
-               free(name);
+       if (package)
+               free(package);
+       if (section)
+               free(section);
+       if (option)
+               free(option);
        if (ctx->err)
                UCI_THROW(ctx, ctx->err);
        return 0;