From 06d54e73fd0c3f59f892c2ba2605f0e8dcb8995f Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Thu, 8 Feb 2018 14:56:39 +0900 Subject: [PATCH] kconfig: remove check_stdin() Except silentoldconfig, valid_stdin is 1, so check_stdin() is no-op. oldconfig and silentoldconfig work almost in the same way except that the latter generates additional files under include/. Both ask users for input for new symbols. I do not know why only silentoldconfig requires stdio be tty. $ rm -f .config; touch .config $ yes "" | make oldconfig > stdout $ rm -f .config; touch .config $ yes "" | make silentoldconfig > stdout make[1]: *** [silentoldconfig] Error 1 make: *** [silentoldconfig] Error 2 $ tail -n 4 stdout Console input/output is redirected. Run 'make oldconfig' to update configuration. config/Makefile:40: recipe for target 'silentoldconfig' failed Makefile:507: recipe for target 'silentoldconfig' failed Redirection is useful, for example, for testing where we want to give particular key inputs from a test file, then check the result. Signed-off-by: Masahiro Yamada Reviewed-by: Ulf Magnusson Signed-off-by: Christian Lamparter --- config/conf.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/config/conf.c b/config/conf.c index 51a781a..ba41635 100644 --- a/config/conf.c +++ b/config/conf.c @@ -38,7 +38,6 @@ static enum input_mode input_mode = oldaskconfig; static int indent = 1; static int tty_stdio; -static int valid_stdin = 1; static int conf_cnt; static char line[PATH_MAX]; static struct menu *rootEntry; @@ -70,16 +69,6 @@ static void strip(char *str) *p-- = 0; } -static void check_stdin(void) -{ - if (!valid_stdin) { - printf(_("aborted!\n\n")); - printf(_("Console input/output is redirected. ")); - printf(_("Run 'make config' to update configuration.\n\n")); - exit(1); - } -} - /* Helper function to facilitate fgets() by Jean Sacren. */ static void xfgets(char *str, int size, FILE *in) { @@ -110,7 +99,6 @@ static int conf_askvalue(struct symbol *sym, const char *def) printf("%s\n", def); return 0; } - check_stdin(); /* fall through */ case oldaskconfig: fflush(stdout); @@ -306,7 +294,6 @@ static int conf_choice(struct menu *menu) printf("%d\n", cnt); break; } - check_stdin(); /* fall through */ case oldaskconfig: fflush(stdout); @@ -606,8 +593,6 @@ int main(int ac, char **av) break; } - valid_stdin = tty_stdio; - switch (input_mode) { case allnoconfig: conf_set_all_new_symbols(def_no); -- 2.31.1