X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=cli.c;h=f8b45dba091f088f84e22dc98503fe9e6e1fd7e3;hp=9787988d4c957dffbf27da50fc9bfaac556c9265;hb=021fd65643a7932dc67ebeb2291264e308432428;hpb=976e6db54ee86c7198e68b48cea2f9f1db9c3425

diff --git a/cli.c b/cli.c
index 9787988..f8b45db 100644
--- a/cli.c
+++ b/cli.c
@@ -14,17 +14,21 @@
 #include <strings.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdarg.h>
+#include <errno.h>
 #include <unistd.h>
 #include "uci.h"
 
 #define MAX_ARGS	4 /* max command line arguments for batch mode */
 
+static const char *delimiter = " ";
 static const char *appname;
 static enum {
 	CLI_FLAG_MERGE =    (1 << 0),
 	CLI_FLAG_QUIET =    (1 << 1),
 	CLI_FLAG_NOCOMMIT = (1 << 2),
 	CLI_FLAG_BATCH =    (1 << 3),
+	CLI_FLAG_SHOW_EXT = (1 << 4),
 } flags;
 
 static FILE *input;
@@ -34,9 +38,12 @@ enum {
 	/* section cmds */
 	CMD_GET,
 	CMD_SET,
+	CMD_ADD_LIST,
+	CMD_DEL_LIST,
 	CMD_DEL,
 	CMD_RENAME,
 	CMD_REVERT,
+	CMD_REORDER,
 	/* package cmds */
 	CMD_SHOW,
 	CMD_CHANGES,
@@ -48,8 +55,81 @@ enum {
 	CMD_HELP,
 };
 
+struct uci_type_list {
+	unsigned int idx;
+	const char *name;
+	struct uci_type_list *next;
+};
+
+static struct uci_type_list *type_list = NULL;
+static char *typestr = NULL;
+static const char *cur_section_ref = NULL;
+
 static int uci_cmd(int argc, char **argv);
 
+static void
+uci_reset_typelist(void)
+{
+	struct uci_type_list *type;
+	while (type_list != NULL) {
+			type = type_list;
+			type_list = type_list->next;
+			free(type);
+	}
+	if (typestr) {
+		free(typestr);
+		typestr = NULL;
+	}
+	cur_section_ref = NULL;
+}
+
+static char *
+uci_lookup_section_ref(struct uci_section *s)
+{
+	struct uci_type_list *ti = type_list;
+	char *ret;
+	int maxlen;
+
+	if (!(flags & CLI_FLAG_SHOW_EXT))
+		return s->e.name;
+
+	/* look up in section type list */
+	while (ti) {
+		if (strcmp(ti->name, s->type) == 0)
+			break;
+		ti = ti->next;
+	}
+	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;
+		ti->name = s->type;
+	}
+
+	if (s->anonymous) {
+		maxlen = strlen(s->type) + 1 + 2 + 10;
+		if (!typestr) {
+			typestr = malloc(maxlen);
+		} else {
+			typestr = realloc(typestr, maxlen);
+		}
+
+		if (typestr)
+			sprintf(typestr, "@%s[%d]", ti->name, ti->idx);
+
+		ret = typestr;
+	} else {
+		ret = s->e.name;
+	}
+
+	ti->idx++;
+
+	return ret;
+}
+
 static void uci_usage(void)
 {
 	fprintf(stderr,
@@ -61,14 +141,19 @@ static void uci_usage(void)
 		"\tchanges    [<config>]\n"
 		"\tcommit     [<config>]\n"
 		"\tadd        <config> <section-type>\n"
+		"\tadd_list   <config>.<section>.<option>=<string>\n"
+		"\tdel_list   <config>.<section>.<option>=<string>\n"
 		"\tshow       [<config>[.<section>[.<option>]]]\n"
 		"\tget        <config>.<section>[.<option>]\n"
 		"\tset        <config>.<section>[.<option>]=<value>\n"
+		"\tdelete     <config>[.<section>[[.<option>][=<id>]]]\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-m         when importing, merge data into an existing package\n"
 		"\t-n         name unnamed sections on export (default)\n"
@@ -78,6 +163,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
 	);
@@ -91,25 +177,83 @@ static void cli_perror(void)
 	uci_perror(ctx, appname);
 }
 
-static void uci_show_option(struct uci_option *o)
+static void cli_error(const char *fmt, ...)
+{
+	va_list ap;
+
+	if (flags & CLI_FLAG_QUIET)
+		return;
+
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
+}
+
+static void uci_print_value(FILE *f, const char *v)
 {
-      printf("%s.%s.%s=%s\n",
-                      o->section->package->e.name,
-                      o->section->e.name,
-                      o->e.name,
-			o->value);
+	fprintf(f, "'");
+	while (*v) {
+		if (*v != '\'')
+			fputc(*v, f);
+		else
+			fprintf(f, "'\\''");
+		v++;
+	}
+	fprintf(f, "'");
 }
 
