X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=cli.c;h=b660273f96b397023e5f62ce3e45e329adeb1a0d;hp=61afa80ddfede1fbbe40eda65dcb97e116a30d95;hb=e7fa4a3ed877978a95c25605aa5f1a8beb35b573;hpb=f18b4c6a13e288fae0fa0cdd92de63299e090dab

diff --git a/cli.c b/cli.c
index 61afa80..b660273 100644
--- a/cli.c
+++ b/cli.c
@@ -26,6 +26,8 @@ static enum {
 	CLI_FLAG_QUIET =    (1 << 1),
 	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;
@@ -39,6 +41,7 @@ enum {
 	CMD_DEL,
 	CMD_RENAME,
 	CMD_REVERT,
+	CMD_REORDER,
 	/* package cmds */
 	CMD_SHOW,
 	CMD_CHANGES,
@@ -84,7 +87,7 @@ uci_lookup_section_ref(struct uci_section *s)
 	struct uci_type_list *ti = type_list;
 	int maxlen;
 
-	if (!s->anonymous)
+	if (!s->anonymous || !(flags & CLI_FLAG_SHOW_EXT))
 		return s->e.name;
 
 	/* look up in section type list */
@@ -130,11 +133,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"
@@ -143,6 +148,7 @@ static void uci_usage(void)
 		"\t-q         quiet mode (don't print error messages)\n"
 		"\t-s         force strict mode (stop on parser errors, default)\n"
 		"\t-S         disable strict mode\n"
+		"\t-X         do not use extended syntax on 'show'\n"
 		"\n",
 		appname
 	);
@@ -218,8 +224,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 = "=";
 
@@ -402,7 +408,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;
@@ -437,6 +443,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) {
+			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;
@@ -460,7 +474,7 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
 
 static int uci_batch_cmd(void)
 {
-	char *argv[MAX_ARGS];
+	char *argv[MAX_ARGS + 2];
 	char *str = NULL;
 	int ret = 0;
 	int i, j;
@@ -548,6 +562,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;
@@ -569,6 +585,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:
@@ -592,6 +609,7 @@ int main(int argc, char **argv)
 	int ret;
 	int c;
 
+	flags = CLI_FLAG_SHOW_EXT;
 	appname = argv[0];
 	input = stdin;
 	ctx = uci_alloc_context();
@@ -600,7 +618,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	while((c = getopt(argc, argv, "c:d:f:mnNp:P:sSq")) != -1) {
+	while((c = getopt(argc, argv, "c:d:f:LmnNp:P:sSqX")) != -1) {
 		switch(c) {
 			case 'c':
 				uci_set_confdir(ctx, optarg);
@@ -615,6 +633,9 @@ int main(int argc, char **argv)
 					return 1;
 				}
 				break;
+			case 'L':
+				flags |= CLI_FLAG_NOPLUGINS;
+				break;
 			case 'm':
 				flags |= CLI_FLAG_MERGE;
 				break;
@@ -632,16 +653,19 @@ 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;
 			case 'q':
 				flags |= CLI_FLAG_QUIET;
 				break;
+			case 'X':
+				flags &= ~CLI_FLAG_SHOW_EXT;
+				break;
 			default:
 				uci_usage();
 				return 0;
@@ -656,13 +680,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);