Merge branch 'busybox' into merge

Conflicts:
	include/libbb.h
	shell/ash.c

1 files changed, 4 insertions, 1 deletions

diff --git a/shell/shell_common.c b/shell/shell_common.c
index 0ffe21e0b..f7503cac5 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -18,6 +18,9 @@
  */
 #include "libbb.h"
 #include "shell_common.h"
+#if !ENABLE_PLATFORM_MINGW32
+#include <sys/resource.h> /* getrlimit */
+#endif
 
 const char defifsvar[] ALIGN1 = "IFS= \t\n";
 
@@ -169,7 +172,7 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
                 int timeout;
 
                 if ((bufpos & 0xff) == 0)
-                        buffer = xrealloc(buffer, bufpos + 0x100);
+                        buffer = xrealloc(buffer, bufpos + 0x101);
 
                 timeout = -1;
                 if (end_ms) {