Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/shell/shell_common.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/shell/shell_common.c (modified) (11 diffs)

branches/3.2/mindi-busybox/shell/shell_common.c

@@ -19 +19 @@
 #include "libbb.h"
 #include "shell_common.h"
+#include <sys/resource.h> /* getrlimit */
 
 const char defifsvar[] ALIGN1 = "IFS= \t\n";
@@ -37 +38 @@
 /* read builtin */
 
+/* Needs to be interruptible: shell mush handle traps and shell-special signals
+ * while inside read. To implement this, be sure to not loop on EINTR
+ * and return errno == EINTR reliably.
+ */
 //TODO: use more efficient setvar() which takes a pointer to malloced "VAR=VAL"
 //string. hush naturally has it, and ash has setvareq().
@@ -52 +57 @@
 )
 {
+    unsigned err;
     unsigned end_ms; /* -t TIMEOUT */
     int fd; /* -u FD */
@@ -62 +68 @@
     int startword;
     smallint backslash;
+
+    errno = err = 0;
 
     pp = argv;
@@ -132 +140 @@
         if (nchars) {
             tty.c_lflag &= ~ICANON;
-            tty.c_cc[VMIN] = nchars < 256 ? nchars : 255;
+            // Setting it to more than 1 breaks poll():
+            // it blocks even if there's data. !??
+            //tty.c_cc[VMIN] = nchars < 256 ? nchars : 255;
+            /* reads would block only if < 1 char is available */
+            tty.c_cc[VMIN] = 1;
+            /* no timeout (reads block forever) */
+            tty.c_cc[VTIME] = 0;
         }
         if (read_flags & BUILTIN_READ_SILENT) {
@@ -153 +167 @@
     do {
         char c;
-
+        struct pollfd pfd[1];
+        int timeout;
+
+        if ((bufpos & 0xff) == 0)
+            buffer = xrealloc(buffer, bufpos + 0x101);
+
+        timeout = -1;
         if (end_ms) {
-            int timeout;
-            struct pollfd pfd[1];
-
-            pfd[0].fd = fd;
-            pfd[0].events = POLLIN;
             timeout = end_ms - (unsigned)monotonic_ms();
-            if (timeout <= 0 /* already late? */
-             || safe_poll(pfd, 1, timeout) != 1 /* no? wait... */
-            ) { /* timed out! */
+            if (timeout <= 0) { /* already late? */
                 retval = (const char *)(uintptr_t)1;
                 goto ret;
@@ -169 +182 @@
         }
 
-        if ((bufpos & 0xff) == 0)
-            buffer = xrealloc(buffer, bufpos + 0x100);
-        if (nonblock_safe_read(fd, &buffer[bufpos], 1) != 1) {
+        /* We must poll even if timeout is -1:
+         * we want to be interrupted if signal arrives,
+         * regardless of SA_RESTART-ness of that signal!
+         */
+        errno = 0;
+        pfd[0].fd = fd;
+        pfd[0].events = POLLIN;
+        if (poll(pfd, 1, timeout) != 1) {
+            /* timed out, or EINTR */
+            err = errno;
+            retval = (const char *)(uintptr_t)1;
+            goto ret;
+        }
+        if (read(fd, &buffer[bufpos], 1) != 1) {
+            err = errno;
             retval = (const char *)(uintptr_t)1;
             break;
         }
+
         c = buffer[bufpos];
         if (c == '\0')
@@ -241 +267 @@
     if (read_flags & BUILTIN_READ_SILENT)
         tcsetattr(fd, TCSANOW, &old_tty);
+
+    errno = err;
     return retval;
 }
@@ -287 +315 @@
     { RLIMIT_LOCKS,     0,  'w',    "locks" },
 #endif
+#ifdef RLIMIT_NICE
+    { RLIMIT_NICE,      0,  'e',    "scheduling priority" },
+#endif
+#ifdef RLIMIT_RTPRIO
+    { RLIMIT_RTPRIO,    0,  'r',    "real-time priority" },
+#endif
 };
 
@@ -328 +362 @@
 #ifdef RLIMIT_LOCKS
             "w::"
+#endif
+#ifdef RLIMIT_NICE
+            "e::"
+#endif
+#ifdef RLIMIT_RTPRIO
+            "r::"
 #endif
             ;
@@ -369 +409 @@
     /* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
 
-        argc = 1;
-        while (argv[argc])
-                argc++;
+    argc = 1;
+    while (argv[argc])
+        argc++;
 
     opts = 0;