X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=cli.c;h=305d9fed4b3a83a3118c573b47da51f6bf144313;hb=7d69106b37851e90bd8660c91d906492f6d7d148;hp=dadadaa9226eb8d9867fcfdfaf5ed804273a4d61;hpb=14654223268133b5e74ee1748cec2374664ac5bf;p=project%2Fuci.git

diff --git a/cli.c b/cli.c
index dadadaa..305d9fe 100644
--- a/cli.c
+++ b/cli.c
@@ -12,12 +12,14 @@
  * GNU General Public License for more details.
  */
 #include <strings.h>
+#include <string.h>
 #include <stdlib.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),
@@ -33,6 +35,7 @@ enum {
 	/* section cmds */
 	CMD_GET,
 	CMD_SET,
+	CMD_ADD_LIST,
 	CMD_DEL,
 	CMD_RENAME,
 	CMD_REVERT,
@@ -42,6 +45,7 @@ enum {
 	CMD_EXPORT,
 	CMD_COMMIT,
 	/* other cmds */
+	CMD_ADD,
 	CMD_IMPORT,
 	CMD_HELP,
 };
@@ -56,13 +60,20 @@ static void uci_usage(void)
 		"\tbatch\n"
 		"\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"
@@ -85,6 +96,37 @@ static void cli_perror(void)
 	uci_perror(ctx, appname);
 }
 
+static void uci_show_value(struct uci_option *o)
+{
+	struct uci_element *e;
+	bool sep = false;
+
+	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,
+		o->section->e.name,
+		o->e.name);
+	uci_show_value(o);
+}
+
 static void uci_show_section(struct uci_section *p)
 {
 	struct uci_element *e;
@@ -94,7 +136,7 @@ static void uci_show_section(struct uci_section *p)
 	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);
+		uci_show_option(uci_to_option(e));
 	}
 }
 
@@ -113,54 +155,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;
 }
 
@@ -169,6 +233,7 @@ static int uci_do_import(int argc, char **argv)
 	struct uci_package *package = NULL;
 	char *name = NULL;
 	int ret = UCI_OK;
+	bool merge = false;
 
 	if (argc > 2)
 		return 255;
@@ -182,10 +247,12 @@ static int uci_do_import(int argc, char **argv)
 	if (flags & CLI_FLAG_MERGE) {
 		if (uci_load(ctx, name, &package) != UCI_OK)
 			package = NULL;
+		else
+			merge = true;
 	}
 	ret = uci_import(ctx, input, name, &package, (name != NULL));
 	if (ret == UCI_OK) {
-		if (flags & CLI_FLAG_MERGE) {
+		if (merge) {
 			ret = uci_save(ctx, package);
 		} else {
 			struct uci_element *e;
@@ -228,69 +295,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;
 	}
 
@@ -300,7 +383,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();
@@ -367,7 +450,6 @@ 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));
 		}
@@ -398,16 +480,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:
@@ -421,6 +509,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;
@@ -442,8 +532,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) {