summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2014-09-15 23:11:13 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2014-09-15 23:11:13 (GMT)
commit9caea2448e168560de306a1496574dd58c645fea (patch)
tree33c156525649779bfcff3a5f0b9711a23704dbf6
parent7666fa1d02b4e7e74a83833881caef09b475b88b (diff)
downloadbusybox-master.tar.gz
busybox-master.tar.bz2
sed: fix a buglet in s///NUM handlingHEADmaster
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--editors/sed.c5
-rwxr-xr-xtestsuite/sed.tests4
2 files changed, 8 insertions, 1 deletions
diff --git a/editors/sed.c b/editors/sed.c
index e18e48a..e1b8352 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -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");
}
}
diff --git a/testsuite/sed.tests b/testsuite/sed.tests
index 9494ac2..19f2915 100755
--- a/testsuite/sed.tests
+++ b/testsuite/sed.tests
@@ -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