37ca36a71
Denys Vlasenko
2012-06-08
Subject
sed: yet another fix on top of zero length match code
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
editors/sed.c+10 -5
| @@ -768,8 +768,11 @@ static int do_subst_command(sed_cmd_t *sed_cmd, char **line_p) | |
| * Second match is NOT replaced! | |
| */ | |
| if (prev_match_empty || start != 0 || start != end) { | |
| + | //dbg("%d %d %d", prev_match_empty, start, end); |
| dbg("inserting replacement at %d in '%s'", start, line); | |
| do_subst_w_backrefs(line, sed_cmd->string); | |
| + | /* Flag that something has changed */ |
| + | altered = 1; |
| } else { | |
| dbg("NOT inserting replacement at %d in '%s'", start, line); | |
| } | |
| @@ -778,16 +781,18 @@ static int do_subst_command(sed_cmd_t *sed_cmd, char **line_p) | |
| * copy verbatim one char after it before attempting more matches | |
| */ | |
| prev_match_empty = (start == end); | |
| - | if (prev_match_empty && line[end]) { |
| - | pipe_putc(line[end]); |
| - | end++; |
| + | if (prev_match_empty) { |
| + | if (!line[end]) { |
| + | tried_at_eol = 1; |
| + | } else { |
| + | pipe_putc(line[end]); |
| + | end++; |
| + | } |
| } | |
| /* Advance past the match */ | |
| dbg("line += %d", end); | |
| line += end; | |
| - | /* Flag that something has changed */ |
| - | altered = 1; |
| /* if we're not doing this globally, get out now */ | |
| if (sed_cmd->which_match != 0) | |
testsuite/sed.tests+5 -1
| @@ -302,10 +302,14 @@ testing "sed zero chars match/replace advances correctly 2" \ | |
| "sed 's [^ .]* x g'" \ | |
| "x x.x\n" "" " a.b\n" | |
| - | testing "sed zero chars match/replace logic must not falsely trigger here" \ |
| + | testing "sed zero chars match/replace logic must not falsely trigger here 1" \ |
| "sed 's/a/A/g'" \ | |
| "_AAA1AA\n" "" "_aaa1aa\n" | |
| + | testing "sed zero chars match/replace logic must not falsely trigger here 2" \ |
| + | "sed 's/ *$/_/g'" \ |
| + | "qwerty_\n" "" "qwerty\n" |
| + | |
| # testing "description" "commands" "result" "infile" "stdin" | |
| exit $FAILCOUNT | |