From 6a0abcc02f0773f32f2d31b3532eec1b11e1f67d Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 3 May 2011 00:52:22 +0200 Subject: [PATCH] sed: support \r in s command function old new delta copy_parsing_escapes 65 91 +26 Signed-off-by: Denys Vlasenko --- editors/sed.c | 3 ++- testsuite/sed.tests | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/editors/sed.c b/editors/sed.c index 9e27e3e18..11c476321 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 395372ae6..e9d0ed601 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"