diff options
-rw-r--r-- | configs/mingw32_defconfig | 4 | ||||
-rw-r--r-- | libbb/read_printf.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig index 45155ba66..05d69109d 100644 --- a/configs/mingw32_defconfig +++ b/configs/mingw32_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Busybox version: 1.23.0.git | 3 | # Busybox version: 1.23.0.git |
4 | # Wed Mar 12 19:53:20 2014 | 4 | # Wed Mar 12 20:11:13 2014 |
5 | # | 5 | # |
6 | CONFIG_HAVE_DOT_CONFIG=y | 6 | CONFIG_HAVE_DOT_CONFIG=y |
7 | # CONFIG_PLATFORM_POSIX is not set | 7 | # CONFIG_PLATFORM_POSIX is not set |
@@ -374,7 +374,7 @@ CONFIG_DIFF=y | |||
374 | CONFIG_FEATURE_DIFF_LONG_OPTIONS=y | 374 | CONFIG_FEATURE_DIFF_LONG_OPTIONS=y |
375 | CONFIG_FEATURE_DIFF_DIR=y | 375 | CONFIG_FEATURE_DIFF_DIR=y |
376 | CONFIG_ED=y | 376 | CONFIG_ED=y |
377 | # CONFIG_PATCH is not set | 377 | CONFIG_PATCH=y |
378 | CONFIG_SED=y | 378 | CONFIG_SED=y |
379 | CONFIG_VI=y | 379 | CONFIG_VI=y |
380 | CONFIG_FEATURE_VI_MAX_LEN=4096 | 380 | CONFIG_FEATURE_VI_MAX_LEN=4096 |
diff --git a/libbb/read_printf.c b/libbb/read_printf.c index 5ed6e3632..ef4911cd5 100644 --- a/libbb/read_printf.c +++ b/libbb/read_printf.c | |||
@@ -93,6 +93,11 @@ char* FAST_FUNC xmalloc_reads(int fd, size_t *maxsz_p) | |||
93 | break; | 93 | break; |
94 | p++; | 94 | p++; |
95 | } | 95 | } |
96 | #if ENABLE_PLATFORM_MINGW32 | ||
97 | if ( p != buf && *(p-1) == '\r' ) { | ||
98 | --p; | ||
99 | } | ||
100 | #endif | ||
96 | *p = '\0'; | 101 | *p = '\0'; |
97 | if (maxsz_p) | 102 | if (maxsz_p) |
98 | *maxsz_p = p - buf; | 103 | *maxsz_p = p - buf; |