I'll give you ##TOAST, :p

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

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 953997e5b83c9dd2b8549fd2500fd4026c4e88e5..682501f234a631f585c5c3e624e1c9e4a10905fb 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -16,17 +16,11 @@
 
 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
 
-char lowermap[255];
-
 /******************************************************
  *
  * The hash functions of InspIRCd are the centrepoint
@@ -127,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'.
  *
  ******************************************************/
 
@@ -210,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();
@@ -247,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++;
@@ -270,7 +263,12 @@ const std::string irc::commasepstream::GetToken()
                if ((*n == ',') || (n+1 == tokens.end()))
                {
                        last_starting_position = n+1;
-                       return std::string(lsp, n+1 == tokens.end() ? n+1  : n++);
+                       std::string strip = std::string(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,17 +281,20 @@ irc::commasepstream::~commasepstream()
 {
 }
 
-void InspIRCd::MakeLowerMap()
-{       
-       // initialize the lowercase mapping table
-       for (unsigned char cn = 0; cn < 255; cn++)
-               lowermap[cn] = cn;
-       // lowercase the uppercase chars
-       for (unsigned char cn = 65; cn < 91; cn++)
-               lowermap[cn] = tolower(cn);
-       // now replace the specific chars for scandanavian comparison
-       lowermap[(unsigned char)'['] = '{';
-       lowermap[(unsigned char)']'] = '}';
-       lowermap[(unsigned char)'\\'] = '|';
+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;
 }