Merge branch 'busybox' into merge

1 files changed, 8 insertions, 14 deletions

diff --git a/shell/shell_common.c b/shell/shell_common.c
index 2702ef98a..657f0df8f 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -55,7 +55,7 @@ const char* FAST_FUNC
 shell_builtin_read(struct builtin_read_params *params)
 {
         struct pollfd pfd[1];
-#define fd (pfd[0].fd) /* -u FD */
+#define fd (pfd->fd) /* -u FD */
         unsigned err;
         unsigned end_ms; /* -t TIMEOUT */
         int nchars; /* -n NUM */
@@ -144,7 +144,7 @@ shell_builtin_read(struct builtin_read_params *params)
                  * bash seems to ignore -p PROMPT for this use case.
                  */
                 int r;
-                pfd[0].events = POLLIN;
+                pfd->events = POLLIN;
                 r = poll(pfd, 1, /*timeout:*/ 0);
                 /* Return 0 only if poll returns 1 ("one fd ready"), else return 1: */
                 return (const char *)(uintptr_t)(r <= 0);
@@ -209,13 +209,8 @@ shell_builtin_read(struct builtin_read_params *params)
                          * 32-bit unix time wrapped (year 2038+).
                          */
                         if (timeout <= 0) { /* already late? */
-#if ENABLE_PLATFORM_MINGW32
                                 retval = (const char *)(uintptr_t)2;
                                 break;
-#else
-                                retval = (const char *)(uintptr_t)1;
-                                goto ret;
-#endif
                         }
                 }
 
@@ -224,8 +219,8 @@ shell_builtin_read(struct builtin_read_params *params)
                  * regardless of SA_RESTART-ness of that signal!
                  */
                 errno = 0;
-                pfd[0].events = POLLIN;
-//TODO race with a signal arriving just before the poll!
+                pfd->events = POLLIN;
+
 #if ENABLE_PLATFORM_MINGW32
                 /* Don't poll if timeout is -1, it hurts performance.  The
                  * caution above about interrupts isn't relevant on Windows
@@ -233,15 +228,14 @@ shell_builtin_read(struct builtin_read_params *params)
                  */
                 if (timeout >= 0)
 #endif
-                if (poll(pfd, 1, timeout) <= 0) {
-                        /* timed out, or EINTR */
+                /* test bb_got_signal, then poll(), atomically wrt signals */
+                if (check_got_signal_and_poll(pfd, timeout) <= 0) {
+                        /* timed out, or some error */
                         err = errno;
-#if ENABLE_PLATFORM_MINGW32
-                        if (!err) {
+                        if (!err) { /* timed out */
                                 retval = (const char *)(uintptr_t)2;
                                 break;
                         }
-#endif
                         retval = (const char *)(uintptr_t)1;
                         goto ret;
                 }