X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=cli.c;h=93517bf392b26a54b25f3f814eefa15ed7140278;hb=09a2be57d769a9b0f80e5aff75ec8bc6acae8e9a;hp=1fa1cb1095d747672654973728d2bc22972eb250;hpb=4c95913eae05b8a0b1c8e8e6ff219b9d710d564a;p=project%2Fuci.git

diff --git a/cli.c b/cli.c
index 1fa1cb1..93517bf 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]
 	);
@@ -112,130 +124,128 @@ static int uci_do_export(int argc, char **argv)
 	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)
+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;
-	char *value = NULL;
 
 	if (argc != 2)
 		return 255;
 
-	parse_tuple(argv[1], &package, &section, &option, NULL);
-	if (!package)
+	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_lookup(ctx, &e, p, section, option) != UCI_OK)
 		return 1;
 
-	switch(e->type) {
-	case UCI_TYPE_SECTION:
-		value = uci_to_section(e)->type;
+	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 UCI_TYPE_OPTION:
-		value = uci_to_option(e)->value;
+	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;
-	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;
+	/* no save necessary for get */
+	if (cmd == CMD_GET)
+		return 0;
 
-	if (uci_load(ctx, package, &p) != UCI_OK) {
-		uci_perror(ctx, "uci");
+	/* save changes, but don't commit them yet */
+	if (uci_save(ctx, p) != UCI_OK) {
+		uci_perror(ctx, appname);
 		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)
 {
+	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], "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;