X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=history.c;h=4e975245de79caa2713cb315189c3d1bf442b307;hp=14c650ab30383fa5fee6d9ef1d4a33122a882342;hb=87e893157980abef163575ad7aedbcc96c41b0c6;hpb=5620bfaa14ce556b94de26128bc7fe9edc5a3f27

diff --git a/history.c b/history.c
index 14c650a..4e97524 100644
--- a/history.c
+++ b/history.c
@@ -27,8 +27,8 @@
 #include <ctype.h>
 
 /* record a change that was done to a package */
-static void
-uci_add_history(struct uci_context *ctx, struct uci_list *list, int cmd, char *section, char *option, char *value)
+void
+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;
@@ -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)
@@ -88,60 +88,83 @@ int uci_add_history_path(struct uci_context *ctx, const char *dir)
 	return 0;
 }
 
-static inline void uci_parse_history_tuple(struct uci_context *ctx, char **buf, char **package, char **section, char **option, char **value, bool *delete, bool *rename)
+static inline int uci_parse_history_tuple(struct uci_context *ctx, char **buf, struct uci_ptr *ptr)
 {
-	if (**buf == '-') {
-		if (delete)
-			*delete = true;
-		*buf += 1;
-	} else if (**buf == '@') {
-		if (rename)
-			*rename = true;
-		*buf += 1;
+	int c = UCI_CMD_CHANGE;
+
+	switch(**buf) {
+	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;
 	}
 
-	UCI_INTERNAL(uci_parse_tuple, ctx, *buf, package, section, option, value);
-}
-static void uci_parse_history_line(struct uci_context *ctx, struct uci_package *p, char *buf)
-{
-	bool delete = false;
-	bool rename = false;
-	char *package = NULL;
-	char *section = NULL;
-	char *option = NULL;
-	char *value = NULL;
-
-	uci_parse_history_tuple(ctx, &buf, &package, &section, &option, &value, &delete, &rename);
-	if (!package || (strcmp(package, p->e.name) != 0))
-		goto error;
-	if (!uci_validate_name(section))
-		goto error;
-	if (option && !uci_validate_name(option))
+	if (c != UCI_CMD_CHANGE)
+		*buf += 1;
+
+	UCI_INTERNAL(uci_parse_ptr, ctx, ptr, *buf);
+
+	if (!ptr->section)
 		goto error;
-	if (rename && !uci_validate_str(value, (option || delete)))
+	if (ptr->flags & UCI_LOOKUP_EXTENDED)
 		goto error;
 
-	if (ctx->flags & UCI_FLAG_SAVED_HISTORY) {
-		int cmd;
+	switch(c) {
+	case UCI_CMD_RENAME:
+		if (!ptr->value || !uci_validate_name(ptr->value))
+			goto error;
+		break;
+	case UCI_CMD_LIST_ADD:
+		if (!ptr->option)
+			goto error;
+	}
 
-		/* NB: no distinction between CMD_CHANGE and CMD_ADD possible at this point */
-		if(delete)
-			cmd = UCI_CMD_REMOVE;
-		else if (rename)
-			cmd = UCI_CMD_RENAME;
-		else
-			cmd = UCI_CMD_CHANGE;
+	return c;
 
-		uci_add_history(ctx, &p->saved_history, cmd, section, option, value);
-	}
+error:
+	UCI_THROW(ctx, UCI_ERR_INVAL);
+	return 0;
+}
+
+static void uci_parse_history_line(struct uci_context *ctx, struct uci_package *p, char *buf)
+{
+	struct uci_element *e = NULL;
+	struct uci_ptr ptr;
+	int cmd;
 
-	if (rename)
-		UCI_INTERNAL(uci_rename, ctx, p, section, option, value);
-	else if (delete)
-		UCI_INTERNAL(uci_delete, ctx, p, section, option);
-	else
-		UCI_INTERNAL(uci_set, ctx, p, section, option, value, NULL);
+	cmd = uci_parse_history_tuple(ctx, &buf, &ptr);
+	if (strcmp(ptr.package, p->e.name) != 0)
+		goto error;
 
+	if (ctx->flags & UCI_FLAG_SAVED_HISTORY)
+		uci_add_history(ctx, &p->saved_history, cmd, ptr.section, ptr.option, ptr.value);
+
+	switch(cmd) {
+	case UCI_CMD_RENAME:
+		UCI_INTERNAL(uci_rename, ctx, p, ptr.section, ptr.option, ptr.value);
+		break;
+	case UCI_CMD_REMOVE:
+		UCI_INTERNAL(uci_delete, ctx, p, ptr.section, ptr.option);
+		break;
+	case UCI_CMD_LIST_ADD:
+		UCI_INTERNAL(uci_add_list, ctx, p, ptr.section, ptr.option, ptr.value, NULL);
+		break;
+	case UCI_CMD_ADD:
+	case UCI_CMD_CHANGE:
+		UCI_INTERNAL(uci_set, ctx, p, ptr.section, ptr.option, ptr.value, &e);
+		if (!ptr.option && e && (cmd == UCI_CMD_ADD))
+			uci_to_section(e)->anonymous = true;
+		break;
+	}
 	return;
 error:
 	UCI_THROW(ctx, UCI_ERR_PARSE);
@@ -154,7 +177,6 @@ static int uci_parse_history(struct uci_context *ctx, FILE *stream, struct uci_p
 	int changes = 0;
 
 	/* make sure no memory from previous parse attempts is leaked */
-	ctx->internal = true;
 	uci_cleanup(ctx);
 
 	pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
@@ -179,7 +201,6 @@ error:
 	}
 
 	/* no error happened, we can get rid of the parser context now */
-	ctx->internal = true;
 	uci_cleanup(ctx);
 	return changes;
 }
@@ -211,7 +232,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) {
@@ -233,20 +254,17 @@ 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;
 	struct uci_list list;
 	char *filename = NULL;
-	char *p = NULL;
-	char *s = NULL;
-	char *o = NULL;
-	char *v = NULL;
+	struct uci_ptr ptr;
 	FILE *f = NULL;
 
 	uci_list_init(&list);
@@ -274,13 +292,13 @@ static void uci_filter_history(struct uci_context *ctx, const char *name, char *
 		e = uci_alloc_generic(ctx, UCI_TYPE_HISTORY, pctx->buf, sizeof(struct uci_element));
 		uci_list_add(&list, &e->list);
 
-		uci_parse_history_tuple(ctx, &buf, &p, &s, &o, &v, NULL, NULL);
+		uci_parse_history_tuple(ctx, &buf, &ptr);
 		if (section) {
-			if (!s || (strcmp(section, s) != 0))
+			if (!ptr.section || (strcmp(section, ptr.section) != 0))
 				continue;
 		}
 		if (option) {
-			if (!o || (strcmp(option, o) != 0))
+			if (!ptr.option || (strcmp(option, ptr.option) != 0))
 				continue;
 		}
 		/* match, drop this element again */
@@ -303,11 +321,10 @@ done:
 	uci_foreach_element_safe(&list, tmp, e) {
 		uci_free_element(e);
 	}
-	ctx->internal = true;
 	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;
@@ -316,7 +333,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
@@ -335,13 +352,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;
 }
 
@@ -350,6 +367,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);
@@ -360,29 +378,47 @@ 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);
 
-	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:
+			prefix = "-";
+			break;
+		case UCI_CMD_RENAME:
+			prefix = "@";
+			break;
+		case UCI_CMD_ADD:
+			prefix = "+";
+			break;
+		case UCI_CMD_LIST_ADD:
+			prefix = "|";
+			break;
+		default:
+			break;
+		}
 
-		if (h->cmd == UCI_CMD_REMOVE)
-			fprintf(f, "-");
-		else if (h->cmd == UCI_CMD_RENAME)
-			fprintf(f, "@");
-
-		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);
 
@@ -397,8 +433,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;
 }