Fix a bug that creapt in recently with substitution subprinting, and add

a test for it.


git-svn-id: svn://busybox.net/trunk/busybox@7534 69ca8d6d-28ef-0310-b511-8ec308f3f277

2 files changed, 11 insertions, 3 deletions

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