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

diff --git a/cli.c b/cli.c
index ab0f9b8..7139f0b 100644
--- a/cli.c
+++ b/cli.c
@@ -12,16 +12,27 @@
  */
 #include <strings.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include "uci.h"
 
+static const char *appname = "uci";
+
 static struct uci_context *ctx;
+enum {
+	CMD_GET,
+	CMD_SET,
+	CMD_DEL
+};
 
 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"
+		"\tshow     [<config>[.<section>[.<option>]]]\n"
+		"\tget      <config>.<section>[.<option>]\n"
+		"\tset      <config>.<section>[.<option>]=<value>\n"
 		"\n",
 		argv[0]
 	);
@@ -30,44 +41,146 @@ 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 void uci_show_package(struct uci_package *p, char *section)
 {
-	struct uci_config *cfg;
-	struct uci_section *p;
+	struct uci_element *e;
 
-	if (uci_load(ctx, name, &cfg) != UCI_OK) {
-		uci_perror(ctx, "uci_load");
-		return;
+	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;
+	char **configs;
+	char **p;
 
-	uci_list_empty(&cfg->sections);
-	uci_foreach_entry(section, &cfg->sections, p) {
-		uci_show_section(p);
+	configs = uci_list_configs(ctx);
+	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;
 	}
-	uci_unload(ctx, name);
+
+	for (p = configs; *p; p++) {
+		if ((argc < 2) || !strcmp(argv[1], *p)) {
+			if (uci_load(ctx, *p, &package) != UCI_OK) {
+				uci_perror(ctx, NULL);
+				return 1;
+			}
+			uci_show_package(package, section);
+			uci_unload(ctx, package);
+		}
+	}
+
+	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, true);
+			uci_unload(ctx, package);
+		}
+	}
+	return 0;
+}
+
+static int uci_do_cmd(int cmd, int argc, char **argv)
+{
+	char *package = NULL;
+	char *section = NULL;
+	char *option = NULL;
+	char *value = NULL;
+	struct uci_package *p = NULL;
+	struct uci_element *e = NULL;
+
+	if (argc != 2)
+		return 255;
+
+	if (uci_parse_tuple(ctx, argv[1], &package, &section, &option, (cmd == CMD_SET ? &value : NULL)) != UCI_OK)
+		return 1;
+
+	if (uci_load(ctx, package, &p) != UCI_OK) {
+		uci_perror(ctx, appname);
+		return 1;
+	}
+
+	if (uci_lookup(ctx, &e, p, section, option) != UCI_OK)
+		return 1;
+
+	switch(cmd) {
+	case CMD_GET:
+		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);
+		break;
+	case CMD_SET:
+		if (uci_set(ctx, p, section, option, value) != UCI_OK) {
+			uci_perror(ctx, appname);
+			return 1;
+		}
+		break;
+	case CMD_DEL:
+		if (uci_del(ctx, p, section, option) != UCI_OK) {
+			uci_perror(ctx, appname);
+			return 1;
+		}
+		break;
+	}
+
+	/* no save necessary for get */
+	if (cmd == CMD_GET)
+		return 0;
+
+	/* save changes, but don't commit them yet */
+	if (uci_save(ctx, p) != UCI_OK) {
+		uci_perror(ctx, appname);
+		return 1;
 	}
 
 	return 0;
@@ -75,20 +188,61 @@ static int uci_show(int argc, char **argv)
 
 static int uci_cmd(int argc, char **argv)
 {
+	int cmd;
+
 	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);
+
+	if (!strcasecmp(argv[0], "get"))
+		cmd = CMD_GET;
+	else if (!strcasecmp(argv[0], "set"))
+		cmd = CMD_SET;
+	else if (!strcasecmp(argv[0], "del"))
+		cmd = CMD_DEL;
+	else
+		return 255;
+	return uci_do_cmd(cmd, argc, argv);
 }
 
 int main(int argc, char **argv)
 {
 	int ret;
+	int c;
+
+	ctx = uci_alloc_context();
+	if (!ctx) {
+		fprintf(stderr, "Out of memory\n");
+		return 1;
+	}
+
+	while((c = getopt(argc, argv, "sS")) != -1) {
+		switch(c) {
+			case 's':
+				ctx->flags |= UCI_FLAG_STRICT;
+				break;
+			case 'S':
+				ctx->flags &= ~UCI_FLAG_STRICT;
+				ctx->flags |= UCI_FLAG_PERROR;
+				break;
+			default:
+				uci_usage(argc, argv);
+				break;
+		}
+	}
+	if (optind > 1)
+		argv[optind - 1] = argv[0];
+	argv += optind - 1;
+	argc -= optind - 1;
 
-	ctx = uci_alloc();
 	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;
 }