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

diff --git a/cli.c b/cli.c
index 9bdd553..61afa80 100644
--- a/cli.c
+++ b/cli.c
@@ -19,6 +19,7 @@
 
 #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),
@@ -34,6 +35,7 @@ enum {
 	/* section cmds */
 	CMD_GET,
 	CMD_SET,
+	CMD_ADD_LIST,
 	CMD_DEL,
 	CMD_RENAME,
 	CMD_REVERT,
@@ -43,12 +45,73 @@ enum {
 	CMD_EXPORT,
 	CMD_COMMIT,
 	/* other cmds */
+	CMD_ADD,
 	CMD_IMPORT,
 	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;
+	int maxlen;
+
+	if (!s->anonymous)
+		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));
+		memset(ti, 0, sizeof(struct uci_type_list));
+		ti->next = type_list;
+		type_list = ti;
+		ti->name = s->type;
+	}
+
+	maxlen = strlen(s->type) + 1 + 2 + 10;
+	if (!typestr) {
+		typestr = malloc(maxlen);
+	} else {
+		typestr = realloc(typestr, maxlen);
+	}
+	sprintf(typestr, "@%s[%d]", ti->name, ti->idx);
+	ti->idx++;
+	return typestr;
+}
+
 static void uci_usage(void)
 {
 	fprintf(stderr,
@@ -58,13 +121,19 @@ static void uci_usage(void)
 		"\texport     [<config>]\n"
 		"\timport     [<config>]\n"
 		"\tchanges    [<config>]\n"
+		"\tcommit     [<config>]\n"
+		"\tadd        <config> <section-type>\n"
+		"\tadd_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>]]\n"
 		"\trename     <config>.<section>[.<option>]=<name>\n"
 		"\trevert     <config>[.<section>[.<option>]]\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"
@@ -87,16 +156,48 @@ static void cli_perror(void)
 	uci_perror(ctx, appname);
 }
 
-static void uci_show_section(struct uci_section *p)
+static void uci_show_value(struct uci_option *o)
 {
 	struct uci_element *e;
-	const char *cname, *sname;
+	bool sep = false;
 
-	cname = p->package->e.name;
-	sname = p->e.name;
-	printf("%s.%s=%s\n", cname, sname, p->type);
-	uci_foreach_element(&p->options, e) {
-		printf("%s.%s.%s=%s\n", cname, sname, e->name, uci_to_option(e)->value);
+	switch(o->type) {
+	case UCI_TYPE_STRING:
+		printf("%s\n", o->v.string);
+		break;
+	case UCI_TYPE_LIST:
+		uci_foreach_element(&o->v.list, e) {
+			printf("%s%s", (sep ? delimiter : ""), e->name);
+			sep = true;
+		}
+		printf("\n");
+		break;
+	default:
+		printf("<unknown>\n");
+		break;
+	}
+}
+
+static void uci_show_option(struct uci_option *o)
+{
+	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);
+}
+
+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));
 	}
 }
 
@@ -104,9 +205,13 @@ 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)
@@ -115,54 +220,76 @@ static void uci_show_changes(struct uci_package *p)
 
 	uci_foreach_element(&p->saved_history, e) {
 		struct uci_history *h = uci_to_history(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;
+		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);
+			printf("%s%s", op, h->value);
 		printf("\n");
 	}
 }
 
-static int package_cmd(int cmd, char *package)
+static int package_cmd(int cmd, char *tuple)
 {
-	struct uci_package *p = NULL;
-	int ret;
-
-	if (cmd == CMD_CHANGES)
-		ctx->flags |= UCI_FLAG_SAVED_HISTORY;
-	ret = uci_load(ctx, package, &p);
-	if (cmd == CMD_CHANGES)
-		ctx->flags &= ~UCI_FLAG_SAVED_HISTORY;
+	struct uci_element *e = NULL;
+	struct uci_ptr ptr;
 
-	if (ret != UCI_OK) {
+	if (uci_lookup_ptr(ctx, &ptr, tuple, true) != UCI_OK) {
 		cli_perror();
 		return 1;
 	}
-	if (!p)
-		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 (uci_commit(ctx, &ptr.p, false) != UCI_OK)
 			cli_perror();
 		break;
 	case CMD_EXPORT:
-		uci_export(ctx, stdout, p, true);
+		uci_export(ctx, stdout, ptr.p, true);
 		break;
 	case CMD_SHOW:
-		uci_show_package(p);
+		if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
+			ctx->err = UCI_ERR_NOTFOUND;
+			cli_perror();
+			return 1;
+		}
+		switch(e->type) {
+			case UCI_TYPE_PACKAGE:
+				uci_show_package(ptr.p);
+				break;
+			case UCI_TYPE_SECTION:
+				uci_show_section(ptr.s);
+				break;
+			case UCI_TYPE_OPTION:
+				uci_show_option(ptr.o);
+				break;
+			default:
+				/* should not happen */
+				return 1;
+		}
 		break;
 	}
 
-	uci_unload(ctx, p);
+	uci_unload(ctx, ptr.p);
 	return 0;
 }
 
@@ -233,69 +360,85 @@ static int uci_do_package_cmd(int cmd, int argc, char **argv)
 	return 0;
 }
 
