X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=cli.c;h=1fe7cc72758346b30516d237b9a987aae5ecbfbd;hp=4bc023445b2c1d59114aaaa4b8745e6e981019a3;hb=8a3154a1db5078cf211c3ea76171956ba076dd76;hpb=789aa0a4105c34212c2a4a1be7b0c6095691139c

diff --git a/cli.c b/cli.c
index 4bc0234..1fe7cc7 100644
--- a/cli.c
+++ b/cli.c
@@ -31,47 +31,12 @@ static void uci_usage(int argc, char **argv)
 	exit(255);
 }
 
-static char *uci_escape(char *str)
-{
-	char *s, *p, *t;
-	int pos = 0;
-
-	if (!buf)
-		buf = malloc(buflen);
-
-	s = str;
-	p = strchr(str, '\'');
-	if (!p)
-		return str;
-
-	do {
-		int len = p - s;
-		if (len > 0) {
-			if (p + 3 - str >= buflen) {
-				buflen *= 2;
-				buf = realloc(buf, buflen);
-				if (!buf) {
-					fprintf(stderr, "Out of memory\n");
-					exit(255);
-				}
-			}
-			memcpy(&buf[pos], s, len);
-			pos += len;
-		}
-		strcpy(&buf[pos], "'\\''");
-		pos += 3;
-		s = p + 1;
-	} while ((p = strchr(s, '\'')));
-
-	return buf;
-}
-
 static void uci_show_section(struct uci_section *p)
 {
 	struct uci_option *o;
 	const char *cname, *sname;
 
-	cname = p->config->name;
+	cname = p->package->name;
 	sname = p->name;
 	printf("%s.%s=%s\n", cname, sname, p->type);
 	uci_foreach_entry(option, &p->options, o) {
@@ -79,54 +44,36 @@ static void uci_show_section(struct uci_section *p)
 	}
 }
 
-static void uci_export_section(struct uci_section *p)
-{
-	struct uci_option *o;
-	const char *name;
-
-	printf("\nconfig '%s'", uci_escape(p->type));
-	printf(" '%s'\n", uci_escape(p->name));
-	uci_foreach_entry(option, &p->options, o) {
-		printf("\toption '%s'", uci_escape(o->name));
-		printf(" '%s'\n", uci_escape(o->value));
-	}
-}
-
-static void foreach_section(const char *configname, const char *section, void (*callback)(struct uci_section *))
-{
-	struct uci_config *cfg;
-	struct uci_section *p;
-
-	if (uci_load(ctx, configname, &cfg) != UCI_OK) {
-		uci_perror(ctx, "uci_load");
-		return;
-	}
-
-	uci_list_empty(&cfg->sections);
-	uci_foreach_entry(section, &cfg->sections, p) {
-		if (!section || !strcmp(p->name, section))
-			callback(p);
-	}
-	uci_unload(ctx, configname);
-}
-
 static int uci_show(int argc, char **argv)
 {
-	char **configs = uci_list_configs();
+	char *section = (argc > 2 ? argv[2] : NULL);
+	struct uci_package *package;
+	struct uci_section *s;
+	char **configs;
 	char **p;
 
+	configs = uci_list_configs();
 	if (!configs)
 		return 0;
 
 	for (p = configs; *p; p++) {
-		if ((argc < 2) || !strcmp(argv[1], *p))
-			foreach_section(*p, (argc > 2 ? argv[2] : NULL), uci_show_section);
+		if ((argc < 2) || !strcmp(argv[1], *p)) {
+			if (uci_load(ctx, *p, &package) != UCI_OK) {
+				uci_perror(ctx, "uci_load");
+				return 255;
+			}
+			uci_foreach_entry(section, &package->sections, s) {
+				if (!section || !strcmp(s->name, section))
+					uci_show_section(s);
+			}
+			uci_unload(ctx, *p);
+		}
 	}
 
 	return 0;
 }
 
-static int uci_export(int argc, char **argv)
+static int uci_do_export(int argc, char **argv)
 {
 	char **configs = uci_list_configs();
 	char **p;
@@ -136,9 +83,14 @@ static int uci_export(int argc, char **argv)
 
 	for (p = configs; *p; p++) {
 		if ((argc < 2) || !strcmp(argv[1], *p)) {
-			printf("package '%s'\n", uci_escape(*p));
-			foreach_section(*p, NULL, uci_export_section);
-			printf("\n");
+			struct uci_package *package = NULL;
+			int ret;
+
+			ret = uci_load(ctx, *p, &package);
+			if (ret)
+				continue;
+			uci_export(ctx, stdout, package);
+			uci_unload(ctx, *p);
 		}
 	}
 	return 0;
@@ -149,7 +101,7 @@ static int uci_cmd(int argc, char **argv)
 	if (!strcasecmp(argv[0], "show"))
 		return uci_show(argc, argv);
 	if (!strcasecmp(argv[0], "export"))
-		return uci_export(argc, argv);
+		return uci_do_export(argc, argv);
 	return 255;
 }