Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/util-linux/script.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/util-linux/script.c (modified) (6 diffs)

branches/3.3/mindi-busybox/util-linux/script.c

@@ -24 +24 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 int script_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -78 +79 @@
         printf("Script started, file is %s\n", fname);
     }
+
     shell = get_shell_name();
+
+    /* Some people run "script ... 0>&-".
+     * Our code assumes that STDIN_FILENO != pty.
+     * Ensure STDIN_FILENO is not closed:
+     */
+    bb_sanitize_stdio();
 
     pty = xgetpty(pty_line);
@@ -102 +110 @@
     if (child_pid) {
         /* parent */
-#define buf bb_common_bufsiz1
         struct pollfd pfd[2];
         int outfd, count, loop;
         double oldtime = ENABLE_SCRIPTREPLAY ? time(NULL) : 0;
         smallint fd_count = 2;
+#define buf bb_common_bufsiz1
+        setup_common_bufsiz();
 
         outfd = xopen(fname, mode);
@@ -128 +137 @@
             if (pfd[0].revents) {
                 errno = 0;
-                count = safe_read(pty, buf, sizeof(buf));
+                count = safe_read(pty, buf, COMMON_BUFSIZE);
                 if (count <= 0 && errno != EAGAIN) {
                     /* err/eof from pty: exit */
@@ -151 +160 @@
             }
             if (pfd[1].revents) {
-                count = safe_read(STDIN_FILENO, buf, sizeof(buf));
+                count = safe_read(STDIN_FILENO, buf, COMMON_BUFSIZE);
                 if (count <= 0) {
                     /* err/eof from stdin: don't read stdin anymore */
@@ -170 +179 @@
         loop = 999;
         /* pty is in O_NONBLOCK mode, we exit as soon as buffer is empty */
-        while (--loop && (count = safe_read(pty, buf, sizeof(buf))) > 0) {
+        while (--loop && (count = safe_read(pty, buf, COMMON_BUFSIZE)) > 0) {
             full_write(STDOUT_FILENO, buf, count);
             full_write(outfd, buf, count);