1 files changed, 56 insertions, 1 deletions

diff --git a/shell/shell_common.c b/shell/shell_common.c
index e0582adfb..d1df5888c 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -19,7 +19,11 @@
 #include "libbb.h"
 #include "shell_common.h"
 
+#if !ENABLE_PLATFORM_MINGW32
 const char defifsvar[] ALIGN1 = "IFS= \t\n";
+#else
+const char defifsvar[] ALIGN1 = "IFS= \t\n\r";
+#endif
 const char defoptindvar[] ALIGN1 = "OPTIND=1";
 
 /* read builtin */
@@ -43,7 +47,9 @@ shell_builtin_read(struct builtin_read_params *params)
         char **pp;
         char *buffer;
         char delim;
+#if !ENABLE_PLATFORM_MINGW32
         struct termios tty, old_tty;
+#endif
         const char *retval;
         int bufpos; /* need to be able to hold -1 */
         int startword;
@@ -123,6 +129,18 @@ shell_builtin_read(struct builtin_read_params *params)
                  * bash seems to ignore -p PROMPT for this use case.
                  */
                 int r;
+#if ENABLE_PLATFORM_MINGW32
+                HANDLE handle = (HANDLE)_get_osfhandle(fd);
+                DWORD filetype = FILE_TYPE_UNKNOWN;
+
+                if (handle != INVALID_HANDLE_VALUE)
+                        filetype = GetFileType(handle);
+                /* poll uses WaitForSingleObject which can't handle disk files */
+                if (filetype == FILE_TYPE_DISK || filetype == FILE_TYPE_UNKNOWN)
+                        return (const char *)(uintptr_t)(0);
+                if (isatty(fd))
+                        return (const char *)(uintptr_t)(1);
+#endif
                 pfd[0].events = POLLIN;
                 r = poll(pfd, 1, /*timeout:*/ 0);
                 /* Return 0 only if poll returns 1 ("one fd ready"), else return 1: */
@@ -139,6 +157,7 @@ shell_builtin_read(struct builtin_read_params *params)
                 ifs = defifs;
 
         read_flags = params->read_flags;
+#if !ENABLE_PLATFORM_MINGW32
         if (nchars || (read_flags & BUILTIN_READ_SILENT)) {
                 tcgetattr(fd, &tty);
                 old_tty = tty;
@@ -161,6 +180,7 @@ shell_builtin_read(struct builtin_read_params *params)
                  * Ignoring, it's harmless. */
                 tcsetattr(fd, TCSANOW, &tty);
         }
+#endif
 
         retval = (const char *)(uintptr_t)0;
         startword = 1;
@@ -190,6 +210,7 @@ shell_builtin_read(struct builtin_read_params *params)
                         }
                 }
 
+#if !ENABLE_PLATFORM_MINGW32
                 /* We must poll even if timeout is -1:
                  * we want to be interrupted if signal arrives,
                  * regardless of SA_RESTART-ness of that signal!
@@ -207,9 +228,34 @@ shell_builtin_read(struct builtin_read_params *params)
                         retval = (const char *)(uintptr_t)1;
                         break;
                 }
+#else
+                errno = 0;
+                if (isatty(fd)) {
+                        int64_t key;
+
+                        key = read_key(fd, NULL, timeout);
+                        if (key == 0x03 || key == -1) {
+                                /* ^C or timeout */
+                                retval = (const char *)(uintptr_t)1;
+                                goto ret;
+                        }
+                        buffer[bufpos] = key == '\r' ? '\n' : key;
+                        if (!(read_flags & BUILTIN_READ_SILENT)) {
+                                /* echo input if not in silent mode */
+                                putchar(buffer[bufpos]);
+                        }
+                }
+                else {
+                        if (read(fd, &buffer[bufpos], 1) != 1) {
+                                err = errno;
+                                retval = (const char *)(uintptr_t)1;
+                                break;
+                        }
+                }
+#endif
 
                 c = buffer[bufpos];
-                if (c == '\0')
+                if (c == '\0' || (ENABLE_PLATFORM_MINGW32 && c == '\r'))
                         continue;
                 if (!(read_flags & BUILTIN_READ_RAW)) {
                         if (backslash) {
@@ -309,8 +355,10 @@ shell_builtin_read(struct builtin_read_params *params)
 
  ret:
         free(buffer);
+#if !ENABLE_PLATFORM_MINGW32
         if (read_flags & BUILTIN_READ_SILENT)
                 tcsetattr(fd, TCSANOW, &old_tty);
+#endif
 
         errno = err;
         return retval;
@@ -319,6 +367,7 @@ shell_builtin_read(struct builtin_read_params *params)
 
 /* ulimit builtin */
 
+#if !ENABLE_PLATFORM_MINGW32
 struct limits {
         uint8_t cmd;            /* RLIMIT_xxx fit into it */
         uint8_t factor_shift;   /* shift by to get rlim_{cur,max} values */
@@ -633,3 +682,9 @@ shell_builtin_ulimit(char **argv)
 
         return EXIT_SUCCESS;
 }
+#else
+int FAST_FUNC shell_builtin_ulimit(char **argv UNUSED_PARAM)
+{
+        return 1;
+}
+#endif