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

diff --git a/cli.c b/cli.c
index 1fe7cc7..b7ddd51 100644
--- a/cli.c
+++ b/cli.c
@@ -15,8 +15,6 @@
 #include "uci.h"
 
 static struct uci_context *ctx;
-static char *buf = NULL;
-static int buflen = 256;
 
 static void uci_usage(int argc, char **argv)
 {
@@ -33,14 +31,14 @@ 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->package->name;
-	sname = p->name;
+	cname = p->package->e.name;
+	sname = p->e.name;
 	printf("%s.%s=%s\n", cname, sname, p->type);
-	uci_foreach_entry(option, &p->options, o) {
-		printf("%s.%s.%s=%s\n", cname, sname, o->name, o->value);
+	uci_foreach_element(&p->options, e) {
+		printf("%s.%s.%s=%s\n", cname, sname, e->name, uci_to_option(e)->value);
 	}
 }
 
@@ -48,11 +46,11 @@ static int uci_show(int argc, char **argv)
 {
 	char *section = (argc > 2 ? argv[2] : NULL);
 	struct uci_package *package;
-	struct uci_section *s;
+	struct uci_element *e;
 	char **configs;
 	char **p;
 
-	configs = uci_list_configs();
+	configs = uci_list_configs(ctx);
 	if (!configs)
 		return 0;
 
@@ -62,9 +60,9 @@ static int uci_show(int argc, char **argv)
 				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_foreach_element( &package->sections, e) {
+				if (!section || !strcmp(e->name, section))
+					uci_show_section(uci_to_section(e));
 			}
 			uci_unload(ctx, *p);
 		}
@@ -75,7 +73,7 @@ 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)
@@ -109,13 +107,13 @@ 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);
 	if (ret == 255)
 		uci_usage(argc, argv);
-	uci_free(ctx);
+	uci_free_context(ctx);
 
 	return ret;
 }