X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=cli.c;h=2ee1e36f6b69b03c6dbe6377fc12a94088b0a78f;hp=b660273f96b397023e5f62ce3e45e329adeb1a0d;hb=37930de695fbf183cd9eef8b33e428921efa7cc8;hpb=14bdf8689990afdb5fd8caaf448e9c7d2c0d9c99

diff --git a/cli.c b/cli.c
index b660273..2ee1e36 100644
--- a/cli.c
+++ b/cli.c
@@ -27,7 +27,6 @@ static enum {
 	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;
@@ -38,6 +37,7 @@ enum {
 	CMD_GET,
 	CMD_SET,
 	CMD_ADD_LIST,
+	CMD_DEL_LIST,
 	CMD_DEL,
 	CMD_RENAME,
 	CMD_REVERT,
@@ -98,6 +98,8 @@ uci_lookup_section_ref(struct uci_section *s)
 	}
 	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;
@@ -110,8 +112,12 @@ uci_lookup_section_ref(struct uci_section *s)
 	} else {
 		typestr = realloc(typestr, maxlen);
 	}
-	sprintf(typestr, "@%s[%d]", ti->name, ti->idx);
+
+	if (typestr)
+		sprintf(typestr, "@%s[%d]", ti->name, ti->idx);
+
 	ti->idx++;
+
 	return typestr;
 }
 
@@ -127,10 +133,11 @@ static void uci_usage(void)
 		"\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>]]\n"
+		"\tdelete     <config>[.<section>[[.<option>][=<id>]]]\n"
 		"\trename     <config>.<section>[.<option>]=<name>\n"
 		"\trevert     <config>[.<section>[.<option>]]\n"
 		"\treorder    <config>.<section>=<position>\n"
@@ -139,7 +146,6 @@ static void uci_usage(void)
 		"\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"
@@ -162,18 +168,41 @@ static void cli_perror(void)
 	uci_perror(ctx, appname);
 }
 
-static void uci_show_value(struct uci_option *o)
+static void uci_print_value(FILE *f, const char *v)
+{
+	fprintf(f, "'");
+	while (*v) {
+		if (*v != '\'')
+			fputc(*v, f);
+		else
+			fprintf(f, "'\\''");
+		v++;
+	}
+	fprintf(f, "'");
+}
+
+static void uci_show_value(struct uci_option *o, bool quote)
 {
 	struct uci_element *e;
 	bool sep = false;
+	char *space;
 
 	switch(o->type) {
 	case UCI_TYPE_STRING:
-		printf("%s\n", o->v.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%s", (sep ? delimiter : ""), e->name);
+			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");
@@ -184,13 +213,13 @@ static void uci_show_value(struct uci_option *o)
 	}
 }
 
-static void uci_show_option(struct uci_option *o)
+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);
+	uci_show_value(o, quote);
 }
 
 static void uci_show_section(struct uci_section *s)
@@ -203,7 +232,7 @@ static void uci_show_section(struct uci_section *s)
 	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));
+		uci_show_option(uci_to_option(e), true);
 	}
 }
 
@@ -236,14 +265,19 @@ static void uci_show_changes(struct uci_package *p)
 		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%s", op, h->value);
+		if (h->cmd != UCI_CMD_REMOVE) {
+			printf("%s", op);
+			uci_print_value(stdout, h->value);
+		}
 		printf("\n");
 	}
 }
@@ -252,6 +286,7 @@ static int package_cmd(int cmd, char *tuple)
 {
 	struct uci_element *e = NULL;
 	struct uci_ptr ptr;
+	int ret = 0;
 
 	if (uci_lookup_ptr(ctx, &ptr, tuple, true) != UCI_OK) {
 		cli_perror();
@@ -266,8 +301,10 @@ static int package_cmd(int cmd, char *tuple)
 	case CMD_COMMIT:
 		if (flags & CLI_FLAG_NOCOMMIT)
 			return 0;
-		if (uci_commit(ctx, &ptr.p, false) != UCI_OK)
+		if (uci_commit(ctx, &ptr.p, false) != UCI_OK) {
 			cli_perror();
+			ret = 1;
+		}
 		break;
 	case CMD_EXPORT:
 		uci_export(ctx, stdout, ptr.p, true);
@@ -276,7 +313,7 @@ static int package_cmd(int cmd, char *tuple)
 		if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
 			ctx->err = UCI_ERR_NOTFOUND;
 			cli_perror();
-			return 1;
+			ret = 1;
 		}
 		switch(e->type) {
 			case UCI_TYPE_PACKAGE:
@@ -286,7 +323,7 @@ static int package_cmd(int cmd, char *tuple)
 				uci_show_section(ptr.s);
 				break;
 			case UCI_TYPE_OPTION:
-				uci_show_option(ptr.o);
+				uci_show_option(ptr.o, true);
 				break;
 			default:
 				/* should not happen */
@@ -295,8 +332,9 @@ static int package_cmd(int cmd, char *tuple)
 		break;
 	}
 
-	uci_unload(ctx, ptr.p);
-	return 0;
+	if (ptr.p)
+		uci_unload(ctx, ptr.p);
+	return ret;
 }
 
 static int uci_do_import(int argc, char **argv)
@@ -347,6 +385,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;
@@ -356,14 +395,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)
@@ -399,6 +441,7 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
 	struct uci_element *e;
 	struct uci_ptr ptr;
 	int ret = UCI_OK;
+	int dummy;
 
 	if (argc != 2)
 		return 255;
@@ -408,7 +451,9 @@ 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) && (cmd != CMD_REORDER))
+	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;
 
 	e = ptr.last;
@@ -424,7 +469,7 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
 			printf("%s\n", ptr.s->type);
 			break;
 		case UCI_TYPE_OPTION:
-			uci_show_value(ptr.o);
+			uci_show_value(ptr.o, false);
 			break;
 		default:
 			break;
@@ -443,8 +488,11 @@ 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_DEL_LIST:
+		ret = uci_del_list(ctx, &ptr);
+		break;
 	case CMD_REORDER:
-		if (!ptr.s) {
+		if (!ptr.s || !ptr.value) {
 			ctx->err = UCI_ERR_NOTFOUND;
 			cli_perror();
 			return 1;
@@ -452,6 +500,8 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
 		ret = uci_reorder_section(ctx, ptr.s, strtoul(ptr.value, NULL, 10));
 		break;
 	case CMD_DEL:
+		if (ptr.value && !sscanf(ptr.value, "%d", &dummy))
+			return 1;
 		ret = uci_delete(ctx, &ptr);
 		break;
 	}
@@ -508,8 +558,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;
@@ -575,11 +624,14 @@ static int uci_cmd(int argc, char **argv)
 		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:
@@ -627,15 +679,17 @@ int main(int argc, char **argv)
 				delimiter = optarg;
 				break;
 			case 'f':
+				if (input != stdin) {
+					perror("uci");
+					return 1;
+				}
+
 				input = fopen(optarg, "r");
 				if (!input) {
 					perror("uci");
 					return 1;
 				}
 				break;
-			case 'L':
-				flags |= CLI_FLAG_NOPLUGINS;
-				break;
 			case 'm':
 				flags |= CLI_FLAG_MERGE;
 				break;
@@ -681,9 +735,6 @@ int main(int argc, char **argv)
 		return 0;
 	}
 
-	if (!(flags & CLI_FLAG_NOPLUGINS))
-		uci_load_plugins(ctx, NULL);
-
 	ret = uci_cmd(argc - 1, argv + 1);
 	if (input != stdin)
 		fclose(input);