* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
#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;
while ((*string) && (*wild != '*'))
{
- if (!map)
+ if ((map[*wild] != map[*string]) && (*wild != '?'))
{
- if ((*wild != *string) && (*wild != '?'))
- {
- return false;
- }
+ return 0;
}
- else
- {
- if (map[*wild] != map[*string] && (*wild != '?'))
- {
- return false;
- }
- }
-
- ++wild;
- ++string;
+ wild++;
+ string++;
}
while (*string)
{
if (!*++wild)
{
- return true;
+ return 1;
}
-
mp = wild;
cp = string+1;
}
- // if there is no charmap and str == wild OR
- // there is a map and mapped char == mapped wild AND
- // wild is NOT ?
- else if (((!map && *wild == *string) || (map && 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 == '*')
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)
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);
}