summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-05-02 22:52:22 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2011-05-02 22:52:22 (GMT)
commit6a0abcc02f0773f32f2d31b3532eec1b11e1f67d (patch)
tree723311362dbf162b079f2ef88045a128967c0d64
parent52d83708364f85463fbc3756420b4068df13aab7 (diff)
downloadbusybox-6a0abcc02f0773f32f2d31b3532eec1b11e1f67d.tar.gz
busybox-6a0abcc02f0773f32f2d31b3532eec1b11e1f67d.tar.bz2
sed: support \r in s command
function old new delta copy_parsing_escapes 65 91 +26 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--editors/sed.c3
-rwxr-xr-xtestsuite/sed.tests3
2 files changed, 5 insertions, 1 deletions
diff --git a/editors/sed.c b/editors/sed.c
index 9e27e3e..11c4763 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -218,8 +218,9 @@ static char *copy_parsing_escapes(const char *string, int len)
char *dest = xmalloc(len + 1);
parse_escapes(dest, string, len, 'n', '\n');
- /* GNU sed also recognizes \t */
+ /* GNU sed also recognizes \t and \r */
parse_escapes(dest, dest, strlen(dest), 't', '\t');
+ parse_escapes(dest, dest, strlen(dest), 'r', '\r');
return dest;
}
diff --git a/testsuite/sed.tests b/testsuite/sed.tests
index 395372a..e9d0ed6 100755
--- a/testsuite/sed.tests
+++ b/testsuite/sed.tests
@@ -287,6 +287,9 @@ testing "sed -i with address modifies all files, not only first" \
"cp input input2; sed -i -e '1s/foo/bar/' input input2 && cat input input2; rm input2" \
"bar\nbar\n" "foo\n" ""
+testing "sed understands \r" \
+ "sed 's/r/\r/'" \
+ "\rrr\n" "" "rrr\n"
# testing "description" "arguments" "result" "infile" "stdin"