ash: improve CRLF handling in read

Commit deae0c7bf3 (Skip carriage return in read builtin command)
caused all CRs to be removed from input to the read builtin.

Only remove CRs that are part of a CRLF pair.

Adds 64-80 bytes.

(GitHub issue #285)

1 files changed, 16 insertions, 0 deletions

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