X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=cli.c;h=b7ddd511676ed82fdfe9ce77c841bb6a8cc74ad0;hp=ab0f9b8890251ece59cdc41c7899fd1f2612ec38;hb=c9125084e1e28b8f1907b2ca5c5f9d69a538425f;hpb=bc7b118f0a40709c985b54c96d826e9057c9f0dd

diff --git a/cli.c b/cli.c
index ab0f9b8..b7ddd51 100644
--- a/cli.c
+++ b/cli.c
@@ -19,9 +19,10 @@ static struct uci_context *ctx;
 static void uci_usage(int argc, char **argv)
 {
 	fprintf(stderr,
-		"Usage: %s [options] <command> [arguments]\n\n"
+		"Usage: %s [<options>] <command> [<arguments>]\n\n"
 		"Commands:\n"
 		"\tshow [<config>[.<section>[.<option>]]]\n"
+		"\texport [<config>]\n"
 		"\n",
 		argv[0]
 	);
@@ -30,65 +31,89 @@ static void uci_usage(int argc, char **argv)
 
 static void uci_show_section(struct uci_section *p)
 {
-	struct uci_option *o;
+	struct uci_element *e;
 	const char *cname, *sname;
 
-	cname = p->config->name;
-	sname = p->name;
-	uci_foreach_entry(option, &p->options, o) {
-		printf("%s.%s.%s=%s\n", cname, sname, o->name, o->value);
+	cname = p->package->e.name;
+	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);
 	}
 }
 
-static void uci_show_file(const char *name)
+static int uci_show(int argc, char **argv)
 {
-	struct uci_config *cfg;
-	struct uci_section *p;
+	char *section = (argc > 2 ? argv[2] : NULL);
+	struct uci_package *package;
+	struct uci_element *e;
+	char **configs;
+	char **p;
 
-	if (uci_load(ctx, name, &cfg) != UCI_OK) {
-		uci_perror(ctx, "uci_load");
-		return;
-	}
+	configs = uci_list_configs(ctx);
+	if (!configs)
+		return 0;
 
-	uci_list_empty(&cfg->sections);
-	uci_foreach_entry(section, &cfg->sections, p) {
-		uci_show_section(p);
+	for (p = configs; *p; p++) {
+		if ((argc < 2) || !strcmp(argv[1], *p)) {
+			if (uci_load(ctx, *p, &package) != UCI_OK) {
+				uci_perror(ctx, "uci_load");
+				return 255;
+			}
+			uci_foreach_element( &package->sections, e) {
+				if (!section || !strcmp(e->name, section))
+					uci_show_section(uci_to_section(e));
+			}
+			uci_unload(ctx, *p);
+		}
 	}
-	uci_unload(ctx, name);
+
+	return 0;
 }
 
-static int uci_show(int argc, char **argv)
+static int uci_do_export(int argc, char **argv)
 {
-	char **configs = uci_list_configs();
+	char **configs = uci_list_configs(ctx);
 	char **p;
 
 	if (!configs)
 		return 0;
 
 	for (p = configs; *p; p++) {
-		fprintf(stderr, "# config: %s\n", *p);
-		uci_show_file(*p);
-	}
+		if ((argc < 2) || !strcmp(argv[1], *p)) {
+			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;
 }
 
 static int uci_cmd(int argc, char **argv)
 {
 	if (!strcasecmp(argv[0], "show"))
-		uci_show(argc, argv);
-	return 0;
+		return uci_show(argc, argv);
+	if (!strcasecmp(argv[0], "export"))
+		return uci_do_export(argc, argv);
+	return 255;
 }
 
 int main(int argc, char **argv)
 {
 	int ret;
 
-	ctx = uci_alloc();
+	ctx = uci_alloc_context();
 	if (argc < 2)
 		uci_usage(argc, argv);
 	ret = uci_cmd(argc - 1, argv + 1);
-	uci_free(ctx);
+	if (ret == 255)
+		uci_usage(argc, argv);
+	uci_free_context(ctx);
 
 	return ret;
 }