diff options
Diffstat (limited to 'meta/recipes-core/busybox/busybox/0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch')
-rw-r--r-- | meta/recipes-core/busybox/busybox/0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/meta/recipes-core/busybox/busybox/0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch b/meta/recipes-core/busybox/busybox/0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch deleted file mode 100644 index 4f539848cb..0000000000 --- a/meta/recipes-core/busybox/busybox/0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch +++ /dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | From 903542f7331c58007a3ef938d41e1c55fc329648 Mon Sep 17 00:00:00 2001 | ||
2 | From: Dengke Du <dengke.du@windriver.com> | ||
3 | Date: Wed, 31 Aug 2016 23:40:43 -0400 | ||
4 | Subject: [PATCH] sed: fix "sed n (flushes pattern space, terminates early)" | ||
5 | testcase failure | ||
6 | |||
7 | This patch fix "sed n (flushes pattern space, terminates early)" | ||
8 | testcase failure. We can see it at: | ||
9 | |||
10 | https://git.busybox.net/busybox/commit/?id=76d72376e0244a5cafd4880cdc623e37d86a75e4 | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | |||
14 | Signed-off-by: Dengke Du <dengke.du@windriver.com> | ||
15 | --- | ||
16 | editors/sed.c | 19 ++++++++++--------- | ||
17 | testsuite/sed.tests | 6 +----- | ||
18 | 2 files changed, 11 insertions(+), 14 deletions(-) | ||
19 | |||
20 | diff --git a/editors/sed.c b/editors/sed.c | ||
21 | index 7bbf820..259c39c 100644 | ||
22 | --- a/editors/sed.c | ||
23 | +++ b/editors/sed.c | ||
24 | @@ -1274,16 +1274,17 @@ static void process_files(void) | ||
25 | case 'n': | ||
26 | if (!G.be_quiet) | ||
27 | sed_puts(pattern_space, last_gets_char); | ||
28 | - if (next_line) { | ||
29 | - free(pattern_space); | ||
30 | - pattern_space = next_line; | ||
31 | - last_gets_char = next_gets_char; | ||
32 | - next_line = get_next_line(&next_gets_char, &last_puts_char, last_gets_char); | ||
33 | - substituted = 0; | ||
34 | - linenum++; | ||
35 | - break; | ||
36 | + if (next_line == NULL) { | ||
37 | + /* If no next line, jump to end of script and exit. */ | ||
38 | + goto discard_line; | ||
39 | } | ||
40 | - /* fall through */ | ||
41 | + free(pattern_space); | ||
42 | + pattern_space = next_line; | ||
43 | + last_gets_char = next_gets_char; | ||
44 | + next_line = get_next_line(&next_gets_char, &last_puts_char, last_gets_char); | ||
45 | + substituted = 0; | ||
46 | + linenum++; | ||
47 | + break; | ||
48 | |||
49 | /* Quit. End of script, end of input. */ | ||
50 | case 'q': | ||
51 | diff --git a/testsuite/sed.tests b/testsuite/sed.tests | ||
52 | index 34479e5..96ff7a5 100755 | ||
53 | --- a/testsuite/sed.tests | ||
54 | +++ b/testsuite/sed.tests | ||
55 | @@ -73,13 +73,9 @@ testing "sed t (test/branch clears test bit)" "sed -e 's/a/b/;:loop;t loop'" \ | ||
56 | testing "sed T (!test/branch)" "sed -e 's/a/1/;T notone;p;: notone;p'" \ | ||
57 | "1\n1\n1\nb\nb\nc\nc\n" "" "a\nb\nc\n" | ||
58 | |||
59 | -test x"$SKIP_KNOWN_BUGS" = x"" && { | ||
60 | -# Normal sed end-of-script doesn't print "c" because n flushed the pattern | ||
61 | -# space. If n hits EOF, pattern space is empty when script ends. | ||
62 | -# Query: how does this interact with no newline at EOF? | ||
63 | testing "sed n (flushes pattern space, terminates early)" "sed -e 'n;p'" \ | ||
64 | "a\nb\nb\nc\n" "" "a\nb\nc\n" | ||
65 | -} | ||
66 | + | ||
67 | # non-GNU sed: N does _not_ flush pattern space, therefore c is eaten @ script end | ||
68 | # GNU sed: N flushes pattern space, therefore c is printed too @ script end | ||
69 | testing "sed N (flushes pattern space (GNU behavior))" "sed -e 'N;p'" \ | ||
70 | -- | ||
71 | 2.8.1 | ||
72 | |||