-static void uci_show_section(struct uci_section *p)
+static void uci_show_value(struct uci_option *o, bool quote)
 {
 	struct uci_element *e;
-	const char *cname, *sname;
+	bool sep = false;
+	char *space;
 
-	cname = p->package->e.name;
-	sname = p->e.name;
-	printf("%s.%s=%s\n", cname, sname, p->type);
-	uci_foreach_element(&p->options, e) {
-		uci_show_option(uci_to_option(e));
+	switch(o->type) {
+	case UCI_TYPE_STRING:
+		if (quote)
+			uci_print_value(stdout, o->v.string);
+		else
+			printf("%s", o->v.string);
+		printf("\n");
+		break;
+	case UCI_TYPE_LIST:
+		uci_foreach_element(&o->v.list, e) {
+			printf("%s", (sep ? delimiter : ""));
+			space = strpbrk(e->name, " \t\r\n");
+			if (!space && !quote)
+				printf("%s", e->name);
+			else
+				uci_print_value(stdout, e->name);
+			sep = true;
+		}
+		printf("\n");
+		break;
+	default:
+		printf("<unknown>\n");
+		break;
+	}
+}
+
+static void uci_show_option(struct uci_option *o, bool quote)
+{
+	printf("%s.%s.%s=",
+		o->section->package->e.name,
+		(cur_section_ref ? cur_section_ref : o->section->e.name),
+		o->e.name);
+	uci_show_value(o, quote);
+}
+
+static void uci_show_section(struct uci_section *s)
+{
+	struct uci_element *e;
+	const char *cname;
+	const char *sname;
+
+	cname = s->package->e.name;
+	sname = (cur_section_ref ? cur_section_ref : s->e.name);
+	printf("%s.%s=%s\n", cname, sname, s->type);
+	uci_foreach_element(&s->options, e) {
+		uci_show_option(uci_to_option(e), true);
 	}
 }
 
@@ -117,88 +261,108 @@ static void uci_show_package(struct uci_package *p)
 {
 	struct uci_element *e;
 
+	uci_reset_typelist();
 	uci_foreach_element( &p->sections, e) {
-		uci_show_section(uci_to_section(e));
+		struct uci_section *s = uci_to_section(e);
+		cur_section_ref = uci_lookup_section_ref(s);
+		uci_show_section(s);
 	}
+	uci_reset_typelist();
 }
 
 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 = "=";
 
-		if (h->cmd == UCI_CMD_REMOVE)
-			printf("-");
-		printf("%s.%s", p->e.name, h->section);
+		switch(h->cmd) {
+		case UCI_CMD_REMOVE:
+			prefix = "-";
+			break;
+		case UCI_CMD_LIST_ADD:
+			op = "+=";
+			break;
+		case UCI_CMD_LIST_DEL:
+			op = "-=";
+			break;
+		default:
+			break;
+		}
+		printf("%s%s.%s", prefix, p->e.name, h->section);
 		if (e->name)
 			printf(".%s", e->name);
-		if (h->cmd != UCI_CMD_REMOVE)
-			printf("=%s", h->value);
+		if (h->cmd != UCI_CMD_REMOVE) {
+			printf("%s", op);
+			uci_print_value(stdout, h->value);
+		}
 		printf("\n");
 	}
 }
 
 static int package_cmd(int cmd, char *tuple)
 {
-	struct uci_package *p;
-	struct uci_section *s;
 	struct uci_element *e = NULL;
+	struct uci_ptr ptr;
+	int ret = 1;
 
-	if (uci_lookup_ext(ctx, &e, tuple) != UCI_OK) {
+	if (uci_lookup_ptr(ctx, &ptr, tuple, true) != UCI_OK) {
 		cli_perror();
 		return 1;
 	}
-	switch(e->type) {
-	case UCI_TYPE_PACKAGE:
-		p = uci_to_package(e);
-		break;
-	case UCI_TYPE_SECTION:
-		s = uci_to_section(e);
-		p = s->package;
-		break;
-	case UCI_TYPE_OPTION:
-		s = uci_to_option(e)->section;
-		p = s->package;
-		break;
-	default:
-		return 0;
-	}
 
+	e = ptr.last;
 	switch(cmd) {
 	case CMD_CHANGES:
-		uci_show_changes(p);
+		uci_show_changes(ptr.p);
 		break;
 	case CMD_COMMIT:
-		if (flags & CLI_FLAG_NOCOMMIT)
-			return 0;
-		if (uci_commit(ctx, &p, false) != UCI_OK)
+		if (flags & CLI_FLAG_NOCOMMIT) {
+			ret = 0;
+			goto out;
+		}
+		if (uci_commit(ctx, &ptr.p, false) != UCI_OK) {
 			cli_perror();
+			goto out;
+		}
 		break;
 	case CMD_EXPORT:
-		uci_export(ctx, stdout, p, true);
+		if (uci_export(ctx, stdout, ptr.p, true) != UCI_OK) {
+			goto out;
+		}
 		break;
 	case CMD_SHOW:
+		if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
+			ctx->err = UCI_ERR_NOTFOUND;
+			cli_perror();
+			goto out;
+		}
 		switch(e->type) {
 			case UCI_TYPE_PACKAGE:
-				uci_show_package(p);
+				uci_show_package(ptr.p);
 				break;
 			case UCI_TYPE_SECTION:
-				uci_show_section(uci_to_section(e));
+				uci_show_section(ptr.s);
 				break;
 			case UCI_TYPE_OPTION:
-				uci_show_option(uci_to_option(e));
+				uci_show_option(ptr.o, true);
 				break;
 			default:
 				/* should not happen */
-				return 1;
+				goto out;
 		}
 		break;
 	}
 
-	uci_unload(ctx, p);
-	return 0;
+	ret = 0;
+
+out:
+	if (ptr.p)
+		uci_unload(ctx, ptr.p);
+	return ret;
 }
 
 static int uci_do_import(int argc, char **argv)
