diff options
| author | Ron Yorston <rmy@pobox.com> | 2021-12-27 08:21:55 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2021-12-27 08:21:55 +0000 |
| commit | b15f68214da209b5b293039c09c00f490c0cc193 (patch) | |
| tree | d644b5d9318b79cb1baa356cbb63318cc4872c05 /editors/sed.c | |
| parent | 1ee308c75f4720ee38be8e81ff8c9ed4c52670d4 (diff) | |
| parent | 44075929a8b9c1861d15564fa6ac4562abb724d7 (diff) | |
| download | busybox-w32-b15f68214da209b5b293039c09c00f490c0cc193.tar.gz busybox-w32-b15f68214da209b5b293039c09c00f490c0cc193.tar.bz2 busybox-w32-b15f68214da209b5b293039c09c00f490c0cc193.zip | |
Merge busybox into merge
Fix merge conflict in coreutils/timeout.c.
Diffstat (limited to 'editors/sed.c')
| -rw-r--r-- | editors/sed.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/editors/sed.c b/editors/sed.c index 523fb8dba..73034438a 100644 --- a/editors/sed.c +++ b/editors/sed.c | |||
| @@ -441,8 +441,7 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr) | |||
| 441 | switch (substr[idx]) { | 441 | switch (substr[idx]) { |
| 442 | /* Replace all occurrences */ | 442 | /* Replace all occurrences */ |
| 443 | case 'g': | 443 | case 'g': |
| 444 | if (match[0] != '^') | 444 | sed_cmd->which_match = 0; |
| 445 | sed_cmd->which_match = 0; | ||
| 446 | break; | 445 | break; |
| 447 | /* Print pattern space */ | 446 | /* Print pattern space */ |
| 448 | case 'p': | 447 | case 'p': |