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

exclude: do strcmp as much as possible before fnmatch

Browse Source 
this also avoids calling fnmatch() if the non-wildcard prefix is
longer than basename

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2012-06-07 14:53:36 +07:00 committed by Junio C Hamano
parent fcd631ed84
commit f9f6e2ce26
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dir.c
View File

@ -341,8 +341,7 @@ void add_exclude(const char *string, const char *base,
x->flags = flags; x->flags = flags;
if (!strchr(string, '/')) if (!strchr(string, '/'))
x->flags |= EXC_FLAG_NODIR; x->flags |= EXC_FLAG_NODIR;
if (no_wildcard(string)) x->nowildcardlen = simple_length(string);
x->flags |= EXC_FLAG_NOWILDCARD;
if (*string == '*' && no_wildcard(string+1)) if (*string == '*' && no_wildcard(string+1))
x->flags |= EXC_FLAG_ENDSWITH; x->flags |= EXC_FLAG_ENDSWITH;
ALLOC_GROW(which->excludes, which->nr + 1, which->alloc); ALLOC_GROW(which->excludes, which->nr + 1, which->alloc);
@ -518,8 +517,9 @@ int excluded_from_list(const char *pathname,
for (i = el->nr - 1; 0 <= i; i--) { for (i = el->nr - 1; 0 <= i; i--) {
struct exclude *x = el->excludes[i]; struct exclude *x = el->excludes[i];
const char *exclude = x->pattern; const char *name, *exclude = x->pattern;
int to_exclude = x->to_exclude; int to_exclude = x->to_exclude;
int namelen, prefix = x->nowildcardlen;
if (x->flags & EXC_FLAG_MUSTBEDIR) { if (x->flags & EXC_FLAG_MUSTBEDIR) {
if (*dtype == DT_UNKNOWN) if (*dtype == DT_UNKNOWN)
@ -530,7 +530,7 @@ int excluded_from_list(const char *pathname,
if (x->flags & EXC_FLAG_NODIR) { if (x->flags & EXC_FLAG_NODIR) {
/* match basename */ /* match basename */
if (x->flags & EXC_FLAG_NOWILDCARD) { if (prefix == x->patternlen) {
if (!strcmp_icase(exclude, basename)) if (!strcmp_icase(exclude, basename))
return to_exclude; return to_exclude;
} else if (x->flags & EXC_FLAG_ENDSWITH) { } else if (x->flags & EXC_FLAG_ENDSWITH) {
@ -544,26 +544,37 @@ int excluded_from_list(const char *pathname,
continue; continue;
} }
/* match with FNM_PATHNAME: /* match with FNM_PATHNAME:
* exclude has base (baselen long) implicitly in front of it. * exclude has base (baselen long) implicitly in front of it.
*/ */
if (*exclude == '/') if (*exclude == '/') {
exclude++; exclude++;
prefix--;
}
if (pathlen < x->baselen || if (pathlen < x->baselen ||
(x->baselen && pathname[x->baselen-1] != '/') || (x->baselen && pathname[x->baselen-1] != '/') ||
strncmp_icase(pathname, x->base, x->baselen)) strncmp_icase(pathname, x->base, x->baselen))
continue; continue;
if (x->flags & EXC_FLAG_NOWILDCARD) { namelen = x->baselen ? pathlen - x->baselen : pathlen;
if (!strcmp_icase(exclude, pathname + x->baselen)) name = pathname + pathlen - namelen;
return to_exclude;
} else { /* if the non-wildcard part is longer than the
if (fnmatch_icase(exclude, pathname+x->baselen, remaining pathname, surely it cannot match */
FNM_PATHNAME) == 0) if (prefix > namelen)
return to_exclude; continue;
if (prefix) {
if (strncmp_icase(exclude, name, prefix))
continue;
exclude += prefix;
name += prefix;
namelen -= prefix;
} }
if (!namelen || !fnmatch_icase(exclude, name, FNM_PATHNAME))
return to_exclude;
} }
return -1; /* undecided */ return -1; /* undecided */
} }

2
dir.h
View File

@ -7,7 +7,6 @@ struct dir_entry {
}; };
#define EXC_FLAG_NODIR 1 #define EXC_FLAG_NODIR 1
#define EXC_FLAG_NOWILDCARD 2
#define EXC_FLAG_ENDSWITH 4 #define EXC_FLAG_ENDSWITH 4
#define EXC_FLAG_MUSTBEDIR 8 #define EXC_FLAG_MUSTBEDIR 8
@ -17,6 +16,7 @@ struct exclude_list {
struct exclude { struct exclude {
const char *pattern; const char *pattern;
int patternlen; int patternlen;
int nowildcardlen;
const char *base; const char *base;
int baselen; int baselen;
int to_exclude; int to_exclude;