2 files changed, 16 insertions, 2 deletions

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 010600ef58c0..4f0ed5b3a75e 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -108,7 +108,7 @@ static int conf_askvalue(struct symbol *sym, const char *def)
                 check_stdin();
         case oldaskconfig:
                 fflush(stdout);
-                fgets(line, 128, stdin);
+                xfgets(line, 128, stdin);
                 return 1;
         default:
                 break;
@@ -306,7 +306,7 @@ static int conf_choice(struct menu *menu)
                         check_stdin();
                 case oldaskconfig:
                         fflush(stdout);
-                        fgets(line, 128, stdin);
+                        xfgets(line, 128, stdin);
                         strip(line);
                         if (line[0] == '?') {
                                 print_help(menu);
@@ -644,3 +644,14 @@ int main(int ac, char **av)
         }
         return 0;
 }
+/*
+ * Helper function to facilitate fgets() by Jean Sacren.
+ */
+void xfgets(str, size, in)
+        char *str;
+        int size;
+        FILE *in;
+{
+        if (fgets(str, size, in) == NULL)
+                fprintf(stderr, "\nError in reading or end of file.\n");
+}
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index 2ac33f5d273c..bdf71bd31412 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -72,6 +72,9 @@ void zconf_nextfile(const char *name);
 int zconf_lineno(void);
 char *zconf_curname(void);
 
+/* conf.c */
+void xfgets(char *str, int size, FILE *in);
+
 /* confdata.c */
 const char *conf_get_configname(void);
 const char *conf_get_autoconfig_name(void);