create the history savedir on uci_save() if it does not exist

[project/uci.git] / history.c

diff --git a/history.c b/history.c
index 089bcef..6be8a9d 100644 (file)
--- a/history.c
+++ b/history.c
@@ -27,7 +27,7 @@
 #include <ctype.h>
 
 /* record a change that was done to a package */
-static void
+void
 uci_add_history(struct uci_context *ctx, struct uci_list *list, int cmd, char *section, char *option, char *value)
 {
        struct uci_history *h;
@@ -48,7 +48,7 @@ uci_add_history(struct uci_context *ctx, struct uci_list *list, int cmd, char *s
        uci_list_add(list, &h->e.list);
 }
 
-static void
+void
 uci_free_history(struct uci_history *h)
 {
        if (!h)
@@ -217,7 +217,7 @@ static int uci_load_history(struct uci_context *ctx, struct uci_package *p, bool
        FILE *f = NULL;
        int changes = 0;
 
-       if (!p->confdir)
+       if (!p->has_history)
                return 0;
 
        uci_foreach_element(&ctx->history_path, e) {
@@ -321,7 +321,7 @@ int uci_revert(struct uci_context *ctx, struct uci_package **pkg, char *section,
        UCI_ASSERT(ctx, pkg != NULL);
        p = *pkg;
        UCI_ASSERT(ctx, p != NULL);
-       UCI_ASSERT(ctx, p->confdir);
+       UCI_ASSERT(ctx, p->has_history);
 
        /* 
         * - flush unwritten changes
@@ -355,6 +355,7 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
        FILE *f = NULL;
        char *filename = NULL;
        struct uci_element *e, *tmp;
+       struct stat statbuf;
 
        UCI_HANDLE_ERR(ctx);
        UCI_ASSERT(ctx, p != NULL);
@@ -365,12 +366,17 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
         * directly.
         * does not modify the uci_package pointer
         */
-       if (!p->confdir)
+       if (!p->has_history)
                return uci_commit(ctx, &p, false);
 
        if (uci_list_empty(&p->history))
                return 0;
 
+       if (stat(ctx->savedir, &statbuf) < 0)
+               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);