@@ -249,6 +413,7 @@ static int uci_do_package_cmd(int cmd, int argc, char **argv)
 {
 	char **configs = NULL;
 	char **p;
+	int ret = 1;
 
 	if (argc > 2)
 		return 255;
@@ -258,14 +423,17 @@ static int uci_do_package_cmd(int cmd, int argc, char **argv)
 
 	if ((uci_list_configs(ctx, &configs) != UCI_OK) || !configs) {
 		cli_perror();
-		return 1;
+		goto out;
 	}
 
 	for (p = configs; *p; p++) {
 		package_cmd(cmd, *p);
 	}
 
-	return 0;
+	ret = 0;
+out:
+	free(configs);
+	return ret;
 }
 
 static int uci_do_add(int argc, char **argv)
@@ -298,73 +466,71 @@ done:
 
 static int uci_do_section_cmd(int cmd, int argc, char **argv)
 {
-	struct uci_package *p = NULL;
-	struct uci_section *s = NULL;
-	struct uci_element *e = NULL;
-	char *section = NULL;
-	char *option = NULL;
-	char *value = NULL;
+	struct uci_element *e;
+	struct uci_ptr ptr;
 	int ret = UCI_OK;
+	int dummy;
 
 	if (argc != 2)
 		return 255;
 
-	value = strchr(argv[1], '=');
-	if (value) {
-		*value = 0;
-		value++;
-		if (!uci_validate_text(value))
-			return 1;
-	}
-
-	if (value && (cmd != CMD_SET) && (cmd != CMD_RENAME))
-		return 1;
-
-	if (uci_lookup_ext(ctx, &e, argv[1]) != UCI_OK) {
+	if (uci_lookup_ptr(ctx, &ptr, argv[1], true) != UCI_OK) {
 		cli_perror();
 		return 1;
 	}
 
-	switch(e->type) {
-	case UCI_TYPE_SECTION:
-		s = uci_to_section(e);
-		break;
-	case UCI_TYPE_OPTION:
-		option = e->name;
-		s = uci_to_option(e)->section;
-		break;
-	default:
+	if (ptr.value && (cmd != CMD_SET) && (cmd != CMD_DEL) &&
+	    (cmd != CMD_ADD_LIST) && (cmd != CMD_DEL_LIST) &&
+	    (cmd != CMD_RENAME) && (cmd != CMD_REORDER))
 		return 1;
-	}
-	section = s->e.name;
-	p = s->package;
 
+	e = ptr.last;
 	switch(cmd) {
 	case CMD_GET:
+		if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
+			ctx->err = UCI_ERR_NOTFOUND;
+			cli_perror();
+			return 1;
+		}
 		switch(e->type) {
 		case UCI_TYPE_SECTION:
-			value = s->type;
+			printf("%s\n", ptr.s->type);
 			break;
 		case UCI_TYPE_OPTION:
-			value = uci_to_option(e)->value;
+			uci_show_value(ptr.o, false);
 			break;
 		default:
 			break;
 		}
 		/* throw the value to stdout */
-		printf("%s\n", value);
 		break;
 	case CMD_RENAME:
-		ret = uci_rename(ctx, p, section, option, value);
+		ret = uci_rename(ctx, &ptr);
 		break;
 	case CMD_REVERT:
-		ret = uci_revert(ctx, &p, section, option);
+		ret = uci_revert(ctx, &ptr);
 		break;
 	case CMD_SET:
-		ret = uci_set(ctx, p, section, option, value, NULL);
+		ret = uci_set(ctx, &ptr);
+		break;
+	case CMD_ADD_LIST:
+		ret = uci_add_list(ctx, &ptr);
+		break;
+	case CMD_DEL_LIST:
+		ret = uci_del_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, p, section, option);
+		if (ptr.value && !sscanf(ptr.value, "%d", &dummy))
+			return 1;
+		ret = uci_delete(ctx, &ptr);
 		break;
 	}
 
