зеркало из https://github.com/microsoft/git.git
wildmatch: remove static variable force_lower_case
One place less to worry about thread safety. Also combine wildmatch and iwildmatch into one. 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:
Родитель
3ae5396cf7
Коммит
9b4edc0a49
|
@ -4,9 +4,9 @@
|
|||
int main(int argc, char **argv)
|
||||
{
|
||||
if (!strcmp(argv[1], "wildmatch"))
|
||||
return !!wildmatch(argv[3], argv[2]);
|
||||
return !!wildmatch(argv[3], argv[2], 0);
|
||||
else if (!strcmp(argv[1], "iwildmatch"))
|
||||
return !!iwildmatch(argv[3], argv[2]);
|
||||
return !!wildmatch(argv[3], argv[2], FNM_CASEFOLD);
|
||||
else if (!strcmp(argv[1], "fnmatch"))
|
||||
return !!fnmatch(argv[3], argv[2], FNM_PATHNAME);
|
||||
else
|
||||
|
|
21
wildmatch.c
21
wildmatch.c
|
@ -59,10 +59,8 @@ typedef unsigned char uchar;
|
|||
#define ISUPPER(c) (ISASCII(c) && isupper(c))
|
||||
#define ISXDIGIT(c) (ISASCII(c) && isxdigit(c))
|
||||
|
||||
static int force_lower_case = 0;
|
||||
|
||||
/* Match pattern "p" against "text" */
|
||||
static int dowild(const uchar *p, const uchar *text)
|
||||
static int dowild(const uchar *p, const uchar *text, int force_lower_case)
|
||||
{
|
||||
uchar p_ch;
|
||||
|
||||
|
@ -106,7 +104,7 @@ static int dowild(const uchar *p, const uchar *text)
|
|||
while (1) {
|
||||
if (t_ch == '\0')
|
||||
break;
|
||||
if ((matched = dowild(p, text)) != NOMATCH) {
|
||||
if ((matched = dowild(p, text, force_lower_case)) != NOMATCH) {
|
||||
if (!special || matched != ABORT_TO_STARSTAR)
|
||||
return matched;
|
||||
} else if (!special && t_ch == '/')
|
||||
|
@ -214,17 +212,8 @@ static int dowild(const uchar *p, const uchar *text)
|
|||
}
|
||||
|
||||
/* Match the "pattern" against the "text" string. */
|
||||
int wildmatch(const char *pattern, const char *text)
|
||||
int wildmatch(const char *pattern, const char *text, int flags)
|
||||
{
|
||||
return dowild((const uchar*)pattern, (const uchar*)text);
|
||||
}
|
||||
|
||||
/* Match the "pattern" against the forced-to-lower-case "text" string. */
|
||||
int iwildmatch(const char *pattern, const char *text)
|
||||
{
|
||||
int ret;
|
||||
force_lower_case = 1;
|
||||
ret = dowild((const uchar*)pattern, (const uchar*)text);
|
||||
force_lower_case = 0;
|
||||
return ret;
|
||||
return dowild((const uchar*)pattern, (const uchar*)text,
|
||||
flags & FNM_CASEFOLD ? 1 :0);
|
||||
}
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
/* wildmatch.h */
|
||||
|
||||
int wildmatch(const char *pattern, const char *text);
|
||||
int iwildmatch(const char *pattern, const char *text);
|
||||
int wildmatch(const char *pattern, const char *text, int flags);
|
||||
|
|
Загрузка…
Ссылка в новой задаче