From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 2 May 2013 14:06:10 +0000 (+0000)
Subject: scripts/config: fix an option processing error that caused duplication in diffconfig... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f935d800bf5c6ecebc3d4519041661d60484ded9;p=openwrt%2Fstaging%2Fyousong.git

scripts/config: fix an option processing error that caused duplication in diffconfig.sh output (#13384)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 36522
---

diff --git a/scripts/config/conf.c b/scripts/config/conf.c
index 1f94816cf2..b769654a89 100644
--- a/scripts/config/conf.c
+++ b/scripts/config/conf.c
@@ -502,7 +502,6 @@ int main(int ac, char **av)
 	tty_stdio = isatty(0) && isatty(1) && isatty(2);
 
 	while ((opt = getopt_long(ac, av, "r:w:", long_opts, NULL)) != -1) {
-		input_mode = (enum input_mode)opt;
 		switch (opt) {
 		case silentoldconfig:
 			sync_kconfig = 1;
@@ -537,15 +536,16 @@ int main(int ac, char **av)
 			break;
 		case 'r':
 			input_file = optarg;
-			break;
+			continue;
 		case 'w':
 			output_file = optarg;
-			break;
+			continue;
 		case '?':
 			conf_usage(progname);
 			exit(1);
 			break;
 		}
+		input_mode = (enum input_mode)opt;
 	}
 	if (ac == optind) {
 		printf(_("%s: Kconfig file missing\n"), av[0]);