2 files changed, 40 insertions, 0 deletions

diff --git a/shell/shell_common.c b/shell/shell_common.c
index c0dd32fb4..eb2c4fbf5 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -273,11 +273,35 @@ shell_builtin_read(struct builtin_read_params *params)
 
                 c = buffer[bufpos];
 #if ENABLE_PLATFORM_MINGW32
+# if !ENABLE_ASH_IGNORE_CR
                 if (c == '\r')
                         continue;
+# else
+                if (c == '\n') {
+                        if (backslash == 2 || (bufpos > 0 && buffer[bufpos - 1] == '\r')) {
+                                /* We saw either:
+                                 * - BS CR LF: remove CR, fall through to ignore escaped LF
+                                 *   and exit BS context.
+                                 * - CR LF not in BS context: replace CR with LF */
+                                buffer[--bufpos] = c;
+                                ++nchars;
+                        }
+                } else if (backslash == 2) {
+                        /* We saw BS CR ??, keep escaped CR, exit BS context,
+                         * process ?? */
+                        backslash = 0;
+                }
+# endif
 #endif
                 if (!(read_flags & BUILTIN_READ_RAW)) {
                         if (backslash) {
+#if ENABLE_ASH_IGNORE_CR
+                                if (c == '\r') {
+                                        /* We have BS CR, keep CR for now, might see LF next */
+                                        backslash = 2;
+                                        goto put;
+                                }
+#endif
                                 backslash = 0;
                                 if (c != '\n')
                                         goto put;
diff --git a/testsuite/sh.tests b/testsuite/sh.tests
index 6fc3ca104..749d2dde2 100755
--- a/testsuite/sh.tests
+++ b/testsuite/sh.tests
@@ -97,4 +97,20 @@ testing "sh preserve lone CRs during field splitting" \
         "sh input" \
         "Hello\r world\n" "echo \$(printf \"Hello\\\\r\\\\r\\\\nworld\\\\r\\\\n\")" ""
 
+testing "sh read with CRLF" \
+        "printf '1 2\\r\\n' | { read var; printf \"\${var}\\\\n\"; }" \
+        "1 2\n" "" ""
+
+testing "sh read with CR" \
+        "printf '1\\r2\\r\\n' | { read var; printf \"\${var}\\\\n\"; }" \
+        "1\r2\n" "" ""
+
+testing "sh read with \\CRLF" \
+        "printf '1\\\\\r\\n2\\r\\n' | { read var; printf \"\${var}\\\\n\"; }" \
+        "12\n" "" ""
+
+testing "sh read with \\CR" \
+        "printf '1\\\\\r2\\r\\n' | { read var; printf \"\${var}\\\\n\"; }" \
+        "1\r2\n" "" ""
+
 exit $FAILCOUNT