浏览代码

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>
Roman Zippel 19 年之前
父节点
当前提交
59c6a3f4d7
共有 1 个文件被更改,包括 2 次插入16 次删除
  1. 2 16
      scripts/kconfig/conf.c

+ 2 - 16
scripts/kconfig/conf.c

@@ -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)
 static void conf_askvalue(struct symbol *sym, const char *def)
 {
 {
 	enum symbol_type type = sym_get_type(sym);
 	enum symbol_type type = sym_get_type(sym);
@@ -114,7 +100,7 @@ static void conf_askvalue(struct symbol *sym, const char *def)
 		check_stdin();
 		check_stdin();
 	case ask_all:
 	case ask_all:
 		fflush(stdout);
 		fflush(stdout);
-		fgets_check_stream(line, 128, stdin);
+		fgets(line, 128, stdin);
 		return;
 		return;
 	case set_default:
 	case set_default:
 		printf("%s\n", def);
 		printf("%s\n", def);
@@ -369,7 +355,7 @@ static int conf_choice(struct menu *menu)
 			check_stdin();
 			check_stdin();
 		case ask_all:
 		case ask_all:
 			fflush(stdout);
 			fflush(stdout);
-			fgets_check_stream(line, 128, stdin);
+			fgets(line, 128, stdin);
 			strip(line);
 			strip(line);
 			if (line[0] == '?') {
 			if (line[0] == '?') {
 				printf("\n%s\n", menu->sym->help ?
 				printf("\n%s\n", menu->sym->help ?