X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=cli.c;h=144cddefa285f0fbdfaa4d88514404a6686b6258;hp=25a61f872b540347012c483bc8a30445376fa190;hb=2e90d2637abcbea12f5f4070be7a158fb4637604;hpb=13ccfd04a22f58928a29e9282ed30f5cc097165d

diff --git a/cli.c b/cli.c
index 25a61f8..144cdde 100644
--- a/cli.c
+++ b/cli.c
@@ -27,6 +27,7 @@ static enum {
 	CLI_FLAG_NOCOMMIT = (1 << 2),
 	CLI_FLAG_BATCH =    (1 << 3),
 	CLI_FLAG_SHOW_EXT = (1 << 4),
+	CLI_FLAG_NOPLUGINS= (1 << 5),
 } flags;
 
 static FILE *input;
@@ -40,6 +41,7 @@ enum {
 	CMD_DEL,
 	CMD_RENAME,
 	CMD_REVERT,
+	CMD_REORDER,
 	/* package cmds */
 	CMD_SHOW,
 	CMD_CHANGES,
@@ -96,6 +98,8 @@ uci_lookup_section_ref(struct uci_section *s)
 	}
 	if (!ti) {
 		ti = malloc(sizeof(struct uci_type_list));
+		if (!ti)
+			return NULL;
 		memset(ti, 0, sizeof(struct uci_type_list));
 		ti->next = type_list;
 		type_list = ti;
@@ -108,8 +112,12 @@ uci_lookup_section_ref(struct uci_section *s)
 	} else {
 		typestr = realloc(typestr, maxlen);
 	}
-	sprintf(typestr, "@%s[%d]", ti->name, ti->idx);
+
+	if (typestr)
+		sprintf(typestr, "@%s[%d]", ti->name, ti->idx);
+
 	ti->idx++;
+
 	return typestr;
 }
 
@@ -131,11 +139,13 @@ static void uci_usage(void)
 		"\tdelete     <config>[.<section[.<option>]]\n"
 		"\trename     <config>.<section>[.<option>]=<name>\n"
 		"\trevert     <config>[.<section>[.<option>]]\n"
+		"\treorder    <config>.<section>=<position>\n"
 		"\n"
 		"Options:\n"
 		"\t-c <path>  set the search path for config files (default: /etc/config)\n"
 		"\t-d <str>   set the delimiter for list values in uci show\n"
 		"\t-f <file>  use <file> as input instead of stdin\n"
+		"\t-L         do not load any plugins\n"
 		"\t-m         when importing, merge data into an existing package\n"
 		"\t-n         name unnamed sections on export (default)\n"
 		"\t-N         don't name unnamed sections\n"
