Braunvieh!

[user/henk/code/inspircd.git] / src / wildcard.cpp

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index e717b0ad4d5ec4384748376f8c1ea7bd5a5b3ae7..63a28b8cb797fe2e25bb9e4d8e94847c530752ec 100644 (file)
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -17,65 +17,62 @@
 #include "hashcomp.h"
 #include "inspstring.h"
 
-/*
- * Wildcard matching, the third (and probably final) iteration!
- *
- */
 static bool match_internal(const unsigned char *str, const unsigned char *mask, unsigned const char *map)
 {
-       const unsigned char *wild = str;
-       const unsigned char *string = mask;
-       const unsigned char *cp = NULL;
-       const unsigned char *mp = NULL;
+        unsigned char *cp = NULL, *mp = NULL;
+        unsigned char* string = (unsigned char*)str;
+        unsigned char* wild = (unsigned char*)mask;
 
        if (!map)
-               map = lowermap; // default to case insensitive search
-
-       while ((*string) && (*wild != '*'))
-       {
-               if (map[*wild] != map[*string] && (*wild != '?'))
-               {
-                       return false;
-               }
-
-               ++wild;
-               ++string;
-       }
-
-       while (*string)
-       {
-               if (*wild == '*')
-               {
-                       if (!*++wild)
-                       {
-                               return true;
-                       }
-
-                       mp = wild;
-                       cp = string+1;
-               }
-
-               // if mapped char == mapped wild AND wild is NOT ?
-               else if (map[*wild] == map[*string] && (*wild == '?'))
-               {
-                       ++wild;
-                       ++string;
-               }
-               else
-               {
-                       wild = mp;
-                       string = cp++;
-               }
-       }
-
-       while (*wild == '*')
-       {
-               wild++;
-       }
-
-       return (*wild == 0);
+               map = rfc_case_insensitive_map;
+
+        while ((*string) && (*wild != '*'))
+        {
+                if ((map[*wild] != map[*string]) && (*wild != '?'))
+                {
+                        return 0;
+                }
+                wild++;
+                string++;
+        }
+
+        while (*string)
+        {
+                if (*wild == '*')
+                {
+                        if (!*++wild)
+                        {
+                                return 1;
+                        }
+                        mp = wild;
+                        cp = string+1;
+                }
+                else
+                if ((map[*wild] == map[*string]) || (*wild == '?'))
+                {
+                        wild++;
+                        string++;
+                }
+                else
+                {
+                        wild = mp;
+                        string = cp++;
+                }
+
+        }
+
+        while (*wild == '*')
+        {
+                wild++;
+        }
+
+        return !*wild;
 }
 
+/********************************************************************
+ * Below here is all wrappers around match_internal
+ ********************************************************************/
+
 CoreExport bool InspIRCd::Match(const std::string &str, const std::string &mask, unsigned const char *map)
 {
        return match_internal((const unsigned char *)str.c_str(), (const unsigned char *)mask.c_str(), map);
@@ -86,7 +83,6 @@ CoreExport bool InspIRCd::Match(const  char *str, const char *mask, unsigned con
        return match_internal((const unsigned char *)str, (const unsigned char *)mask, map);
 }
 
-
 CoreExport bool InspIRCd::MatchCIDR(const std::string &str, const std::string &mask, unsigned const char *map)
 {
        if (irc::sockets::MatchCIDR(str, mask, true))