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>

diff --git a/test-wildmatch.c b/test-wildmatch.c
index 77014e99dc614d5db62f829616bad585635bf469..74c08644eebbea411dce0603d7c87f144d0e1446 100644 (file)
--- a/test-wildmatch.c
+++ b/test-wildmatch.c
@@ -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

diff --git a/wildmatch.c b/wildmatch.c
index 6d992d314abccf675c2b3bc0e3285ee7c6abe1b7..eef7b13aa40f4de50c6e8dc92c612fbbc523019f 100644 (file)
--- a/wildmatch.c
+++ b/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)
-{
-       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 wildmatch(const char *pattern, const char *text, int flags)
 {
-       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);
 }

diff --git a/wildmatch.h b/wildmatch.h
index 562faa35a5d34eb14d60688b5a7441405baf2ac9..e974f9abce54c347c275213ce13fbe767f1f5948 100644 (file)
--- a/wildmatch.h
+++ b/wildmatch.h
@@ -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);