* ---------------------------------------------------
*/
-/* $Core: libIRCDwildcard */
+/* $Core */
#include "inspircd.h"
#include "hashcomp.h"
while ((string != str.end()) && (wild != mask.end()) && (*wild != '*'))
{
if ((*wild != *string) && (*wild != '?'))
- return 0;
+ return false;
wild++;
string++;
}
+ if (wild == mask.end() && string != str.end())
+ return false;
+
while (string != str.end())
{
if (wild != mask.end() && *wild == '*')
{
if (++wild == mask.end())
- return 1;
+ return true;
mp = wild;
cp = string;
while ((string != str.end()) && (wild != mask.end()) && (*wild != '*'))
{
if ((lowermap[(unsigned char)*wild] != lowermap[(unsigned char)*string]) && (*wild != '?'))
- return 0;
+ return false;
wild++;
string++;
+ //printf("Iterate first loop\n");
}
+ if (wild == mask.end() && string != str.end())
+ return false;
+
while (string != str.end())
{
+ //printf("outer\n %c", *string);
if (wild != mask.end() && *wild == '*')
{
+
+ //printf("inner %c\n", *wild);
if (++wild == mask.end())
- return 1;
+ return true;
mp = wild;
cp = string;
else
if ((string != str.end() && wild != mask.end()) && ((lowermap[(unsigned char)*wild] == lowermap[(unsigned char)*string]) || (*wild == '?')))
{
- wild++;
- string++;
+ if (wild != mask.end())
+ wild++;
+
+ if (string != str.end())
+ string++;
}
else
{