ash: remove CRs from CRLF during field splitting

Commit e371e46fa0 (shell: add \r to IFS) added '\r' to the IFS
variable so field splitting would remove carriage returns.

Rather than change IFS, remove CRs preceding LFs in regions
being scanned for field splitting before IFS is applied.  This
prevents free-standing CRs from being removed.

Costs 112-120 bytes.

(GitHub issue #285)

1 files changed, 5 insertions, 1 deletions

diff --git a/testsuite/sh.tests b/testsuite/sh.tests
index 872611a1b..6fc3ca104 100755
--- a/testsuite/sh.tests
+++ b/testsuite/sh.tests
@@ -89,8 +89,12 @@ IyEvYmluL3NoICAtIAplY2hvICJIZWxsbyB3b3JsZCIK
 "
 rm -f shebang_leading_argument_trailing_space.sh
 
-testing "remove CRs from string being evaluated" \
+testing "sh remove CRs from string being evaluated" \
         "sh -c \"$(printf 'set -e\r\necho Hello world\r\n')\"" \
         "Hello world\n" "" ""
 
+testing "sh preserve lone CRs during field splitting" \
+        "sh input" \
+        "Hello\r world\n" "echo \$(printf \"Hello\\\\r\\\\r\\\\nworld\\\\r\\\\n\")" ""
+
 exit $FAILCOUNT