From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 3 Feb 2008 01:32:45 +0000 (+0100)
Subject: add quiet mode flag for cli
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=commitdiff_plain;h=28caa37a5d52cdf2a99201c32a9ccba59661a1af

add quiet mode flag for cli
---

diff --git a/cli.c b/cli.c
index 7870728..e14757e 100644
--- a/cli.c
+++ b/cli.c
@@ -18,6 +18,7 @@
 static const char *appname = "uci";
 static enum {
 	CLI_FLAG_MERGE = (1 << 0),
+	CLI_FLAG_QUIET = (1 << 1)
 } flags;
 static FILE *input;
 
@@ -50,16 +51,25 @@ static void uci_usage(int argc, char **argv)
 		"Options:\n"
 		"\t-f <file>  use <file> as input instead of stdin\n"
 		"\t-m         when importing, merge data into an existing package\n"
-		"\t-s         force strict mode (stop on parser errors, default)\n"
-		"\t-S         disable strict mode\n"
 		"\t-n         name unnamed sections on export (default)\n"
 		"\t-N         don't name unnamed sections\n"
+		"\t-q         quiet mode (don't print error messages)\n"
+		"\t-s         force strict mode (stop on parser errors, default)\n"
+		"\t-S         disable strict mode\n"
 		"\n",
 		argv[0]
 	);
 	exit(255);
 }
 
+static void cli_perror(void)
+{
+	if (flags & CLI_FLAG_QUIET)
+		return;
+
+	uci_perror(ctx, appname);
+}
+
 static void uci_show_section(struct uci_section *p)
 {
 	struct uci_element *e;
@@ -88,13 +98,13 @@ static int package_cmd(int cmd, char *package)
 	struct uci_package *p = NULL;
 
 	if (uci_load(ctx, package, &p) != UCI_OK) {
-		uci_perror(ctx, appname);
+		cli_perror();
 		return 1;
 	}
 	switch(cmd) {
 	case CMD_COMMIT:
 		if (uci_commit(ctx, &p, false) != UCI_OK)
-			uci_perror(ctx, appname);
+			cli_perror();
 		break;
 	case CMD_EXPORT:
 		uci_export(ctx, stdout, p, true);
@@ -142,7 +152,7 @@ static int uci_do_import(int argc, char **argv)
 	}
 
 	if (ret != UCI_OK) {
-		uci_perror(ctx, appname);
+		cli_perror();
 		return 1;
 	}
 
@@ -161,7 +171,7 @@ static int uci_do_package_cmd(int cmd, int argc, char **argv)
 		return package_cmd(cmd, argv[1]);
 
 	if ((uci_list_configs(ctx, &configs) != UCI_OK) || !configs) {
-		uci_perror(ctx, appname);
+		cli_perror();
 		return 1;
 	}
 
@@ -199,7 +209,7 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
 		return 1;
 
 	if (uci_load(ctx, package, &p) != UCI_OK) {
-		uci_perror(ctx, appname);
+		cli_perror();
 		return 1;
 	}
 
@@ -242,7 +252,7 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
 		ret = uci_save(ctx, p);
 
 	if (ret != UCI_OK) {
-		uci_perror(ctx, appname);
+		cli_perror();
 		return 1;
 	}
 
@@ -302,7 +312,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	while((c = getopt(argc, argv, "mf:sSnN")) != -1) {
+	while((c = getopt(argc, argv, "mf:sSnNq")) != -1) {
 		switch(c) {
 			case 'f':
 				input = fopen(optarg, "r");
@@ -327,6 +337,9 @@ int main(int argc, char **argv)
 			case 'N':
 				ctx->flags &= ~UCI_FLAG_EXPORT_NAME;
 				break;
+			case 'q':
+				flags |= CLI_FLAG_QUIET;
+				break;
 			default:
 				uci_usage(argc, argv);
 				break;