Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 25651
b: refs/heads/master
c: 59c6a3f
h: refs/heads/master
i:
  25649: 13adbef
  25647: b692325
v: v3
  • Loading branch information
Roman Zippel authored and Sam Ravnborg committed Apr 11, 2006
1 parent 6b66bb7 commit ddb833c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 40aee729b350672c2550640622416a855e27938f
refs/heads/master: 59c6a3f4d745584f2f78cdf1f5e221a19518926c
18 changes: 2 additions & 16 deletions trunk/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 ddb833c

Please sign in to comment.