diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-02-15 02:01:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-20 22:15:46 (GMT) |
| commit | eb07894fe036566acccb71420ab79ccb9c9e2d66 (patch) | |
| tree | 74709f072ea129623d3771433080de01d5010026 /dir.c | |
| parent | 5f95c9f850b19b368c43ae399cc831b17a26a5ac (diff) | |
| download | git-eb07894fe036566acccb71420ab79ccb9c9e2d66.zip git-eb07894fe036566acccb71420ab79ccb9c9e2d66.tar.gz git-eb07894fe036566acccb71420ab79ccb9c9e2d66.tar.bz2 | |
use wildmatch() directly without fnmatch() wrapper
Make it clear that we don't use fnmatch() anymore.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'dir.c')
| -rw-r--r-- | dir.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -49,7 +49,9 @@ int strncmp_icase(const char *a, const char *b, size_t count) int fnmatch_icase(const char *pattern, const char *string, int flags) { - return fnmatch(pattern, string, flags | (ignore_case ? FNM_CASEFOLD : 0)); + return wildmatch(pattern, string, + flags | (ignore_case ? WM_CASEFOLD : 0), + NULL); } inline int git_fnmatch(const struct pathspec_item *item, @@ -58,7 +60,7 @@ inline int git_fnmatch(const struct pathspec_item *item, { if (prefix > 0) { if (ps_strncmp(item, pattern, string, prefix)) - return FNM_NOMATCH; + return WM_NOMATCH; pattern += prefix; string += prefix; } @@ -76,8 +78,9 @@ inline int git_fnmatch(const struct pathspec_item *item, NULL); else /* wildmatch has not learned no FNM_PATHNAME mode yet */ - return fnmatch(pattern, string, - item->magic & PATHSPEC_ICASE ? FNM_CASEFOLD : 0); + return wildmatch(pattern, string, + item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0, + NULL); } static int fnmatch_icase_mem(const char *pattern, int patternlen, |