emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vi: reset command count when specifying '0' range

Browse Source 
Since commit a54450248 (vi: allow the '.' command to have a
repetition count) using '0' to specify a range doesn't work with
a non-zero repeat count, e.g. '1d0'.  Users wouldn't normally try
to do that but the '.' command does.

Add a special case in get_motion_char() to handle this.

function                                             old     new   delta
find_range                                           737     746      +9
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/0 up/down: 9/0)                 Total: 9 bytes

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Ron Yorston 2021-04-15 12:02:43 +01:00 committed by Denys Vlasenko
parent 033fa3d5c6
commit 38ae0f3e3e
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
editors/vi.c
View File

@ -1128,11 +1128,16 @@ static int get_motion_char(void)
int c, cnt;
c = get_one_char();
if (c != '0' && isdigit(c)) {
// get any non-zero motion count
for (cnt = 0; isdigit(c); c = get_one_char())
cnt = cnt * 10 + (c - '0');
cmdcnt = (cmdcnt ?: 1) * cnt;
if (isdigit(c)) {
if (c != '0') {
// get any non-zero motion count
for (cnt = 0; isdigit(c); c = get_one_char())
cnt = cnt * 10 + (c - '0');
cmdcnt = (cmdcnt ?: 1) * cnt;
} else {
// ensure standalone '0' works
cmdcnt = 0;
}
}
return c;