diff options
author | Roman Zippel <zippel@linux-m68k.org> | 2006-04-09 11:26:50 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-04-11 07:41:06 -0400 |
commit | 59c6a3f4d745584f2f78cdf1f5e221a19518926c (patch) | |
tree | 392293e66a85997c4dcab8c65e69436bd0fdcab7 /scripts/kconfig/conf.c | |
parent | 40aee729b350672c2550640622416a855e27938f (diff) |
kconfig: revert conf behaviour change
After the last patch fixed the real problem, revert this needless behaviour
change of conf, which only hid the real problem.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts/kconfig/conf.c')
-rw-r--r-- | scripts/kconfig/conf.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index b86c64f90c94..ae5ab981bb1d 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
@@ -63,20 +63,6 @@ static void check_stdin(void) | |||
63 | } | 63 | } |
64 | } | 64 | } |
65 | 65 | ||
66 | static char *fgets_check_stream(char *s, int size, FILE *stream) | ||
67 | { | ||
68 | char *ret = fgets(s, size, stream); | ||
69 | |||
70 | if (ret == NULL && feof(stream)) { | ||
71 | printf(_("aborted!\n\n")); | ||
72 | printf(_("Console input is closed. ")); | ||
73 | printf(_("Run 'make oldconfig' to update configuration.\n\n")); | ||
74 | exit(1); | ||
75 | } | ||
76 | |||
77 | return ret; | ||
78 | } | ||
79 | |||
80 | static void conf_askvalue(struct symbol *sym, const char *def) | 66 | static void conf_askvalue(struct symbol *sym, const char *def) |
81 | { | 67 | { |
82 | enum symbol_type type = sym_get_type(sym); | 68 | enum symbol_type type = sym_get_type(sym); |
@@ -114,7 +100,7 @@ static void conf_askvalue(struct symbol *sym, const char *def) | |||
114 | check_stdin(); | 100 | check_stdin(); |
115 | case ask_all: | 101 | case ask_all: |
116 | fflush(stdout); | 102 | fflush(stdout); |
117 | fgets_check_stream(line, 128, stdin); | 103 | fgets(line, 128, stdin); |
118 | return; | 104 | return; |
119 | case set_default: | 105 | case set_default: |
120 | printf("%s\n", def); | 106 | printf("%s\n", def); |
@@ -369,7 +355,7 @@ static int conf_choice(struct menu *menu) | |||
369 | check_stdin(); | 355 | check_stdin(); |
370 | case ask_all: | 356 | case ask_all: |
371 | fflush(stdout); | 357 | fflush(stdout); |
372 | fgets_check_stream(line, 128, stdin); | 358 | fgets(line, 128, stdin); |
373 | strip(line); | 359 | strip(line); |
374 | if (line[0] == '?') { | 360 | if (line[0] == '?') { |
375 | printf("\n%s\n", menu->sym->help ? | 361 | printf("\n%s\n", menu->sym->help ? |