X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=history.c;h=c698192eda56f760665933f589fb32764927c070;hp=2b6dbef64718ea319b318c577c266cdf1425952e;hb=96aa070d01e676a6c7f48ff533e219f63da4fd65;hpb=3bff697cca125a6a4147e3bd1c469b36504e8237

diff --git a/history.c b/history.c
index 2b6dbef..c698192 100644
--- a/history.c
+++ b/history.c
@@ -88,11 +88,14 @@ 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, int *cmd)
+static inline int uci_parse_history_tuple(struct uci_context *ctx, char **buf, struct uci_ptr *ptr)
 {
 	int c = UCI_CMD_CHANGE;
 
 	switch(**buf) {
+	case '^':
+		c = UCI_CMD_REORDER;
+		break;
 	case '-':
 		c = UCI_CMD_REMOVE;
 		break;
@@ -111,53 +114,68 @@ static inline void uci_parse_history_tuple(struct uci_context *ctx, char **buf,
 	if (c != UCI_CMD_CHANGE)
 		*buf += 1;
 
-	if (cmd)
-		*cmd = c;
+	UCI_INTERNAL(uci_parse_ptr, ctx, ptr, *buf);
 
-	UCI_INTERNAL(uci_parse_tuple, ctx, *buf, package, section, option, value);
-	if (!*section[0])
-		UCI_THROW(ctx, UCI_ERR_PARSE);
+	if (!ptr->section)
+		goto error;
+	if (ptr->flags & UCI_LOOKUP_EXTENDED)
+		goto error;
+
+	switch(c) {
+	case UCI_CMD_REORDER:
+		if (!ptr->value || ptr->option)
+			goto error;
+		break;
+	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;
+	}
 
+	return c;
+
+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;
-	bool delete = false;
-	bool rename = false;
-	char *package = NULL;
-	char *section = NULL;
-	char *option = NULL;
-	char *value = NULL;
+	struct uci_ptr ptr;
 	int cmd;
 
-	uci_parse_history_tuple(ctx, &buf, &package, &section, &option, &value, &cmd);
-	if (!package || (strcmp(package, p->e.name) != 0))
-		goto error;
-	if (!uci_validate_name(section))
-		goto error;
-	if (option && !uci_validate_name(option))
-		goto error;
-	if (rename && !uci_validate_str(value, (option || delete)))
+	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, section, option, value);
+		uci_add_history(ctx, &p->saved_history, cmd, ptr.section, ptr.option, ptr.value);
 
 	switch(cmd) {
+	case UCI_CMD_REORDER:
+		expand_ptr(ctx, &ptr, true);
+		if (!ptr.s)
+			UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+		UCI_INTERNAL(uci_reorder_section, ctx, ptr.s, strtoul(ptr.value, NULL, 10));
+		break;
 	case UCI_CMD_RENAME:
-		UCI_INTERNAL(uci_rename, ctx, p, section, option, value);
+		UCI_INTERNAL(uci_rename, ctx, &ptr);
 		break;
 	case UCI_CMD_REMOVE:
-		UCI_INTERNAL(uci_delete, ctx, p, section, option);
+		UCI_INTERNAL(uci_delete, ctx, &ptr);
 		break;
 	case UCI_CMD_LIST_ADD:
-		UCI_INTERNAL(uci_add_list, ctx, p, section, option, value, NULL);
+		UCI_INTERNAL(uci_add_list, ctx, &ptr);
 		break;
 	case UCI_CMD_ADD:
 	case UCI_CMD_CHANGE:
-		UCI_INTERNAL(uci_set, ctx, p, section, option, value, &e);
-		if (!option && e && (cmd == UCI_CMD_ADD))
+		UCI_INTERNAL(uci_set, ctx, &ptr);
+		e = ptr.last;
+		if (!ptr.option && e && (cmd == UCI_CMD_ADD))
 			uci_to_section(e)->anonymous = true;
 		break;
 	}
@@ -245,7 +263,10 @@ static int uci_load_history(struct uci_context *ctx, struct uci_package *p, bool
 	changes = uci_load_history_file(ctx, p, filename, &f, flush);
 	if (flush && f && (changes > 0)) {
 		rewind(f);
-		ftruncate(fileno(f), 0);
+		if (ftruncate(fileno(f), 0) < 0) {
+			uci_close_stream(f);
+			UCI_THROW(ctx, UCI_ERR_IO);
+		}
 	}
 	if (filename)
 		free(filename);
@@ -260,10 +281,7 @@ static void uci_filter_history(struct uci_context *ctx, const char *name, const
 	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);
@@ -291,13 +309,13 @@ static void uci_filter_history(struct uci_context *ctx, const char *name, const
 		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);
+		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 */
@@ -306,7 +324,8 @@ static void uci_filter_history(struct uci_context *ctx, const char *name, const
 
 	/* rebuild the history file */
 	rewind(f);
-	ftruncate(fileno(f), 0);
+	if (ftruncate(fileno(f), 0) < 0)
+		UCI_THROW(ctx, UCI_ERR_IO);
 	uci_foreach_element_safe(&list, tmp, e) {
 		fprintf(f, "%s\n", e->name);
 		uci_free_element(e);
@@ -316,23 +335,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
@@ -342,20 +360,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);
 
-	*pkg = NULL;
-	uci_free_package(&p);
-	uci_filter_history(ctx, name, section, option);
+	/* 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);
 
-	UCI_INTERNAL(uci_load, ctx, name, &p);
+	uci_free_package(&ptr->p);
+	uci_filter_history(ctx, package, section, option);
+
+	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;
@@ -391,6 +419,17 @@ 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);
 
+	uci_foreach_element(&ctx->hooks, tmp) {
+		struct uci_hook *hook = uci_to_hook(tmp);
+
+		if (!hook->ops->set)
+			continue;
+
+		uci_foreach_element(&p->history, e) {
+			hook->ops->set(hook->ops, p, uci_to_history(e));
+		}
+	}
+
 	ctx->err = 0;
 	UCI_TRAP_SAVE(ctx, done);
 	f = uci_open_stream(ctx, filename, SEEK_END, true, true);
@@ -410,6 +449,9 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
 		case UCI_CMD_ADD:
 			prefix = "+";
 			break;
+		case UCI_CMD_REORDER:
+			prefix = "^";
+			break;
 		case UCI_CMD_LIST_ADD:
 			prefix = "|";
 			break;