aboutsummaryrefslogtreecommitdiff
path: root/shell/shell_common.c
diff options
context:
space:
mode:
Diffstat (limited to 'shell/shell_common.c')
-rw-r--r--shell/shell_common.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/shell/shell_common.c b/shell/shell_common.c
index 68659abd3..75f4b3e54 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -175,7 +175,7 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
175 break; 175 break;
176 } 176 }
177 c = buffer[bufpos]; 177 c = buffer[bufpos];
178 if (c == '\0') 178 if (c == '\0' || (ENABLE_PLATFORM_MINGW32 && c == '\r'))
179 continue; 179 continue;
180 if (backslash) { 180 if (backslash) {
181 backslash = 0; 181 backslash = 0;
@@ -342,6 +342,13 @@ static const char ulimit_opt_string[] = "-HSa"
342#endif 342#endif
343 ; 343 ;
344 344
345#if ENABLE_PLATFORM_MINGW32
346int FAST_FUNC
347shell_builtin_ulimit(char **argv)
348{
349 return 1;
350}
351#else
345static void printlim(unsigned opts, const struct rlimit *limit, 352static void printlim(unsigned opts, const struct rlimit *limit,
346 const struct limits *l) 353 const struct limits *l)
347{ 354{
@@ -470,3 +477,4 @@ shell_builtin_ulimit(char **argv)
470 477
471 return 0; 478 return 0;
472} 479}
480#endif