@@ -220,8 +230,8 @@ static void uci_show_changes(struct uci_package *p)
 {
 	struct uci_element *e;
 
-	uci_foreach_element(&p->saved_history, e) {
-		struct uci_history *h = uci_to_history(e);
+	uci_foreach_element(&p->saved_delta, e) {
+		struct uci_delta *h = uci_to_delta(e);
 		char *prefix = "";
 		char *op = "=";
 
@@ -248,6 +258,7 @@ static int package_cmd(int cmd, char *tuple)
 {
 	struct uci_element *e = NULL;
 	struct uci_ptr ptr;
+	int ret = 0;
 
 	if (uci_lookup_ptr(ctx, &ptr, tuple, true) != UCI_OK) {
 		cli_perror();
@@ -262,8 +273,10 @@ static int package_cmd(int cmd, char *tuple)
 	case CMD_COMMIT:
 		if (flags & CLI_FLAG_NOCOMMIT)
 			return 0;
-		if (uci_commit(ctx, &ptr.p, false) != UCI_OK)
+		if (uci_commit(ctx, &ptr.p, false) != UCI_OK) {
 			cli_perror();
+			ret = 1;
+		}
 		break;
 	case CMD_EXPORT:
 		uci_export(ctx, stdout, ptr.p, true);
@@ -272,7 +285,7 @@ static int package_cmd(int cmd, char *tuple)
 		if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
 			ctx->err = UCI_ERR_NOTFOUND;
 			cli_perror();
-			return 1;
+			ret = 1;
 		}
 		switch(e->type) {
 			case UCI_TYPE_PACKAGE:
@@ -291,8 +304,9 @@ static int package_cmd(int cmd, char *tuple)
 		break;
 	}
 
-	uci_unload(ctx, ptr.p);
-	return 0;
+	if (ptr.p)
+		uci_unload(ctx, ptr.p);
+	return ret;
 }
 
 static int uci_do_import(int argc, char **argv)
@@ -404,7 +418,7 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
 		return 1;
 	}
 
-	if (ptr.value && (cmd != CMD_SET) && (cmd != CMD_ADD_LIST) && (cmd != CMD_RENAME))
+	if (ptr.value && (cmd != CMD_SET) && (cmd != CMD_ADD_LIST) && (cmd != CMD_RENAME) && (cmd != CMD_REORDER))
 		return 1;
 
 	e = ptr.last;
@@ -439,6 +453,14 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
 	case CMD_ADD_LIST:
 		ret = uci_add_list(ctx, &ptr);
 		break;
+	case CMD_REORDER:
+		if (!ptr.s || !ptr.value) {
+			ctx->err = UCI_ERR_NOTFOUND;
+			cli_perror();
+			return 1;
+		}
+		ret = uci_reorder_section(ctx, ptr.s, strtoul(ptr.value, NULL, 10));
+		break;
 	case CMD_DEL:
 		ret = uci_delete(ctx, &ptr);
 		break;
@@ -550,6 +572,8 @@ static int uci_cmd(int argc, char **argv)
 		cmd = CMD_RENAME;
 	else if (!strcasecmp(argv[0], "revert"))
 		cmd = CMD_REVERT;
+	else if (!strcasecmp(argv[0], "reorder"))
+		cmd = CMD_REORDER;
 	else if (!strcasecmp(argv[0], "del") ||
 	         !strcasecmp(argv[0], "delete"))
 		cmd = CMD_DEL;
@@ -571,6 +595,7 @@ static int uci_cmd(int argc, char **argv)
 		case CMD_DEL:
 		case CMD_RENAME:
 		case CMD_REVERT:
+		case CMD_REORDER:
 			return uci_do_section_cmd(cmd, argc, argv);
 		case CMD_SHOW:
 		case CMD_EXPORT:
@@ -603,7 +628,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	while((c = getopt(argc, argv, "c:d:f:mnNp:P:sSqX")) != -1) {
+	while((c = getopt(argc, argv, "c:d:f:LmnNp:P:sSqX")) != -1) {
 		switch(c) {
 			case 'c':
 				uci_set_confdir(ctx, optarg);
@@ -612,12 +637,20 @@ int main(int argc, char **argv)
 				delimiter = optarg;
 				break;
 			case 'f':
+				if (input != stdin) {
+					perror("uci");
+					return 1;
+				}
+
 				input = fopen(optarg, "r");
 				if (!input) {
 					perror("uci");
 					return 1;
 				}
 				break;
+			case 'L':
+				flags |= CLI_FLAG_NOPLUGINS;
+				break;
 			case 'm':
 				flags |= CLI_FLAG_MERGE;
 				break;
@@ -635,10 +668,10 @@ int main(int argc, char **argv)
 				ctx->flags &= ~UCI_FLAG_EXPORT_NAME;
 				break;
 			case 'p':
-				uci_add_history_path(ctx, optarg);
+				uci_add_delta_path(ctx, optarg);
 				break;
 			case 'P':
-				uci_add_history_path(ctx, ctx->savedir);
+				uci_add_delta_path(ctx, ctx->savedir);
 				uci_set_savedir(ctx, optarg);
 				flags |= CLI_FLAG_NOCOMMIT;
 				break;
@@ -662,13 +695,16 @@ int main(int argc, char **argv)
 		uci_usage();
 		return 0;
 	}
+
+	if (!(flags & CLI_FLAG_NOPLUGINS))
+		uci_load_plugins(ctx, NULL);
+
 	ret = uci_cmd(argc - 1, argv + 1);
 	if (input != stdin)
 		fclose(input);
-	if (ret == 255) {
+
+	if (ret == 255)
 		uci_usage();
-		return 0;
-	}
 
 	uci_free_context(ctx);