2 files changed, 25 insertions, 8 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 3919118f0..efb80dfe4 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -15812,6 +15812,7 @@ readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         r = shell_builtin_read(&params);
         INT_ON;
 
+#if !ENABLE_PLATFORM_MINGW32
         if ((uintptr_t)r == 1 && errno == EINTR) {
                 /* To get SIGCHLD: sleep 1 & read x; echo $x
                  * Correct behavior is to not exit "read"
@@ -15819,9 +15820,11 @@ readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 if (pending_sig == 0)
                         goto again;
         }
-
-#if ENABLE_PLATFORM_MINGW32
+#else /* ENABLE_PLATFORM_MINGW32 */
         if ((uintptr_t)r == 2) {
+                /* Timeout, return 128 + SIGALRM */
+                return 142;
+        } else if ((uintptr_t)r == 3) {
                 /* ^C pressed, propagate event */
                 if (trap[SIGINT]) {
                         write(STDOUT_FILENO, "^C", 2);
diff --git a/shell/shell_common.c b/shell/shell_common.c
index 7fb5f8c58..2a876acac 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -209,8 +209,13 @@ 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
                         }
                 }
 
@@ -228,8 +233,14 @@ shell_builtin_read(struct builtin_read_params *params)
                 if (poll(pfd, 1, timeout) <= 0) {
                         /* timed out, or EINTR */
                         err = errno;
+#if ENABLE_PLATFORM_MINGW32
+                        /* Windows poll(2) doesn't do EINTR, we timed out */
+                        retval = (const char *)(uintptr_t)2;
+                        break;
+#else
                         retval = (const char *)(uintptr_t)1;
                         goto ret;
+#endif
                 }
 #if ENABLE_PLATFORM_MINGW32
                 if (isatty(fd)) {
@@ -238,15 +249,18 @@ shell_builtin_read(struct builtin_read_params *params)
                         key = windows_read_key(fd, NULL, timeout);
                         if (key == 0x03) {
                                 /* ^C pressed */
-                                retval = (const char *)(uintptr_t)2;
+                                retval = (const char *)(uintptr_t)3;
                                 goto ret;
                         }
-                        else if (key == -1 || (key == 0x1a && bufpos == 0)) {
-                                /* timeout or ^Z at start of buffer */
+                        else if (key == -1) {
+                                /* timeout */
+                                retval = (const char *)(uintptr_t)2;
+                                break;
+                        } else if (key == 0x1a && bufpos == 0) {
+                                /* ^Z at start of buffer */
                                 retval = (const char *)(uintptr_t)1;
-                                goto ret;
-                        }
-                        else if (key == '\b') {
+                                break;
+                        } else if (key == '\b') {
                                 if (bufpos > 0) {
                                         --bufpos;
                                         ++nchars;