ash,make: fix CRLF handling

Fix remove_cr() so it only removes CRs which are part of a CRLF
pair, not every CR.

Add a test case for the shell.

1 files changed, 3 insertions, 2 deletions

diff --git a/win32/mingw.c b/win32/mingw.c
index 5cd7e74db..4d07a24e5 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -2030,8 +2030,9 @@ size_t FAST_FUNC remove_cr(char *p, size_t len)
         ssize_t i, j;
 
         for (i=j=0; i<len; ++i) {
-                if (p[i] != '\r')
-                        p[j++] = p[i];
+                if (p[i] == '\r' && i < len - 1 && p[i+1] == '\n')
+                        continue;
+                p[j++] = p[i];
         }
         return j;
 }