+static int uci_do_add(int argc, char **argv)
+{
+	struct uci_package *p = NULL;
+	struct uci_section *s = NULL;
+	int ret;
+
+	if (argc != 3)
+		return 255;
+
+	ret = uci_load(ctx, argv[1], &p);
+	if (ret != UCI_OK)
+		goto done;
+
+	ret = uci_add_section(ctx, p, argv[2], &s);
+	if (ret != UCI_OK)
+		goto done;
+
+	ret = uci_save(ctx, p);
+
+done:
+	if (ret != UCI_OK)
+		cli_perror();
+	else if (s)
+		fprintf(stdout, "%s\n", s->e.name);
+
+	return ret;
+}
 
 static int uci_do_section_cmd(int cmd, int argc, char **argv)
 {
-	struct uci_package *p = NULL;
-	struct uci_element *e = NULL;
-	char *package = NULL;
-	char *section = NULL;
-	char *option = NULL;
-	char *value = NULL;
-	char **ptr = NULL;
+	struct uci_element *e;
+	struct uci_ptr ptr;
 	int ret = UCI_OK;
 
 	if (argc != 2)
 		return 255;
 
-	switch(cmd) {
-	case CMD_SET:
-	case CMD_RENAME:
-		ptr = &value;
-		break;
-	default:
-		break;
-	}
-	if (uci_parse_tuple(ctx, argv[1], &package, &section, &option, ptr) != UCI_OK)
-		return 1;
-
-	if (uci_load(ctx, package, &p) != UCI_OK) {
+	if (uci_lookup_ptr(ctx, &ptr, argv[1], true) != UCI_OK) {
 		cli_perror();
 		return 1;
 	}
-	if (!p)
-		return 0;
 
+	if (ptr.value && (cmd != CMD_SET) && (cmd != CMD_ADD_LIST) && (cmd != CMD_RENAME))
+		return 1;
+
+	e = ptr.last;
 	switch(cmd) {
 	case CMD_GET:
-		if (uci_lookup(ctx, &e, p, section, option) != UCI_OK)
+		if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
+			ctx->err = UCI_ERR_NOTFOUND;
+			cli_perror();
 			return 1;
-
+		}
 		switch(e->type) {
 		case UCI_TYPE_SECTION:
-			value = uci_to_section(e)->type;
+			printf("%s\n", ptr.s->type);
 			break;
 		case UCI_TYPE_OPTION:
-			value = uci_to_option(e)->value;
+			uci_show_value(ptr.o);
 			break;
 		default:
-			/* should not happen */
-			return 1;
+			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);
+		ret = uci_set(ctx, &ptr);
+		break;
+	case CMD_ADD_LIST:
+		ret = uci_add_list(ctx, &ptr);
 		break;
 	case CMD_DEL:
-		ret = uci_delete(ctx, p, section, option);
+		ret = uci_delete(ctx, &ptr);
 		break;
 	}
 
@@ -305,7 +448,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();
@@ -362,6 +505,7 @@ static int uci_batch(void)
 {
 	int ret = 0;
 
+	flags |= CLI_FLAG_BATCH;
 	while (!feof(input)) {
 		struct uci_element *e, *tmp;
 
@@ -372,11 +516,12 @@ static int uci_batch(void)
 			fprintf(stderr, "Unknown command\n");
 
 		/* clean up */
-		uci_cleanup(ctx);
 		uci_foreach_element_safe(&ctx->root, tmp, e) {
 			uci_unload(ctx, uci_to_package(e));
 		}
 	}
+	flags &= ~CLI_FLAG_BATCH;
+
 	return 0;
 }
 
@@ -403,16 +548,22 @@ 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], "del") ||
+	         !strcasecmp(argv[0], "delete"))
 		cmd = CMD_DEL;
 	else if (!strcasecmp(argv[0], "import"))
 		cmd = CMD_IMPORT;
 	else if (!strcasecmp(argv[0], "help"))
 		cmd = CMD_HELP;
+	else if (!strcasecmp(argv[0], "add"))
+		cmd = CMD_ADD;
+	else if (!strcasecmp(argv[0], "add_list"))
+		cmd = CMD_ADD_LIST;
 	else
 		cmd = -1;
 
 	switch(cmd) {
+		case CMD_ADD_LIST:
 		case CMD_GET:
 		case CMD_SET:
 		case CMD_DEL:
@@ -426,6 +577,8 @@ static int uci_cmd(int argc, char **argv)
 			return uci_do_package_cmd(cmd, argc, argv);
 		case CMD_IMPORT:
 			return uci_do_import(argc, argv);
+		case CMD_ADD:
+			return uci_do_add(argc, argv);
 		case CMD_HELP:
 			uci_usage();
 			return 0;
@@ -447,8 +600,14 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	while((c = getopt(argc, argv, "f:mnNp:P:sSq")) != -1) {
+	while((c = getopt(argc, argv, "c:d:f:mnNp:P:sSq")) != -1) {
 		switch(c) {
+			case 'c':
+				uci_set_confdir(ctx, optarg);
+				break;
+			case 'd':
+				delimiter = optarg;
+				break;
 			case 'f':
 				input = fopen(optarg, "r");
 				if (!input) {