#include "inspstring.h"
/*
- * Wildcard matching, the third (and probably final) iteration!
+ * Wildcard matching!
*
+ * Iteration 1)
+ * Slow, horrible, etc.
+ * Iteration 2)
+ * The vastly available 'public domain' one
+ * Iteration 3)
+ * ZNC's, thought to be faster than ours, but it turned out that we could do better ;-)
+ * Iteration 4)
+ * Largely from work by peavey and myself (w00t) :)
+ * Iteration 5)
+ * peavey: Fix glob scan similar to 1.1, but scan ahead on glob in inner loop to retain speedup
+ * this fixes another case which we forgot to test. Add early return for obvious fail condition.
*/
-static bool match_internal(const unsigned char *mask, const unsigned char *str, unsigned const char *map)
+static bool match_internal(const unsigned char *string, const unsigned char *wild, unsigned const char *map)
{
- const unsigned char *wild = str;
- const unsigned char *string = mask;
- const unsigned char *cp = NULL;
- const unsigned char *mp = NULL;
+ const unsigned char *s, *m; m = wild;
- if (!map)
- map = lowermap; // default to case insensitive search
-
- while ((*string) && (*wild != '*'))
- {
- if ((map[*wild] != map[*string]) && (*wild != '?'))
- {
- return false;
- }
+ if (*string && !*wild)
+ return false;
- ++wild;
- ++string;
- }
+ if (!map)
+ map = rfc_case_insensitive_map;
while (*string)
{
if (*wild == '*')
{
- if (!*++wild)
- {
+ while (*wild && *wild == '*')
+ wild++;
+
+ m = wild;
+
+ if (!*wild)
return true;
+ else if (*wild != '?')
+ {
+ s = string;
+ while (*s)
+ {
+ if ((map[*wild] == map[*s]))
+ {
+ string = s;
+ if (*(wild+1) || !*(s+1))
+ wild++;
+ break;
+ }
+ s++;
+ }
}
-
- mp = wild;
- cp = string+1;
- }
- // if mapped char == mapped wild OR wild is ?
- else if ((map[*wild] == map[*string]) || (*wild == '?'))
- {
- ++wild;
- ++string;
}
+ else if ( (map[*wild] == map[*string]) || (*wild == '?') )
+ wild++;
else
- {
- wild = mp;
- string = cp++;
- }
+ wild = m;
+
+ string++;
}
- while (*wild == '*')
- {
+ while (*wild && *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)
{
return match_internal((const unsigned char *)str.c_str(), (const unsigned char *)mask.c_str(), 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))