1 files changed, 14 insertions, 1 deletions

diff --git a/shell/shell_common.c b/shell/shell_common.c
index 98d862744..5a5b1780d 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -20,7 +20,11 @@
 #include "shell_common.h"
 #include <sys/resource.h> /* getrlimit */
 
+#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";
 
 
@@ -187,6 +191,7 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
                  * regardless of SA_RESTART-ness of that signal!
                  */
                 errno = 0;
+#if !ENABLE_PLATFORM_MINGW32
                 pfd[0].fd = fd;
                 pfd[0].events = POLLIN;
                 if (poll(pfd, 1, timeout) != 1) {
@@ -195,6 +200,7 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
                         retval = (const char *)(uintptr_t)1;
                         goto ret;
                 }
+#endif
                 if (read(fd, &buffer[bufpos], 1) != 1) {
                         err = errno;
                         retval = (const char *)(uintptr_t)1;
@@ -202,7 +208,7 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
                 }
 
                 c = buffer[bufpos];
-                if (c == '\0')
+                if (c == '\0' || (ENABLE_PLATFORM_MINGW32 && c == '\r'))
                         continue;
                 if (backslash) {
                         backslash = 0;
@@ -274,6 +280,7 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
 
 /* 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 */
@@ -498,3 +505,9 @@ shell_builtin_ulimit(char **argv)
 
         return 0;
 }
+#else
+int FAST_FUNC shell_builtin_ulimit(char **argv UNUSED_PARAM)
+{
+        return 1;
+}
+#endif