wildmatch: fix case-insensitive matching

diff --git a/wildmatch.c b/wildmatch.c
index ac29471660168cc01fad90b2b901148f3e14f091..5469866e8ad82eb3a1d32f60c9ef72251e07bde3 100644 (file)
--- a/wildmatch.c
+++ b/wildmatch.c
@@ -20,6 +20,9 @@ typedef unsigned char uchar;
 
 #define FALSE 0
 #define TRUE 1
+
+#define NOMATCH 1
+#define MATCH 0
 #define ABORT_ALL -1
 #define ABORT_TO_STARSTAR -2
 
@@ -56,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;
 
@@ -70,6 +71,8 @@ static int dowild(const uchar *p, const uchar *text)
                        return ABORT_ALL;
                if (force_lower_case && ISUPPER(t_ch))
                        t_ch = tolower(t_ch);
+               if (force_lower_case && ISUPPER(p_ch))
+                       p_ch = tolower(p_ch);
                switch (p_ch) {
                case '\\':
                        /* Literal match with following character.  Note that the test
@@ -78,12 +81,12 @@ static int dowild(const uchar *p, const uchar *text)
                        /* FALLTHROUGH */
                default:
                        if (t_ch != p_ch)
-                               return FALSE;
+                               return NOMATCH;
                        continue;
                case '?':
                        /* Match anything but '/'. */
                        if (t_ch == '/')
-                               return FALSE;
+                               return NOMATCH;
                        continue;
                case '*':
                        if (*++p == '*') {
@@ -96,14 +99,14 @@ static int dowild(const uchar *p, const uchar *text)
                                 * only if there are no more slash characters. */
                                if (!special) {
                                        if (strchr((char*)text, '/') != NULL)
-                                               return FALSE;
+                                               return NOMATCH;
                                }
-                               return TRUE;
+                               return MATCH;
                        }
                        while (1) {
                                if (t_ch == '\0')
                                        break;
-                               if ((matched = dowild(p, text)) != FALSE) {
+                               if ((matched = dowild(p, text,  force_lower_case)) != NOMATCH) {
                                        if (!special || matched != ABORT_TO_STARSTAR)
                                                return matched;
                                } else if (!special && t_ch == '/')
@@ -202,26 +205,17 @@ static int dowild(const uchar *p, const uchar *text)
                                        matched = TRUE;
                        } while (prev_ch = p_ch, (p_ch = *++p) != ']');
                        if (matched == special || t_ch == '/')
-                               return FALSE;
+                               return NOMATCH;
                        continue;
                }
        }
 
-       return *text ? FALSE : TRUE;
+       return *text ? NOMATCH : MATCH;
 }
 
 /* Match the "pattern" against the "text" string. */
-int wildmatch(const char *pattern, const char *text)
-{
-       return dowild((const uchar*)pattern, (const uchar*)text) == TRUE;
-}
-
-/* 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) == TRUE;
-       force_lower_case = 0;
-       return ret;
+       return dowild((const uchar*)pattern, (const uchar*)text,
+                     flags & FNM_CASEFOLD ? 1 :0);
 }