1 files changed, 18 insertions, 0 deletions

diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index 903ff1fb6..2142ec94c 100644
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -16,7 +16,11 @@ char* FAST_FUNC bb_get_chunk_from_file(FILE *file, size_t *end)
         size_t idx = 0;
         char *linebuf = NULL;
 
+#if ENABLE_PLATFORM_MINGW32
+        while ((ch = _getc_nolock(file)) != EOF) {
+#else
         while ((ch = getc(file)) != EOF) {
+#endif
                 /* grow the line buffer as necessary */
                 if (!(idx & 0xff)) {
                         if (idx == ((size_t)-1) - 0xff)
@@ -41,6 +45,11 @@ char* FAST_FUNC bb_get_chunk_from_file(FILE *file, size_t *end)
                 linebuf = xrealloc(linebuf, idx + 1);
                 linebuf[idx] = '\0';
         }
+#if ENABLE_PLATFORM_MINGW32
+        if (idx && isatty(fileno(file)) &&
+                        GetStdHandle(STD_INPUT_HANDLE) != INVALID_HANDLE_VALUE)
+                conToCharBuffA(linebuf, idx);
+#endif
         return linebuf;
 }
 
@@ -57,8 +66,17 @@ char* FAST_FUNC xmalloc_fgetline(FILE *file)
         size_t i;
         char *c = bb_get_chunk_from_file(file, &i);
 
+#if !ENABLE_PLATFORM_MINGW32
         if (i && c[--i] == '\n')
                 c[i] = '\0';
+#else
+        if (i && c[--i] == '\n') {
+                c[i] = '\0';
+                if (i && c[--i] == '\r') {
+                        c[i] = '\0';
+                }
+        }
+#endif
 
         return c;
 }