Changes to m_override

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

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index bf90eaeb8a5767be53e99321a36a23bbbf0712f7..d3db02da488d448d08eee6a2a3f23caa5bb1b1dd 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -3,31 +3,24 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *                    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.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
 using namespace std;
 
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include <string>
 #include "hashcomp.h"
-#include "helperfuncs.h"
 #include <ext/hash_map>
-
 #define nspace __gnu_cxx
 
-// from helperfuncs.cpp
-extern const char lowermap[255];
-
 /******************************************************
  *
  * The hash functions of InspIRCd are the centrepoint
@@ -71,11 +64,11 @@ using namespace irc::sockets;
  */
 void nspace::strlower(char *n)
 {
-        if (n)
-        {
-                for (char* t = n; *t; t++)
-                        *t = lowermap[(unsigned char)*t];
-        }
+       if (n)
+       {
+               for (char* t = n; *t; t++)
+                       *t = lowermap[(unsigned char)*t];
+       }
 }
 
 size_t nspace::hash<insp_inaddr>::operator()(const insp_inaddr &a) const
@@ -91,8 +84,8 @@ size_t nspace::hash<string>::operator()(const string &s) const
        size_t t = 0;
        static struct hash<const char *> strhash;
 
-       for (const char* x = s.c_str(); *x; x++, t++)   /* Faster to do it this way than */
-               a[t] = lowermap[(unsigned char)*x];     /* Seperate strlcpy and strlower */
+       for (const char* x = s.c_str(); *x; x++)        /* Faster to do it this way than */
+               a[t++] = lowermap[(unsigned char)*x];   /* Seperate strlcpy and strlower */
 
        a[t] = 0;
 
@@ -128,9 +121,7 @@ bool irc::InAddr_HashComp::operator()(const insp_inaddr &s1, const insp_inaddr &
  * std::string which is not only case-insensitive but
  * can also do scandanavian comparisons, e.g. { = [, etc.
  *
- * This class depends on the global 'lowermap' which is
- * initialized at startup by inspircd.cpp, and contains
- * the 'scandanavian' casemappings for fast irc compare.
+ * This class depends on the const array 'lowermap'.
  *
  ******************************************************/
 
@@ -211,10 +202,6 @@ std::istream& operator>>(std::istream &is, irc::string &str)
 
 irc::tokenstream::tokenstream(const std::string &source) : tokens(source), last_pushed(false)
 {
-       /* Remove trailing spaces, these muck up token parsing */
-       while (tokens.find_last_of(' ') == tokens.length() - 1)
-               tokens.erase(tokens.end() - 1);
-
        /* Record starting position and current position */
        last_starting_position = tokens.begin();
        n = tokens.begin();
@@ -248,7 +235,12 @@ const std::string irc::tokenstream::GetToken()
                         */
                        last_starting_position = n+1;
                        last_pushed = true;
-                       return std::string(lsp, n+1 == tokens.end() ? n+1  : n++);
+
+                       std::string strip(lsp, n+1 == tokens.end() ? n+1  : n++);
+                       while ((strip.length()) && (strip.find_last_of(' ') == strip.length() - 1))
+                               strip.erase(strip.end() - 1);
+
+                       return strip;
                }
 
                n++;
@@ -283,3 +275,21 @@ const std::string irc::commasepstream::GetToken()
 irc::commasepstream::~commasepstream()
 {
 }
+
+std::string irc::hex(const unsigned char *raw, size_t rawsz)
+{
+       if (!rawsz)
+               return "";
+
+       char buf[rawsz*2+1];
+       size_t i;
+
+       for (i = 0; i < rawsz; i++)
+       {
+               sprintf (&(buf[i*2]), "%02x", raw[i]);
+       }
+       buf[i*2] = 0;
+
+       return buf;
+}
+