X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=cli.c;h=f8b45dba091f088f84e22dc98503fe9e6e1fd7e3;hp=f5dfce05187c9a506f91367cab740ab9522946e3;hb=49ec6efbdac4819033d34f08927d795f83a3932d;hpb=ec8cbbbe0f20e67cbd3bd471b9ac55ceacaef7b8

diff --git a/cli.c b/cli.c
index f5dfce0..f8b45db 100644
--- a/cli.c
+++ b/cli.c
@@ -14,6 +14,8 @@
 #include <strings.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdarg.h>
+#include <errno.h>
 #include <unistd.h>
 #include "uci.h"
 
@@ -27,7 +29,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;
@@ -86,9 +87,10 @@ static char *
 uci_lookup_section_ref(struct uci_section *s)
 {
 	struct uci_type_list *ti = type_list;
+	char *ret;
 	int maxlen;
 
-	if (!s->anonymous || !(flags & CLI_FLAG_SHOW_EXT))
+	if (!(flags & CLI_FLAG_SHOW_EXT))
 		return s->e.name;
 
 	/* look up in section type list */
@@ -107,19 +109,25 @@ uci_lookup_section_ref(struct uci_section *s)
 		ti->name = s->type;
 	}
 
-	maxlen = strlen(s->type) + 1 + 2 + 10;
-	if (!typestr) {
-		typestr = malloc(maxlen);
+	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 {
-		typestr = realloc(typestr, maxlen);
+		ret = s->e.name;
 	}
 
-	if (typestr)
-		sprintf(typestr, "@%s[%d]", ti->name, ti->idx);
-
 	ti->idx++;
 
-	return typestr;
+	return ret;
 }
 
 static void uci_usage(void)
@@ -138,7 +146,7 @@ static void uci_usage(void)
 		"\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"
@@ -147,7 +155,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"
@@ -170,18 +177,53 @@ static void cli_perror(void)
 	uci_perror(ctx, appname);
 }
 
-static void uci_show_value(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)
+{
+	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");
@@ -192,13 +234,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)
@@ -211,7 +253,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);
 	}
 }
 
@@ -253,8 +295,10 @@ static void uci_show_changes(struct uci_package *p)
 		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");
 	}
 }
@@ -263,7 +307,7 @@ static int package_cmd(int cmd, char *tuple)
 {
 	struct uci_element *e = NULL;
 	struct uci_ptr ptr;
-	int ret = 0;
+	int ret = 1;
 
 	if (uci_lookup_ptr(ctx, &ptr, tuple, true) != UCI_OK) {
 		cli_perror();
@@ -276,21 +320,25 @@ static int package_cmd(int cmd, char *tuple)
 		uci_show_changes(ptr.p);
 		break;
 	case CMD_COMMIT:
-		if (flags & CLI_FLAG_NOCOMMIT)
-			return 0;
+		if (flags & CLI_FLAG_NOCOMMIT) {
+			ret = 0;
+			goto out;
+		}
 		if (uci_commit(ctx, &ptr.p, false) != UCI_OK) {
 			cli_perror();
-			ret = 1;
+			goto out;
 		}
 		break;
 	case CMD_EXPORT:
-		uci_export(ctx, stdout, ptr.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();
-			ret = 1;
+			goto out;
 		}
 		switch(e->type) {
 			case UCI_TYPE_PACKAGE:
@@ -300,15 +348,18 @@ 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 */
-				return 1;
+				goto out;
 		}
 		break;
 	}
 
+	ret = 0;
+
+out:
 	if (ptr.p)
 		uci_unload(ctx, ptr.p);
 	return ret;
@@ -362,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;
@@ -371,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)
@@ -414,6 +469,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;
@@ -423,7 +479,7 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
 		return 1;
 	}
 
-	if (ptr.value && (cmd != CMD_SET) &&
+	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;
@@ -441,7 +497,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;
@@ -472,6 +528,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;
 	}
@@ -501,7 +559,7 @@ static int uci_batch_cmd(void)
 
 	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;
@@ -514,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;
 		}
 	}
@@ -528,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;
@@ -547,7 +604,7 @@ 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) {
@@ -637,7 +694,7 @@ int main(int argc, char **argv)
 	input = stdin;
 	ctx = uci_alloc_context();
 	if (!ctx) {
-		fprintf(stderr, "Out of memory\n");
+		cli_error("Out of memory\n");
 		return 1;
 	}
 
@@ -651,19 +708,17 @@ int main(int argc, char **argv)
 				break;
 			case 'f':
 				if (input != stdin) {
-					perror("uci");
+					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;
-			case 'L':
-				flags |= CLI_FLAG_NOPLUGINS;
-				break;
 			case 'm':
 				flags |= CLI_FLAG_MERGE;
 				break;
@@ -709,9 +764,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);