@@ -374,7 +540,7 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
 
 	/* save changes, but don't commit them yet */
 	if (ret == UCI_OK)
-		ret = uci_save(ctx, p);
+		ret = uci_save(ctx, ptr.p);
 
 	if (ret != UCI_OK) {
 		cli_perror();
@@ -386,14 +552,14 @@ 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;
 
 	for(i = 0; i <= MAX_ARGS; i++) {
 		if (i == MAX_ARGS) {
-			fprintf(stderr, "Too many arguments\n");
+			cli_error("Too many arguments\n");
 			return 1;
 		}
 		argv[i] = NULL;
@@ -406,7 +572,7 @@ static int uci_batch_cmd(void)
 			break;
 		argv[i] = strdup(argv[i]);
 		if (!argv[i]) {
-			perror("uci");
+			cli_error("uci: %s", strerror(errno));
 			return 1;
 		}
 	}
@@ -420,8 +586,7 @@ static int uci_batch_cmd(void)
 		return 0;
 
 	for (j = 0; j < i; j++) {
-		if (argv[j])
-			free(argv[j]);
+		free(argv[j]);
 	}
 
 	return ret;
@@ -431,6 +596,7 @@ static int uci_batch(void)
 {
 	int ret = 0;
 
+	flags |= CLI_FLAG_BATCH;
 	while (!feof(input)) {
 		struct uci_element *e, *tmp;
 
@@ -438,13 +604,15 @@ static int uci_batch(void)
 		if (ret == 254)
 			return 0;
 		else if (ret == 255)
-			fprintf(stderr, "Unknown command\n");
+			cli_error("Unknown command\n");
 
 		/* clean up */
 		uci_foreach_element_safe(&ctx->root, tmp, e) {
 			uci_unload(ctx, uci_to_package(e));
 		}
 	}
+	flags &= ~CLI_FLAG_BATCH;
+
 	return 0;
 }
 
@@ -471,7 +639,10 @@ 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], "del"))
+	else if (!strcasecmp(argv[0], "reorder"))
+		cmd = CMD_REORDER;
+	else if (!strcasecmp(argv[0], "del") ||
+	         !strcasecmp(argv[0], "delete"))
 		cmd = CMD_DEL;
 	else if (!strcasecmp(argv[0], "import"))
 		cmd = CMD_IMPORT;
@@ -479,15 +650,22 @@ static int uci_cmd(int argc, char **argv)
 		cmd = CMD_HELP;
 	else if (!strcasecmp(argv[0], "add"))
 		cmd = CMD_ADD;
+	else if (!strcasecmp(argv[0], "add_list"))
+		cmd = CMD_ADD_LIST;
+	else if (!strcasecmp(argv[0], "del_list"))
+		cmd = CMD_DEL_LIST;
 	else
 		cmd = -1;
 
 	switch(cmd) {
+		case CMD_ADD_LIST:
+		case CMD_DEL_LIST:
 		case CMD_GET:
 		case CMD_SET:
 		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:
@@ -511,23 +689,33 @@ int main(int argc, char **argv)
 	int ret;
 	int c;
 
+	flags = CLI_FLAG_SHOW_EXT;
 	appname = argv[0];
 	input = stdin;
 	ctx = uci_alloc_context();
 	if (!ctx) {
-		fprintf(stderr, "Out of memory\n");
+		cli_error("Out of memory\n");
 		return 1;
 	}
 
-	while((c = getopt(argc, argv, "c: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);
 				break;
+			case 'd':
+				delimiter = optarg;
+				break;
 			case 'f':
+				if (input != stdin) {
+					fclose(input);
+					cli_error("Too many input files.\n");
+					return 1;
+				}
+
 				input = fopen(optarg, "r");
 				if (!input) {
-					perror("uci");
+					cli_error("uci: %s", strerror(errno));
 					return 1;
 				}
 				break;
@@ -548,16 +736,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;
@@ -572,13 +763,13 @@ int main(int argc, char **argv)
 		uci_usage();
 		return 0;
 	}
+
 	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);