9caea2448
Denys Vlasenko
2014-09-16
Subject
sed: fix a buglet in s///NUM handling
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
editors/sed.c+4 -1
| @@ -395,7 +395,9 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr) | |
| /* process the flags */ | |
| sed_cmd->which_match = 1; | |
| + | dbg("s flags:'%s'", substr + idx + 1); |
| while (substr[++idx]) { | |
| + | dbg("s flag:'%c'", substr[idx]); |
| /* Parse match number */ | |
| if (isdigit(substr[idx])) { | |
| if (match[0] != '^') { | |
| @@ -403,7 +405,7 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr) | |
| const char *pos = substr + idx; | |
| /* FIXME: error check? */ | |
| sed_cmd->which_match = (unsigned)strtol(substr+idx, (char**) &pos, 10); | |
| - | idx = pos - substr; |
| + | idx = pos - substr - 1; |
| } | |
| continue; | |
| } | |
| @@ -443,6 +445,7 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr) | |
| case '}': | |
| goto out; | |
| default: | |
| + | dbg("s bad flags:'%s'", substr + idx); |
| bb_error_msg_and_die("bad option in substitution expression"); | |
| } | |
| } | |
testsuite/sed.tests+4 -0
| @@ -329,6 +329,10 @@ line with \\ | |
| continuation | |
| " | |
| + | testing "sed s///NUM test" \ |
| + | "sed -e 's/a/b/2; s/a/c/g'" \ |
| + | "cb\n" "" "aa\n" |
| + | |
| # testing "description" "commands" "result" "infile" "stdin" | |
| exit $FAILCOUNT | |