X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=cli.c;h=1fa1cb1095d747672654973728d2bc22972eb250;hb=d2c85b2804aaa22e539e266b5ed4cf958d6ceb35;hp=b7ddd511676ed82fdfe9ce77c841bb6a8cc74ad0;hpb=171170de64e0faff8d0e93581d9971439f474cbd;p=project%2Fuci.git

diff --git a/cli.c b/cli.c
index b7ddd51..1fa1cb1 100644
--- a/cli.c
+++ b/cli.c
@@ -21,8 +21,10 @@ static void uci_usage(int argc, char **argv)
 	fprintf(stderr,
 		"Usage: %s [<options>] <command> [<arguments>]\n\n"
 		"Commands:\n"
-		"\tshow [<config>[.<section>[.<option>]]]\n"
-		"\texport [<config>]\n"
+		"\texport   [<config>]\n"
+		"\tshow     [<config>[.<section>[.<option>]]]\n"
+		"\tget      <config>.<section>[.<option>]\n"
+		"\tset      <config>.<section>[.<option>]=<value>\n"
 		"\n",
 		argv[0]
 	);
@@ -42,11 +44,20 @@ static void uci_show_section(struct uci_section *p)
 	}
 }
 
+static void uci_show_package(struct uci_package *p, char *section)
+{
+	struct uci_element *e;
+
+	uci_foreach_element( &p->sections, e) {
+		if (!section || !strcmp(e->name, section))
+			uci_show_section(uci_to_section(e));
+	}
+}
+
 static int uci_show(int argc, char **argv)
 {
 	char *section = (argc > 2 ? argv[2] : NULL);
 	struct uci_package *package;
-	struct uci_element *e;
 	char **configs;
 	char **p;
 
@@ -54,17 +65,24 @@ static int uci_show(int argc, char **argv)
 	if (!configs)
 		return 0;
 
+	if (argc >= 2) {
+		if (uci_load(ctx, argv[1], &package) != UCI_OK) {
+			uci_perror(ctx, NULL);
+			return 1;
+		}
+		uci_show_package(package, section);
+		uci_unload(ctx, package);
+		return 0;
+	}
+
 	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_perror(ctx, NULL);
+				return 1;
 			}
-			uci_unload(ctx, *p);
+			uci_show_package(package, section);
+			uci_unload(ctx, package);
 		}
 	}
 
@@ -87,19 +105,124 @@ static int uci_do_export(int argc, char **argv)
 			ret = uci_load(ctx, *p, &package);
 			if (ret)
 				continue;
-			uci_export(ctx, stdout, package);
-			uci_unload(ctx, *p);
+			uci_export(ctx, stdout, package, true);
+			uci_unload(ctx, package);
 		}
 	}
 	return 0;
 }
 
+static void parse_tuple(char *str, char **package, char **section, char **option, char **value)
+{
+	char *last = NULL;
+
+	*package = strtok(str, ".");
+	if (!*package)
+		goto done;
+
+	last = *package;
+	*section = strtok(NULL, ".");
+	if (!*section)
+		goto done;
+
+	last = *section;
+	*option = strtok(NULL, ".");
+	if (!*option)
+		goto done;
+
+	last = *option;
+done:
+	if (!value)
+		return;
+
+	last = strtok(last, "=");
+	if (!last)
+		return;
+
+	*value = last + strlen(last) + 1;
+}
+
+
+static int uci_do_get(int argc, char **argv)
+{
+	char *package = NULL;
+	char *section = NULL;
+	char *option = NULL;
+	struct uci_package *p = NULL;
+	struct uci_element *e = NULL;
+	char *value = NULL;
+
+	if (argc != 2)
+		return 255;
+
+	parse_tuple(argv[1], &package, &section, &option, NULL);
+	if (!package)
+		return 1;
+
+	if (uci_load(ctx, package, &p) != UCI_OK) {
+		uci_perror(ctx, "uci");
+		return 1;
+	}
+
+	if (uci_lookup(ctx, &e, p, section, option) != UCI_OK)
+		return 1;
+
+	switch(e->type) {
+	case UCI_TYPE_SECTION:
+		value = uci_to_section(e)->type;
+		break;
+	case UCI_TYPE_OPTION:
+		value = uci_to_option(e)->value;
+		break;
+	default:
+		/* should not happen */
+		return 1;
+	}
+
+	/* throw the value to stdout */
+	printf("%s\n", value);
+
+	return 0;
+}
+
+static int uci_do_set(int argc, char **argv)
+{
+	struct uci_package *p;
+	char *package = NULL;
+	char *section = NULL;
+	char *option = NULL;
+	char *value = NULL;
+
+	if (argc != 2)
+		return 255;
+
+	parse_tuple(argv[1], &package, &section, &option, &value);
+	if (!package)
+		return 1;
+
+	if (uci_load(ctx, package, &p) != UCI_OK) {
+		uci_perror(ctx, "uci");
+		return 1;
+	}
+
+	if (uci_set(ctx, package, section, option, value) != UCI_OK) {
+		uci_perror(ctx, "uci");
+		return 1;
+	}
+	uci_commit(ctx, p);
+	return 0;
+}
+
 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_do_export(argc, argv);
+	if (!strcasecmp(argv[0], "get"))
+		return uci_do_get(argc, argv);
+	if (!strcasecmp(argv[0], "set"))
+		return uci_do_set(argc, argv);
 	return 255;
 }