Merge branch 'busybox' into merge

4 files changed, 12 insertions, 6 deletions

diff --git a/scripts/basic/split-include.c b/scripts/basic/split-include.c
index 8127fe261..9a9260f2c 100644
--- a/scripts/basic/split-include.c
+++ b/scripts/basic/split-include.c
@@ -133,7 +133,8 @@ int main(int argc, const char * argv [])
         is_same = 0;
         if ((fp_target = fopen(ptarget, "r")) != NULL)
         {
-            fgets(old_line, buffer_size, fp_target);
+            if (!fgets(old_line, buffer_size, fp_target))
+                ERROR_EXIT(ptarget);
             if (fclose(fp_target) != 0)
                 ERROR_EXIT(ptarget);
             if (!strcmp(line, old_line))
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index f69591c69..80bd55a68 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -142,7 +142,8 @@ static void conf_askvalue(struct symbol *sym, const char *def)
                 check_stdin();
         case ask_all:
                 fflush(stdout);
-                fgets(line, 128, stdin);
+                if (!fgets(line, 128, stdin))
+                        exit(1);
                 return;
         case set_default:
                 printf("%s\n", def);
@@ -395,7 +396,8 @@ static int conf_choice(struct menu *menu)
                         check_stdin();
                 case ask_all:
                         fflush(stdout);
-                        fgets(line, 128, stdin);
+                        if (!fgets(line, 128, stdin))
+                                exit(1);
                         strip(line);
                         if (line[0] == '?') {
                                 printf("\n%s\n", menu->sym->help ?
diff --git a/scripts/kconfig/lxdialog/lxdialog.c b/scripts/kconfig/lxdialog/lxdialog.c
index 79f6c5fb5..5b8e3e947 100644
--- a/scripts/kconfig/lxdialog/lxdialog.c
+++ b/scripts/kconfig/lxdialog/lxdialog.c
@@ -189,7 +189,7 @@ int j_inputbox(const char *t, int ac, const char *const *av)
         int ret = dialog_inputbox(t, av[2], atoi(av[3]), atoi(av[4]),
                                   ac == 6 ? av[5] : (char *)NULL);
         if (ret == 0)
-                fprintf(stderr, dialog_input_result);
+                fprintf(stderr, "%s", dialog_input_result);
         return ret;
 }
 
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 9fc837c9f..cda0473ac 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -498,7 +498,8 @@ static int exec_conf(void)
 
         *argptr++ = NULL;
 
-        pipe(pipefd);
+        if (pipe(pipefd))
+                _exit(EXIT_FAILURE);
         pid = fork();
         if (pid == 0) {
                 sigprocmask(SIG_SETMASK, &osset, NULL);
@@ -863,9 +864,11 @@ static void conf(struct menu *menu)
 static void show_textbox(const char *title, const char *text, int r, int c)
 {
         int fd;
+        int len = strlen(text);
 
         fd = creat(".help.tmp", 0777);
-        write(fd, text, strlen(text));
+        if (write(fd, text, len) != len)
+                exit(1);
         close(fd);
         show_file(".help.tmp", title, r, c);
         unlink(".help.tmp");