kconfig: revert conf behaviour change
authorRoman Zippel <zippel@linux-m68k.org>
Sun, 9 Apr 2006 15:26:50 +0000 (17:26 +0200)
committerSam Ravnborg <sam@mars.ravnborg.org>
Tue, 11 Apr 2006 11:41:06 +0000 (13:41 +0200)
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>
scripts/kconfig/conf.c

index b86c64f90c943676c45f8e814f3a86953b3a5e50..ae5ab981bb1d170d215bf9bde96845d731c8e7e0 100644 (file)
@@ -63,20 +63,6 @@ static void check_stdin(void)
        }
 }
 
-static char *fgets_check_stream(char *s, int size, FILE *stream)
-{
-       char *ret = fgets(s, size, stream);
-
-       if (ret == NULL && feof(stream)) {
-               printf(_("aborted!\n\n"));
-               printf(_("Console input is closed. "));
-               printf(_("Run 'make oldconfig' to update configuration.\n\n"));
-               exit(1);
-       }
-
-       return ret;
-}
-
 static void conf_askvalue(struct symbol *sym, const char *def)
 {
        enum symbol_type type = sym_get_type(sym);
@@ -114,7 +100,7 @@ static void conf_askvalue(struct symbol *sym, const char *def)
                check_stdin();
        case ask_all:
                fflush(stdout);
-               fgets_check_stream(line, 128, stdin);
+               fgets(line, 128, stdin);
                return;
        case set_default:
                printf("%s\n", def);
@@ -369,7 +355,7 @@ static int conf_choice(struct menu *menu)
                        check_stdin();
                case ask_all:
                        fflush(stdout);
-                       fgets_check_stream(line, 128, stdin);
+                       fgets(line, 128, stdin);
                        strip(line);
                        if (line[0] == '?') {
                                printf("\n%s\n", menu->sym->help ?