/*
* InspIRCd -- Internet Relay Chat Daemon
*
+ * Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ * Copyright (C) 2013, 2018-2019 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2013 Adam <Adam@anope.org>
+ * Copyright (C) 2012-2013, 2015-2016 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
* Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- * Copyright (C) 2005-2009 Craig Edwards <craigedwards@brainbox.cc>
- * Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
* Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006-2007, 2010 Craig Edwards <brain@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
return t;
}
-irc::tokenstream::tokenstream(const std::string &source) : spacesepstream(source)
+irc::tokenstream::tokenstream(const std::string& msg, size_t start, size_t end)
+ : message(msg, start, end)
+ , position(0)
{
}
-bool irc::tokenstream::GetToken(std::string &token)
+bool irc::tokenstream::GetMiddle(std::string& token)
{
- bool first = !pos;
-
- if (!spacesepstream::GetToken(token))
+ // If we are past the end of the string we can't do anything.
+ if (position >= message.length())
+ {
+ token.clear();
return false;
+ }
- /* This is the last parameter */
- if (token[0] == ':' && !first)
+ // If we can't find another separator this is the last token in the message.
+ size_t separator = message.find(' ', position);
+ if (separator == std::string::npos)
{
- token.erase(token.begin());
- if (!StreamEnd())
- {
- token += ' ';
- token += GetRemaining();
- }
- pos = tokens.length() + 1;
+ token.assign(message, position, std::string::npos);
+ position = message.length();
+ return true;
}
+ token.assign(message, position, separator - position);
+ position = message.find_first_not_of(' ', separator);
return true;
}
-bool irc::tokenstream::GetToken(int &token)
+bool irc::tokenstream::GetTrailing(std::string& token)
{
- std::string tok;
- bool returnval = GetToken(tok);
- token = ConvToInt(tok);
- return returnval;
-}
+ // If we are past the end of the string we can't do anything.
+ if (position >= message.length())
+ {
+ token.clear();
+ return false;
+ }
-bool irc::tokenstream::GetToken(long &token)
-{
- std::string tok;
- bool returnval = GetToken(tok);
- token = ConvToInt(tok);
- return returnval;
+ // If this is true then we have a <trailing> token!
+ if (message[position] == ':')
+ {
+ token.assign(message, position + 1, std::string::npos);
+ position = message.length();
+ return true;
+ }
+
+ // There is no <trailing> token so it must be a <middle> token.
+ return GetMiddle(token);
}
irc::sepstream::sepstream(const std::string& source, char separator, bool allowempty)
return this->pos > this->tokens.length();
}
-std::string irc::stringjoiner(const std::vector<std::string>& sequence, char separator)
+bool irc::sepstream::Contains(const std::string& value)
{
- std::string joined;
- if (sequence.empty())
- return joined; // nothing to do here
-
- for (std::vector<std::string>::const_iterator i = sequence.begin(); i != sequence.end(); ++i)
- joined.append(*i).push_back(separator);
- joined.erase(joined.end()-1);
- return joined;
+ std::string token;
+ while (GetToken(token))
+ if (value == token)
+ return true;
+
+ return false;
}
irc::portparser::portparser(const std::string &source, bool allow_overlapped)
if (x.empty())
return 0;
- while (Overlaps(atoi(x.c_str())))
+ while (Overlaps(ConvToNum<long>(x)))
{
if (!sep.GetToken(x))
return 0;
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))
{
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);
}
}