* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
static bool match_internal(const unsigned char *str, const unsigned char *mask, unsigned const char *map)
{
- 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;
+ 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 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 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);
}
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)
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);
}