Skip to content

Commit

Permalink
kconfig: revert conf behaviour change
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Roman Zippel authored and Sam Ravnborg committed Apr 11, 2006
1 parent 40aee72 commit 59c6a3f
Showing 1 changed file with 2 additions and 16 deletions.
18 changes: 2 additions & 16 deletions scripts/kconfig/conf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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 ?
Expand Down

0 comments on commit 59c6a3f

Please sign in to comment.