1 files changed, 12 insertions, 1 deletions

diff --git a/shell/shell_common.c b/shell/shell_common.c
index 57297155e..4c870fab8 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
 
 
 int FAST_FUNC is_well_formed_var_name(const char *s, char terminator)
@@ -201,7 +205,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;
@@ -273,6 +277,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 +503,9 @@ shell_builtin_ulimit(char **argv)
 
         return 0;
 }
+#else
+int FAST_FUNC shell_builtin_ulimit(char **argv UNUSED_PARAM)
+{
+        return 1;
+}
+#endif