From: Glenn L McGrath <bug1@ihug.co.nz>
Date: Tue, 16 Sep 2003 01:46:36 +0000 (-0000)
Subject: Fix a bug that creapt in recently with substitution subprinting, and add
X-Git-Tag: 1_00_pre4~166
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=204ff1cea49c958846cd49175fa9318b81b5756f;p=oweals%2Fbusybox.git

Fix a bug that creapt in recently with substitution subprinting, and add
a test for it.
---

diff --git a/editors/sed.c b/editors/sed.c
index da15c4d06..a5a9d41a0 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -914,7 +914,6 @@ static void process_file(FILE * file)
 #endif
 					/* we print the pattern_space once, unless we were told to be quiet */
 					substituted |= do_subst_command(sed_cmd, &pattern_space);
-
 #ifdef CONFIG_FEATURE_SED_EMBEDED_NEWLINE
 					/* undo HACK: escape newlines twice so regex can match them */
 					{
@@ -930,10 +929,10 @@ static void process_file(FILE * file)
 							|| (sed_cmd->next->cmd != 's'))) {
 						force_print = 1;
 					}
-
 					/* we also print the line if we were given the 'p' flag
 					 * (this is quite possibly the second printing) */
-					if ((sed_cmd->sub_p) && altered) {
+//					if ((sed_cmd->sub_p) && (!altered || substituted)) {
+					if ((sed_cmd->sub_p) && (altered || substituted)) {
 						puts(pattern_space);
 					}
 					break;
diff --git a/testsuite/sed/sed-subst-subprint b/testsuite/sed/sed-subst-subprint
new file mode 100644
index 000000000..24f8bad7d
--- /dev/null
+++ b/testsuite/sed/sed-subst-subprint
@@ -0,0 +1,9 @@
+busybox sed 's/foo/bar/p'>output <<EOF
+foo
+bar
+EOF
+cmp -s output - <<EOF
+bar
+bar
+bar
+EOF