X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=cli.c;h=1c31083871a6a1009c129079be7abd552cc28ddf;hp=e17acb5fe3c18d277a61b09426dd7533c00a38da;hb=71a0126dff93c4e7f81b9fe7d3629b4b706bd162;hpb=4aa3fd762e2190a4e418581cf24446484d0b7df5

diff --git a/cli.c b/cli.c
index e17acb5..1c31083 100644
--- a/cli.c
+++ b/cli.c
@@ -12,9 +12,17 @@
  */
 #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)
 {
@@ -25,6 +33,10 @@ static void uci_usage(int argc, char **argv)
 		"\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]
 	);
@@ -58,16 +70,17 @@ static int uci_show(int argc, char **argv)
 {
 	char *section = (argc > 2 ? argv[2] : NULL);
 	struct uci_package *package;
-	char **configs;
+	char **configs = NULL;
 	char **p;
 
-	configs = uci_list_configs(ctx);
-	if (!configs)
-		return 0;
+	if ((uci_list_configs(ctx, &configs) != UCI_OK) || !configs) {
+		uci_perror(ctx, appname);
+		return 1;
+	}
 
 	if (argc >= 2) {
 		if (uci_load(ctx, argv[1], &package) != UCI_OK) {
-			uci_perror(ctx, NULL);
+			uci_perror(ctx, appname);
 			return 1;
 		}
 		uci_show_package(package, section);
@@ -78,7 +91,7 @@ static int uci_show(int argc, char **argv)
 	for (p = configs; *p; p++) {
 		if ((argc < 2) || !strcmp(argv[1], *p)) {
 			if (uci_load(ctx, *p, &package) != UCI_OK) {
-				uci_perror(ctx, NULL);
+				uci_perror(ctx, appname);
 				return 1;
 			}
 			uci_show_package(package, section);
@@ -91,11 +104,13 @@ static int uci_show(int argc, char **argv)
 
 static int uci_do_export(int argc, char **argv)
 {
-	char **configs = uci_list_configs(ctx);
+	char **configs = NULL;
 	char **p;
 
-	if (!configs)
-		return 0;
+	if ((uci_list_configs(ctx, &configs) != UCI_OK) || !configs) {
+		uci_perror(ctx, appname);
+		return 1;
+	}
 
 	for (p = configs; *p; p++) {
 		if ((argc < 2) || !strcmp(argv[1], *p)) {
@@ -112,100 +127,159 @@ static int uci_do_export(int argc, char **argv)
 	return 0;
 }
 
-static int uci_do_get(int argc, char **argv)
+static int uci_do_commit(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;
-
-	if (uci_parse_tuple(ctx, argv[1], &package, &section, &option, NULL) != UCI_OK)
-		return 1;
+	char **configs = NULL;
+	char **p;
 
-	if (uci_load(ctx, package, &p) != UCI_OK) {
-		uci_perror(ctx, "uci");
+	if ((uci_list_configs(ctx, &configs) != UCI_OK) || !configs) {
+		uci_perror(ctx, appname);
 		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;
-	}
+	for (p = configs; *p; p++) {
+		if ((argc < 2) || !strcmp(argv[1], *p)) {
+			struct uci_package *package = NULL;
+			int ret;
 
-	/* throw the value to stdout */
-	printf("%s\n", value);
+			if (uci_load(ctx, *p, &package) != UCI_OK) {
+				uci_perror(ctx, appname);
+				continue;
+			}
+			if (uci_commit(ctx, &package) != UCI_OK)
+				uci_perror(ctx, appname);
 
+			uci_unload(ctx, package);
+		}
+	}
 	return 0;
 }
 
-static int uci_do_set(int argc, char **argv)
+
+static int uci_do_cmd(int cmd, int argc, char **argv)
 {
-	struct uci_package *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, &value) != UCI_OK)
+	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, "uci");
+		uci_perror(ctx, appname);
 		return 1;
 	}
 
-	if (uci_set(ctx, package, section, option, value) != UCI_OK) {
-		uci_perror(ctx, "uci");
-		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;
+
+	/* save changes, but don't commit them yet */
 	if (uci_save(ctx, p) != UCI_OK) {
-		uci_perror(ctx, "uci");
+		uci_perror(ctx, appname);
 		return 1;
 	}
+
 	return 0;
 }
 
 static int uci_cmd(int argc, char **argv)
 {
+	int cmd;
+
 	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], "commit"))
+		return uci_do_commit(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;
+		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;
+
 	if (argc < 2)
 		uci_usage(argc, argv);
 	ret = uci_cmd(argc - 1, argv + 1);
 	if (ret == 255)
 		uci_usage(argc, argv);
+
 	uci_free_context(ctx);
 
 	return ret;