summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko2016-09-01 01:59:11 +0200
committerDenys Vlasenko2016-09-01 01:59:11 +0200
commit76d72376e0244a5cafd4880cdc623e37d86a75e4 (patch)
tree30335e94c8585150c89e5bab1d02986422fea4de
parent9ff910de6be59eec120158de0b4721701877a9b1 (diff)
downloadbusybox-76d72376e0244a5cafd4880cdc623e37d86a75e4.zip
busybox-76d72376e0244a5cafd4880cdc623e37d86a75e4.tar.gz
sed: fix "sed n (flushes pattern space, terminates early)" testcase failure
Patch based on work by Dengke Du <dengke.du@windriver.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--editors/sed.c19
-rwxr-xr-xtestsuite/sed.tests6
2 files changed, 11 insertions, 14 deletions
diff --git a/editors/sed.c b/editors/sed.c
index c0d79cc..b7add1f 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -1300,16 +1300,17 @@ static void process_files(void)
case 'n':
if (!G.be_quiet)
sed_puts(pattern_space, last_gets_char);
- if (next_line) {
- free(pattern_space);
- pattern_space = next_line;
- last_gets_char = next_gets_char;
- next_line = get_next_line(&next_gets_char, &last_puts_char);
- substituted = 0;
- linenum++;
- break;
+ if (next_line == NULL) {
+ /* If no next line, jump to end of script and exit. */
+ goto discard_line;
}
- /* fall through */
+ free(pattern_space);
+ pattern_space = next_line;
+ last_gets_char = next_gets_char;
+ next_line = get_next_line(&next_gets_char, &last_puts_char);
+ substituted = 0;
+ linenum++;
+ break;
/* Quit. End of script, end of input. */
case 'q':
diff --git a/testsuite/sed.tests b/testsuite/sed.tests
index a71f8b1..05c00a9 100755
--- a/testsuite/sed.tests
+++ b/testsuite/sed.tests
@@ -73,13 +73,9 @@ testing "sed t (test/branch clears test bit)" "sed -e 's/a/b/;:loop;t loop'" \
testing "sed T (!test/branch)" "sed -e 's/a/1/;T notone;p;: notone;p'" \
"1\n1\n1\nb\nb\nc\nc\n" "" "a\nb\nc\n"
-test x"$SKIP_KNOWN_BUGS" = x"" && {
-# Normal sed end-of-script doesn't print "c" because n flushed the pattern
-# space. If n hits EOF, pattern space is empty when script ends.
-# 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"
-}
+
# 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'" \