Braunvieh!

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

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 2df7a5bec10e769b3e3445e8ebc18132fbfaee0c..63a28b8cb797fe2e25bb9e4d8e94847c530752ec 100644 (file)
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -11,151 +11,93 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDwildcard */
+/* $Core */
 
 #include "inspircd.h"
 #include "hashcomp.h"
 #include "inspstring.h"
 
-using irc::sockets::MatchCIDR;
-
-/* Rewritten to operate on more effective C++ std::string types
- * rather than char* to avoid data copies.
- * - Brain
- */
-
-CoreExport bool csmatch(const std::string &str, const std::string &mask)
+static bool match_internal(const unsigned char *str, const unsigned char *mask, unsigned const char *map)
 {
-       std::string::const_iterator cp, mp;
-
-       //unsigned char *cp = NULL, *mp = NULL;
-       //unsigned char* string = (unsigned char*)str;
-       //unsigned char* wild = (unsigned char*)mask;
-
-       std::string::const_iterator wild = mask.begin();
-       std::string::const_iterator string = str.begin();
-
-       if (mask.empty())
-               return false;
-
-       while ((string != str.end()) && (wild != mask.end()) && (*wild != '*'))
-       {
-               if ((*wild != *string) && (*wild != '?'))
-                       return 0;
-
-               wild++;
-               string++;
-       }
-
-       while (string != str.end())
-       {
-               if (wild != mask.end() && *wild == '*')
-               {
-                       if (++wild == mask.end())
-                               return 1;
-
-                       mp = wild;
-                       cp = string;
-
-                       if (cp != str.end())
-                               cp++;
-               }
-               else
-               if ((string != str.end() && wild != mask.end()) && ((*wild == *string) || (*wild == '?')))
-               {
-                       wild++;
-                       string++;
-               }
-               else
-               {
-                       wild = mp;
-                       if (cp == str.end())
-                               cp = str.end();
-                       else
-                               string = cp++;
-               }
-
-       }
-
-       while ((wild != mask.end()) && (*wild == '*'))
-               wild++;
-
-       return wild == mask.end();
+        unsigned char *cp = NULL, *mp = NULL;
+        unsigned char* string = (unsigned char*)str;
+        unsigned char* wild = (unsigned char*)mask;
+
+       if (!map)
+               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;
 }
 
-CoreExport bool match(const std::string &str, const std::string &mask)
+/********************************************************************
+ * Below here is all wrappers around match_internal
+ ********************************************************************/
+
+CoreExport bool InspIRCd::Match(const std::string &str, const std::string &mask, unsigned const char *map)
 {
-       std::string::const_iterator cp, mp;
-       std::string::const_iterator wild = mask.begin();
-       std::string::const_iterator string = str.begin();
-
-       if (mask.empty())
-               return false;
-
-       while ((string != str.end()) && (wild != mask.end()) && (*wild != '*'))
-       {
-               if ((lowermap[(unsigned char)*wild] != lowermap[(unsigned char)*string]) && (*wild != '?'))
-                       return 0;
-
-               wild++;
-               string++;
-       }
-
-       while (string != str.end())
-       {
-               if (wild != mask.end() && *wild == '*')
-               {
-                       if (++wild == mask.end())
-                               return 1;
-
-                       mp = wild;
-                       cp = string;
-
-                       if (cp != str.end())
-                               cp++;
-
-               }
-               else
-               if ((string != str.end() && wild != mask.end()) && ((lowermap[(unsigned char)*wild] == lowermap[(unsigned char)*string]) || (*wild == '?')))
-               {
-                       wild++;
-                       string++;
-               }
-               else
-               {
-                       wild = mp;
-                       if (cp == str.end())
-                               string = str.end();
-                       else
-                               string = cp++;
-               }
-
-       }
-
-       while ((wild != mask.end()) && (*wild == '*'))
-               wild++;
-
-       return wild == mask.end();
+       return match_internal((const unsigned char *)str.c_str(), (const unsigned char *)mask.c_str(), map);
 }
 
-/* Overloaded function that has the option of using cidr */
-CoreExport bool match(const std::string &str, const std::string &mask, bool use_cidr_match)
+CoreExport bool InspIRCd::Match(const  char *str, const char *mask, unsigned const char *map)
 {
-       if (use_cidr_match && MatchCIDR(str, mask, true))
-               return true;
-       return match(str, mask);
+       return match_internal((const unsigned char *)str, (const unsigned char *)mask, map);
 }
 
-CoreExport bool match(bool case_sensitive, const std::string &str, const std::string &mask, bool use_cidr_match)
+CoreExport bool InspIRCd::MatchCIDR(const std::string &str, const std::string &mask, unsigned const char *map)
 {
-       if (use_cidr_match && MatchCIDR(str, mask, true))
+       if (irc::sockets::MatchCIDR(str, mask, true))
                return true;
 
-       return case_sensitive ? csmatch(str, mask) : match(str, mask);
+       // Fall back to regular match
+       return InspIRCd::Match(str, mask, NULL);
 }
 
-CoreExport bool match(bool case_sensitive, const std::string &str, const std::string &mask)
+CoreExport bool InspIRCd::MatchCIDR(const  char *str, const char *mask, unsigned const char *map)
 {
-       return case_sensitive ? csmatch(str, mask) : match(str, mask);
+       if (irc::sockets::MatchCIDR(str, mask, true))
+               return true;
+
+       // Fall back to regular match
+       return InspIRCd::Match(str, mask, NULL);
 }