X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=cli.c;h=cd829384a80a1a65309f38051ac9fe3eb86efdb0;hb=3bff697cca125a6a4147e3bd1c469b36504e8237;hp=6e2a5ff4718016446d20bfa29ea9a7e10bd7bd1b;hpb=e7f08cbbc35f6e761579634e7154b5660ac427e5;p=project%2Fuci.git

diff --git a/cli.c b/cli.c
index 6e2a5ff..cd82938 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,
@@ -61,14 +63,17 @@ static void uci_usage(void)
 		"\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"
@@ -91,13 +96,35 @@ 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=%s\n",
-                      o->section->package->e.name,
-                      o->section->e.name,
-                      o->e.name,
-			o->value);
+	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)
@@ -142,27 +169,30 @@ static void uci_show_changes(struct uci_package *p)
 
 static int package_cmd(int cmd, char *tuple)
 {
-	struct uci_package *p = NULL;
+	struct uci_package *p;
+	struct uci_section *s;
 	struct uci_element *e = NULL;
-	char *package = NULL;
-	char *section = NULL;
-	char *option = NULL;
-	char **ptr = NULL;
-	int ret;
-
-	if (uci_parse_tuple(ctx, tuple, &package, &section, &option, ptr) != UCI_OK)
-		return 1;
-	if (section && !section[0])
-		return 1;
 
-	ret = uci_load(ctx, package, &p);
-
-	if (ret != UCI_OK) {
+	if (uci_lookup_ext(ctx, &e, tuple) != UCI_OK) {
 		cli_perror();
 		return 1;
 	}
-	if (!p)
+	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;
+	}
+
 	switch(cmd) {
 	case CMD_CHANGES:
 		uci_show_changes(p);
@@ -177,14 +207,10 @@ static int package_cmd(int cmd, char *tuple)
 		uci_export(ctx, stdout, p, true);
 		break;
 	case CMD_SHOW:
-		if (!section) {
-			uci_show_package(p);
-			return 0;
-		}
-		if (uci_lookup(ctx, &e, p, section, option) != UCI_OK)
-			return 1;
-
 		switch(e->type) {
+			case UCI_TYPE_PACKAGE:
+				uci_show_package(p);
+				break;
 			case UCI_TYPE_SECTION:
 				uci_show_section(uci_to_section(e));
 				break;
@@ -300,55 +326,66 @@ 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 *package = NULL;
+	struct uci_option *o = NULL;
 	char *section = NULL;
 	char *option = NULL;
 	char *value = NULL;
-	char **ptr = NULL;
 	int ret = UCI_OK;
 
 	if (argc != 2)
 		return 255;
 
-	switch(cmd) {
-	case CMD_SET:
-	case CMD_RENAME:
-		ptr = &value;
-		break;
-	default:
-		break;
+	value = strchr(argv[1], '=');
+	if (value) {
+		*value = 0;
+		value++;
+		if (!uci_validate_text(value))
+			return 1;
 	}
-	if (uci_parse_tuple(ctx, argv[1], &package, &section, &option, ptr) != UCI_OK)
-		return 1;
-	if (section && !section[0])
+
+	if (value && (cmd != CMD_SET) && (cmd != CMD_ADD_LIST) && (cmd != CMD_RENAME))
 		return 1;
 
-	if (uci_load(ctx, package, &p) != UCI_OK) {
+	if (uci_lookup_ext(ctx, &e, argv[1]) != UCI_OK) {
 		cli_perror();
 		return 1;
 	}
-	if (!p)
-		return 0;
+
+	switch(e->type) {
+	case UCI_TYPE_PACKAGE:
+		p = uci_to_package(e);
+		break;
+	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:
+		return 1;
+	}
+	if (s) {
+		section = s->e.name;
+		p = s->package;
+	}
 
 	switch(cmd) {
 	case CMD_GET:
-		if (uci_lookup(ctx, &e, p, section, option) != UCI_OK)
-			return 1;
-
 		switch(e->type) {
 		case UCI_TYPE_SECTION:
-			value = uci_to_section(e)->type;
+			printf("%s\n", s->type);
 			break;
 		case UCI_TYPE_OPTION:
-			value = uci_to_option(e)->value;
+			o = uci_to_option(e);
+			uci_show_value(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);
@@ -359,6 +396,9 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
 	case CMD_SET:
 		ret = uci_set(ctx, p, section, option, value, NULL);
 		break;
+	case CMD_ADD_LIST:
+		ret = uci_add_list(ctx, p, section, option, value, NULL);
+		break;
 	case CMD_DEL:
 		ret = uci_delete(ctx, p, section, option);
 		break;
@@ -475,10 +515,13 @@ 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
 		cmd = -1;
 
 	switch(cmd) {
+		case CMD_ADD_LIST:
 		case CMD_GET:
 		case CMD_SET:
 		case CMD_DEL:
@@ -515,11 +558,14 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	while((c = getopt(argc, argv, "c: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) {