[prev in list] [next in list] [prev in thread] [next in thread]
List: busybox
Subject: Re: [BUG] sed: newline replacement and marks
From: Denys Vlasenko <vda.linux () googlemail ! com>
Date: 2010-08-16 14:29:12
Message-ID: AANLkTim4gAJVsNs3q43iTUL98K1Kjg9jKN3d3vSKiE-U () mail ! gmail ! com
[Download RAW message or body]
On Thu, Aug 5, 2010 at 5:20 PM, Thomas Geulig <geulig@nentec.de> wrote:
> I've tried to join lines with sed.
>
> GNU sed 4.1.5 works ok:
>
> # echo -e "a\nb\nc" | sed ":a;N;s/\n/ /;ta"
> a b c
> # echo -e "a\nb\nc" | sed "N;s/\n/ /"
> a b
> c
>
> Busybox does not:
>
> # echo -e "a\nb\nc" | sed ":a;N;s/\n/ /;ta"
> # echo -e "a\nb\nc" | sed "N;s/\n/ /"
> a b
>
> The behaviour is the same for version 1.5.2, 1.16.2 and 1.17.1.
Please try attached patch.
--
vda
["7.patch" (application/octet-stream)]
diff -d -urpN busybox.6/editors/sed.c busybox.7/editors/sed.c
--- busybox.6/editors/sed.c 2010-08-05 17:24:00.000000000 +0200
+++ busybox.7/editors/sed.c 2010-08-16 16:12:26.432339791 +0200
@@ -992,6 +992,8 @@ static void process_files(void)
}
/* actual sedding */
+ //bb_error_msg("pattern_space:'%s' next_line:'%s' cmd:%c",
+ //pattern_space, next_line, sed_cmd->cmd);
switch (sed_cmd->cmd) {
/* Print line number */
@@ -1118,10 +1120,16 @@ static void process_files(void)
{
int len;
/* If no next line, jump to end of script and exit. */
+ /* http://www.gnu.org/software/sed/manual/sed.html:
+ * "Most versions of sed exit without printing anything
+ * when the N command is issued on the last line of
+ * a file. GNU sed prints pattern space before exiting
+ * unless of course the -n command switch has been
+ * specified. This choice is by design."
+ */
if (next_line == NULL) {
- free(next_line);
- next_line = NULL;
- goto discard_line;
+ //goto discard_line;
+ goto discard_commands; /* GNU behavior */
}
/* Append next_line, read new next_line. */
len = strlen(pattern_space);
diff -d -urpN busybox.6/testsuite/sed.tests busybox.7/testsuite/sed.tests
--- busybox.6/testsuite/sed.tests 2010-08-05 17:24:00.000000000 +0200
+++ busybox.7/testsuite/sed.tests 2010-08-16 16:12:11.103087870 +0200
@@ -80,10 +80,18 @@ test x"$SKIP_KNOWN_BUGS" = x"" && {
# Query: how does this interact with no newline at EOF?
testing "sed n (flushes pattern space, terminates early)" "sed -e 'n;p'" \
"a\nb\nb\nc\n" "" "a\nb\nc\n"
-# N does _not_ flush pattern space, therefore c is still in there @ script end.
-testing "sed N (doesn't flush pattern space when terminating)" "sed -e 'N;p'" \
- "a\nb\na\nb\nc\n" "" "a\nb\nc\n"
}
+# non-GNU sed: N does _not_ flush pattern space, therefore c is eaten @ script end
+# GNU sed: N flushes pattern space, therefore c is printed too @ script end
+testing "sed N (flushes pattern space (GNU behavior))" "sed -e 'N;p'" \
+ "a\nb\na\nb\nc\n" "" "a\nb\nc\n"
+
+testing "sed N test2" "sed ':a;N;s/\n/ /;ta'" \
+ "a b c\n" "" "a\nb\nc\n"
+
+testing "sed N test3" "sed 'N;s/\n/ /'" \
+ "a b\nc\n" "" "a\nb\nc\n"
+
testing "sed address match newline" 'sed "/b/N;/b\\nc/i woo"' \
"a\nwoo\nb\nc\nd\n" "" "a\nb\nc\nd\n"
_______________________________________________
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic