Merge pull request #1157 from SaberUK/insp20+fix-cron-restart

[user/henk/code/inspircd.git] / src / wildcard.cpp

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index e626f2aa287a454edf422738ee3cce684a26e254..eb9151293d8e185747de8ba4a3caaa729a5b1588 100644 (file)
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -1,48 +1,39 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2003, 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
  *
- * ---------------------------------------------------
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using namespace std;
 
-#include <string>
-#include "inspircd_config.h"
+/* $Core */
+
 #include "inspircd.h"
-#include "helperfuncs.h"
+#include "hashcomp.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
-// slow, and ate masses of cpu when doing lots of
-// comparisons. This is the 'de-facto' routine used
-// by many, nobody really knows who wrote it first
-// or what license its under, i've seen examples of it
-// (unattributed to any author) all over the 'net.
-// For now, we'll just consider this public domain.
-
-bool match(const char *str, const char *mask)
+static bool match_internal(const unsigned char *str, const unsigned char *mask, unsigned const char *map)
 {
-       unsigned char *cp, *mp;
+       unsigned char *cp = NULL, *mp = NULL;
        unsigned char* string = (unsigned char*)str;
        unsigned char* wild = (unsigned char*)mask;
 
        while ((*string) && (*wild != '*'))
        {
-               if ((lowermap[*wild] != lowermap[*string]) && (*wild != '?'))
+               if ((map[*wild] != map[*string]) && (*wild != '?'))
                {
                        return 0;
                }
@@ -62,16 +53,16 @@ bool match(const char *str, const char *mask)
                        cp = string+1;
                }
                else
-               if ((lowermap[*wild] == lowermap[*string]) || (*wild == '?'))
-               {
-                       wild++;
-                       string++;
-               }
-               else
-               {
-                       wild = mp;
-                       string = cp++;
-               }
+                       if ((map[*wild] == map[*string]) || (*wild == '?'))
+                       {
+                               wild++;
+                               string++;
+                       }
+                       else
+                       {
+                               wild = mp;
+                               string = cp++;
+                       }
 
        }
 
@@ -83,10 +74,46 @@ bool match(const char *str, const char *mask)
        return !*wild;
 }
 
-/* Overloaded function that has the option of using cidr */
-bool match(const char *str, const char *mask, bool use_cidr_match)
+/********************************************************************
+ * 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 (use_cidr_match && MatchCIDR(str, mask, true))
+       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;
-       return match(str, mask);
+
+       if (!map)
+               map = national_case_insensitive_map;
+
+       // Fall back to regular match
+       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, map);
+}
+