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.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/shell/shell_common.c b/shell/shell_common.c
index 57297155e..84e0604ed 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -18,7 +18,9 @@
18 */ 18 */
19#include "libbb.h" 19#include "libbb.h"
20#include "shell_common.h" 20#include "shell_common.h"
21#if !ENABLE_PLATFORM_MINGW32
21#include <sys/resource.h> /* getrlimit */ 22#include <sys/resource.h> /* getrlimit */
23#endif
22 24
23const char defifsvar[] ALIGN1 = "IFS= \t\n"; 25const char defifsvar[] ALIGN1 = "IFS= \t\n";
24 26
@@ -201,7 +203,7 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
201 } 203 }
202 204
203 c = buffer[bufpos]; 205 c = buffer[bufpos];
204 if (c == '\0') 206 if (c == '\0' || (ENABLE_PLATFORM_MINGW32 && c == '\r'))
205 continue; 207 continue;
206 if (backslash) { 208 if (backslash) {
207 backslash = 0; 209 backslash = 0;
@@ -370,6 +372,13 @@ static const char ulimit_opt_string[] = "-HSa"
370#endif 372#endif
371 ; 373 ;
372 374
375#if ENABLE_PLATFORM_MINGW32
376int FAST_FUNC
377shell_builtin_ulimit(char **argv)
378{
379 return 1;
380}
381#else
373static void printlim(unsigned opts, const struct rlimit *limit, 382static void printlim(unsigned opts, const struct rlimit *limit,
374 const struct limits *l) 383 const struct limits *l)
375{ 384{
@@ -498,3 +507,4 @@ shell_builtin_ulimit(char **argv)
498 507
499 return 0; 508 return 0;
500} 509}
510#endif