X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=cli.c;h=cdd1838e1b2a17f15ed9a480c403661b32e3e65c;hb=4094cedb83a0b92a179af13d1781a8fd7d3d943e;hp=40b5d9115193519e5361f88a0002465f346924f1;hpb=81e4f335d5c725e40614c26f9ef4778fa1a4aecf;p=project%2Fuci.git

diff --git a/cli.c b/cli.c
index 40b5d91..cdd1838 100644
--- a/cli.c
+++ b/cli.c
@@ -12,153 +12,248 @@
  */
 #include <strings.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include "uci.h"
 
+static const char *appname = "uci";
+
 static struct uci_context *ctx;
-static char *buf = NULL;
-static int buflen = 256;
+enum {
+	/* section cmds */
+	CMD_GET = 1,
+	CMD_SET = 2,
+	CMD_DEL = 3,
+	/* package cmds */
+	CMD_SHOW = 4,
+	CMD_EXPORT = 5,
+	CMD_COMMIT = 6,
+};
 
 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"
+		"Options:\n"
+		"\t-s       force strict mode (stop on parser errors)\n"
+		"\t-S       disable strict mode\n"
 		"\n",
 		argv[0]
 	);
 	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;
+	struct uci_element *e;
 	const char *cname, *sname;
 
-	cname = p->config->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);
 	}
 }
 
-static void uci_export_section(struct uci_section *p)
+static void uci_show_package(struct uci_package *p)
 {
-	struct uci_option *o;
-	const char *name;
-
-	printf("config '%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));
+	struct uci_element *e;
+
+	uci_foreach_element( &p->sections, e) {
+		uci_show_section(uci_to_section(e));
 	}
 }
 
-static void foreach_section(const char *name, void (*callback)(struct uci_section *))
+
+static int package_cmd(int cmd, char *package)
 {
-	struct uci_config *cfg;
-	struct uci_section *p;
+	struct uci_package *p = NULL;
 
-	if (uci_load(ctx, name, &cfg) != UCI_OK) {
-		uci_perror(ctx, "uci_load");
-		return;
+	if (uci_load(ctx, package, &p) != UCI_OK) {
+		uci_perror(ctx, appname);
+		return 1;
 	}
-
-	uci_list_empty(&cfg->sections);
-	uci_foreach_entry(section, &cfg->sections, p) {
-		callback(p);
+	switch(cmd) {
+	case CMD_COMMIT:
+		if (uci_commit(ctx, &p) != UCI_OK)
+			uci_perror(ctx, appname);
+		break;
+	case CMD_EXPORT:
+		uci_export(ctx, stdout, p, true);
+		break;
+	case CMD_SHOW:
+		uci_show_package(p);
+		break;
 	}
-	uci_unload(ctx, name);
+
+	uci_unload(ctx, p);
+	return 0;
 }
 
-static int uci_show(int argc, char **argv)
+static int uci_do_package_cmd(int cmd, int argc, char **argv)
 {
-	char **configs = uci_list_configs();
+	char **configs = NULL;
 	char **p;
 
-	if (!configs)
-		return 0;
+	if (argc > 2)
+		return 255;
+
+	if (argc == 2)
+		return package_cmd(cmd, argv[1]);
+
+	if ((uci_list_configs(ctx, &configs) != UCI_OK) || !configs) {
+		uci_perror(ctx, appname);
+		return 1;
+	}
 
 	for (p = configs; *p; p++) {
-		fprintf(stderr, "# config: %s\n", *p);
-		foreach_section(*p, uci_show_section);
+		package_cmd(cmd, *p);
 	}
 
 	return 0;
 }
 
-static int uci_export(int argc, char **argv)
+
+static int uci_do_section_cmd(int cmd, int argc, char **argv)
 {
-	char **configs = uci_list_configs();
-	char **p;
+	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 (!configs)
+	if (uci_load(ctx, package, &p) != UCI_OK) {
+		uci_perror(ctx, appname);
+		return 1;
+	}
+
+	switch(cmd) {
+	case CMD_GET:
+		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);
+		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;
 
-	for (p = configs; *p; p++) {
-		foreach_section(*p, uci_export_section);
+	/* save changes, but don't commit them yet */
+	if (uci_save(ctx, p) != UCI_OK) {
+		uci_perror(ctx, appname);
+		return 1;
 	}
+
 	return 0;
 }
 
 static int uci_cmd(int argc, char **argv)
 {
+	int cmd = 0;
+
 	if (!strcasecmp(argv[0], "show"))
-		return uci_show(argc, argv);
-	if (!strcasecmp(argv[0], "export"))
-		return uci_export(argc, argv);
-	return 255;
+		cmd = CMD_SHOW;
+	else if (!strcasecmp(argv[0], "export"))
+		cmd = CMD_EXPORT;
+	else if (!strcasecmp(argv[0], "commit"))
+		cmd = CMD_COMMIT;
+	else 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;
+
+	switch(cmd) {
+		case CMD_GET:
+		case CMD_SET:
+		case CMD_DEL:
+			return uci_do_section_cmd(cmd, argc, argv);
+		case CMD_SHOW:
+		case CMD_EXPORT:
+		case CMD_COMMIT:
+			return uci_do_package_cmd(cmd, argc, argv);
+		default:
+			return 255;
+	}
 }
 
 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);
 	if (ret == 255)
 		uci_usage(argc, argv);
-	uci_free(ctx);
+
+	uci_free_context(ctx);
 
 	return ret;
 }