diff options
| author | Matt Kraai | 2002-04-01 16:17:37 +0000 |
|---|---|---|
| committer | Matt Kraai | 2002-04-01 16:17:37 +0000 |
| commit | 5c69cd84ffe92b3b51d1ca766c34b5cd028dd0ca (patch) | |
| tree | 7a6647361bb85fdf621cab6e222b07643b8e905d | |
| parent | 75ce8d7c8886886a2852ccfc44a962f43e1e8a71 (diff) | |
| download | busybox-5c69cd84ffe92b3b51d1ca766c34b5cd028dd0ca.zip busybox-5c69cd84ffe92b3b51d1ca766c34b5cd028dd0ca.tar.gz | |
* editors/sed.c (process_file): Stop processing deleted lines.
* testsuite/sed/sed-does-not-substitute-in-delete-line: New.
| -rw-r--r-- | editors/sed.c | 5 | ||||
| -rw-r--r-- | testsuite/sed/sed-does-not-substitute-in-deleted-line | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/editors/sed.c b/editors/sed.c index 31b9de0..5edcd48 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -659,6 +659,7 @@ static void process_file(FILE *file) /* we are currently within the beginning & ending address range */ still_in_range ) { + int deleted = 0; /* * actual sedding @@ -671,6 +672,7 @@ static void process_file(FILE *file) case 'd': altered++; + deleted = 1; break; case 's': @@ -772,6 +774,9 @@ static void process_file(FILE *file) else { still_in_range = 1; } + + if (deleted) + break; } } diff --git a/testsuite/sed/sed-does-not-substitute-in-deleted-line b/testsuite/sed/sed-does-not-substitute-in-deleted-line new file mode 100644 index 0000000..6f106e1 --- /dev/null +++ b/testsuite/sed/sed-does-not-substitute-in-deleted-line @@ -0,0 +1,2 @@ +echo foo | busybox sed -e /foo/d -e s/foo/bar/ >foo +cmp foo /dev/null |