Convert InspIRCd::SetSignals to a static function.

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

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 47c36b91bac176c03ff84124cbbc67d797d1cdb6..ae9cf6e7646f3d1ebb0996691a080f3a53824006 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -193,8 +193,8 @@ size_t irc::insensitive::operator()(const std::string &s) const
        return t;
 }
 
-irc::tokenstream::tokenstream(const std::string& msg, size_t start)
-       : message(msg, start)
+irc::tokenstream::tokenstream(const std::string& msg, size_t start, size_t end)
+       : message(msg, start, end)
        , position(0)
 {
 }
@@ -212,7 +212,7 @@ bool irc::tokenstream::GetMiddle(std::string& token)
        size_t separator = message.find(' ', position);
        if (separator == std::string::npos)
        {
-               token.assign(message, position);
+               token.assign(message, position, std::string::npos);
                position = message.length();
                return true;
        }
@@ -234,9 +234,8 @@ bool irc::tokenstream::GetTrailing(std::string& token)
        // If this is true then we have a <trailing> token!
        if (message[position] == ':')
        {
-               token.assign(message, position + 1);
+               token.assign(message, position + 1, std::string::npos);
                position = message.length();
-               ServerInstance->Logs->Log("HASHCOMP", LOG_DEBUG, "TRAILING %s next (none)", token.c_str());
                return true;
        }
 
@@ -288,6 +287,16 @@ bool irc::sepstream::StreamEnd()
        return this->pos > this->tokens.length();
 }
 
+bool irc::sepstream::Contains(const std::string& value)
+{
+       std::string token;
+       while (GetToken(token))
+               if (value == token)
+                       return true;
+
+       return false;
+}
+
 irc::portparser::portparser(const std::string &source, bool allow_overlapped)
        : sep(source), in_range(0), range_begin(0), range_end(0), overlapped(allow_overlapped)
 {
@@ -331,7 +340,7 @@ long irc::portparser::GetToken()
        if (x.empty())
                return 0;
 
-       while (Overlaps(atoi(x.c_str())))
+       while (Overlaps(ConvToNum<long>(x)))
        {
                if (!sep.GetToken(x))
                        return 0;
@@ -341,8 +350,8 @@ long irc::portparser::GetToken()
        if (dash != std::string::npos)
        {
                std::string sbegin(x, 0, dash);
-               range_begin = atoi(sbegin.c_str());
-               range_end = atoi(x.c_str()+dash+1);
+               range_begin =  ConvToNum<long>(sbegin);
+               range_end =  ConvToNum<long>(x.c_str() + dash + 1);
 
                if ((range_begin > 0) && (range_end > 0) && (range_begin < 65536) && (range_end < 65536) && (range_begin < range_end))
                {
@@ -352,11 +361,11 @@ long irc::portparser::GetToken()
                else
                {
                        /* Assume its just the one port */
-                       return atoi(sbegin.c_str());
+                       return ConvToNum<long>(sbegin);
                }
        }
        else
        {
-               return atoi(x.c_str());
+               return ConvToNum<long>(x);
        }
 }