undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pickaxe: count regex matches only once

Browse Source 
When --pickaxe-regex is used, forward past the end of matches instead of
advancing to the byte after their start.  This way matches count only
once, even if the regular expression matches their tail -- like in the
fixed-string fork of the code.

E.g.: /.*/ used to count the number of bytes instead of the number of
lines.  /aa/ resulted in a count of two in "aaa" instead of one.

Also document the fact that regexec() needs a NUL-terminated string as
its second argument by adding an assert().

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2009-03-16 19:38:42 +01:00 committed by Junio C Hamano
parent 01d3861217
commit 50fd6997c6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diffcore-pickaxe.c
View File

@ -25,10 +25,12 @@ static unsigned int contains(struct diff_filespec *one,
regmatch_t regmatch; regmatch_t regmatch;
int flags = 0; int flags = 0;
assert(data[sz] == '\0');
while (*data && !regexec(regexp, data, 1, &regmatch, flags)) { while (*data && !regexec(regexp, data, 1, &regmatch, flags)) {
flags |= REG_NOTBOL; flags |= REG_NOTBOL;
data += regmatch.rm_so; data += regmatch.rm_eo;
if (*data) data++; if (*data && regmatch.rm_so == regmatch.rm_eo)
data++;
cnt++; cnt++;
} }