X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=history.c;h=24b5321514976a7627bbf42dcfd069aaa28dbf9c;hp=c46c408c73ff4f2a0aabcc27fedec3ff3d0eb564;hb=42c5188ed499746fc09917707c929bd96339be14;hpb=7ca5c675d7dc21fa7767b64a42a1705bb800fc86

diff --git a/history.c b/history.c
index c46c408..24b5321 100644
--- 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)
@@ -239,7 +239,7 @@ 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;
 }
 
@@ -340,13 +340,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;
 }
 
@@ -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);
@@ -371,10 +372,15 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
 	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);
 
-	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);
@@ -411,8 +417,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;
 }