aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorGravatar Glenn L McGrath <bug1@ihug.co.nz>2003-09-16 01:46:36 +0000
committerGravatar Glenn L McGrath <bug1@ihug.co.nz>2003-09-16 01:46:36 +0000
commit204ff1cea49c958846cd49175fa9318b81b5756f (patch)
treea64e6ce8f21b19abda79932248d3439ed3e016e5 /editors
parent96fd1b98f19cd97a534406554f83ae5cab87b3ac (diff)
downloadbusybox-204ff1cea49c958846cd49175fa9318b81b5756f.tar.gz
busybox-204ff1cea49c958846cd49175fa9318b81b5756f.tar.bz2
Fix a bug that creapt in recently with substitution subprinting, and add
a test for it.
Diffstat (limited to 'editors')
-rw-r--r--editors/sed.c5
1 files changed, 2 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;