Browse Source

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

Signed-off-by: Felix Fietkau <[email protected]>

SVN-Revision: 36522
Felix Fietkau 12 years ago
parent
commit
f935d800bf
1 changed files with 3 additions and 3 deletions
  1. 3 3
      scripts/config/conf.c

+ 3 - 3
scripts/config/conf.c

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