Make irc::sockets::* parameters consistent, add irc::sockets::mask

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

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 4b00e7261b947156a40d21477e2457efbec5b842..161bb81a6c3df0964555aab26203ea3e3bf5e658 100644 (file)
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -17,29 +17,20 @@
 #include "hashcomp.h"
 #include "inspstring.h"
 
-/*
- * Wildcard matching, the third (and probably final) iteration!
- *
- */
-static bool match_internal(const unsigned char *mask, const unsigned char *str, unsigned const char *map)
+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;
-
-       if (!map)
-               map = lowermap; // default to case insensitive search
+       unsigned char *cp = NULL, *mp = NULL;
+       unsigned char* string = (unsigned char*)str;
+       unsigned char* wild = (unsigned char*)mask;
 
        while ((*string) && (*wild != '*'))
        {
                if ((map[*wild] != map[*string]) && (*wild != '?'))
                {
-                       return false;
+                       return 0;
                }
-
-               ++wild;
-               ++string;
+               wild++;
+               string++;
        }
 
        while (*string)
@@ -48,23 +39,23 @@ static bool match_internal(const unsigned char *mask, const unsigned char *str,
                {
                        if (!*++wild)
                        {
-                               return true;
+                               return 1;
                        }
-
                        mp = wild;
                        cp = string+1;
                }
-               // if mapped char == mapped wild OR wild is ?
-               else if ((map[*wild] == map[*string]) || (*wild == '?'))
-               {
-                       ++wild;
-                       ++string;
-               }
                else
-               {
-                       wild = mp;
-                       string = cp++;
-               }
+                       if ((map[*wild] == map[*string]) || (*wild == '?'))
+                       {
+                               wild++;
+                               string++;
+                       }
+                       else
+                       {
+                               wild = mp;
+                               string = cp++;
+                       }
+
        }
 
        while (*wild == '*')
@@ -72,27 +63,38 @@ static bool match_internal(const unsigned char *mask, const unsigned char *str,
                wild++;
        }
 
-       return (*wild == 0);
+       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)
 {
+       if (!map)
+               map = national_case_insensitive_map;
+
        return match_internal((const unsigned char *)str.c_str(), (const unsigned char *)mask.c_str(), map);
 }
 
 CoreExport bool InspIRCd::Match(const  char *str, const char *mask, unsigned const char *map)
 {
+       if (!map)
+               map = national_case_insensitive_map;
        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))
                return true;
 
+       if (!map)
+               map = national_case_insensitive_map;
+
        // Fall back to regular match
-       return InspIRCd::Match(str, mask, NULL);
+       return InspIRCd::Match(str, mask, map);
 }
 
 CoreExport bool InspIRCd::MatchCIDR(const  char *str, const char *mask, unsigned const char *map)
@@ -100,7 +102,10 @@ CoreExport bool InspIRCd::MatchCIDR(const  char *str, const char *mask, unsigned
        if (irc::sockets::MatchCIDR(str, mask, true))
                return true;
 
+       if (!map)
+               map = national_case_insensitive_map;
+
        // Fall back to regular match
-       return InspIRCd::Match(str, mask, NULL);
+       return InspIRCd::Match(str, mask, map);
 }