#include "helperfuncs.h"
#include "inspstring.h"
+extern char lowermap[255];
+
// Wed 27 Apr 2005 - Brain
// I've taken our our old wildcard routine -
// although comprehensive, it was topheavy and very
// (unattributed to any author) all over the 'net.
// For now, we'll just consider this public domain.
-int wildcmp(char *wild, char *string)
+bool match(const char *str, const char *mask)
{
- char *cp, *mp;
+ unsigned char *cp, *mp;
+ unsigned char* string = (unsigned char*)str;
+ unsigned char* wild = (unsigned char*)mask;
+
while ((*string) && (*wild != '*'))
{
- if ((*wild != *string) && (*wild != '?'))
+ if ((lowermap[*wild] != lowermap[*string]) && (*wild != '?'))
{
return 0;
}
cp = string+1;
}
else
- if ((*wild == *string) || (*wild == '?'))
+ if ((lowermap[*wild] == lowermap[*string]) || (*wild == '?'))
{
wild++;
string++;
return !*wild;
}
-// This wrapper function is required to convert both
-// strings to 'scandanavian lowercase' and make copies
-// of them to a safe location. It also ensures we don't
-// bite off more than we can chew with the length of
-// the string.
-
-bool match(const char* literal, const char* mask)
+/* Overloaded function that has the option of using cidr */
+bool match(const char *str, const char *mask, bool use_cidr_match)
{
- static char L[10240];
- static char M[10240];
- strlcpy(L,literal,10240);
- strlcpy(M,mask,10240);
- strlower(L);
- strlower(M);
- return wildcmp(M,L);
+ if (use_cidr_match && MatchCIDR(str, mask, true))
+ return true;
+ return match(str, mask);
}