+ std::string tok;
+ bool returnval = GetToken(tok);
+ token = ConvToInt(tok);
+ return returnval;
+}
+
+bool irc::tokenstream::GetToken(long &token)
+{
+ std::string tok;
+ bool returnval = GetToken(tok);
+ token = ConvToInt(tok);
+ return returnval;
+}
+
+irc::sepstream::sepstream(const std::string &source, char seperator) : tokens(source), sep(seperator)
+{
+ last_starting_position = tokens.begin();
+ n = tokens.begin();
+}
+
+bool irc::sepstream::GetToken(std::string &token)
+{
+ std::string::iterator lsp = last_starting_position;
+
+ while (n != tokens.end())
+ {
+ if ((*n == sep) || (n+1 == tokens.end()))
+ {
+ last_starting_position = n+1;
+ token = std::string(lsp, n+1 == tokens.end() ? n+1 : n++);
+
+ while ((token.length()) && (token.find_last_of(sep) == token.length() - 1))
+ token.erase(token.end() - 1);
+
+ if (token.empty())
+ n++;
+
+ return n == tokens.end() ? false : true;
+ }
+
+ n++;
+ }
+
+ token = "";
+ return false;
+}
+
+const std::string irc::sepstream::GetRemaining()
+{
+ return std::string(n, tokens.end());
+}
+
+bool irc::sepstream::StreamEnd()
+{
+ return ((n + 1) == tokens.end());
+}
+
+irc::sepstream::~sepstream()
+{
+}
+
+std::string irc::hex(const unsigned char *raw, size_t rawsz)
+{
+ if (!rawsz)
+ return "";
+
+ /* EWW! This used to be using sprintf, which is WAY inefficient. -Special */
+
+ const char *hex = "0123456789abcdef";
+ static char hexbuf[MAXBUF];
+
+ size_t i, j;
+ for (i = 0, j = 0; j < rawsz; ++j)
+ {
+ hexbuf[i++] = hex[raw[j] / 16];
+ hexbuf[i++] = hex[raw[j] % 16];
+ }
+ hexbuf[i] = 0;
+
+ return hexbuf;
+}
+
+CoreExport const char* irc::Spacify(const char* n)
+{
+ static char x[MAXBUF];
+ strlcpy(x,n,MAXBUF);
+ for (char* y = x; *y; y++)
+ if (*y == '_')
+ *y = ' ';
+ return x;
+}
+
+
+irc::modestacker::modestacker(InspIRCd* Instance, bool add) : ServerInstance(Instance), adding(add)
+{
+ sequence.clear();
+ sequence.push_back("");
+}
+
+void irc::modestacker::Push(char modeletter, const std::string ¶meter)
+{
+ *(sequence.begin()) += modeletter;
+ sequence.push_back(parameter);
+}
+
+void irc::modestacker::Push(char modeletter)
+{
+ this->Push(modeletter,"");
+}
+
+void irc::modestacker::PushPlus()
+{
+ this->Push('+',"");
+}
+
+void irc::modestacker::PushMinus()
+{
+ this->Push('-',"");
+}
+
+int irc::modestacker::GetStackedLine(std::vector<std::string> &result, int max_line_size)
+{
+ if (sequence.empty())
+ {
+ return 0;
+ }
+
+ unsigned int n = 0;
+ int size = 1; /* Account for initial +/- char */
+ int nextsize = 0;
+ int start = result.size();
+ std::string modeline = adding ? "+" : "-";
+ result.push_back(modeline);
+
+ if (sequence.size() > 1)
+ nextsize = sequence[1].length() + 2;
+
+ while (!sequence[0].empty() && (sequence.size() > 1) && (n < ServerInstance->Config->Limits.MaxModes) && ((size + nextsize) < max_line_size))
+ {
+ modeline += *(sequence[0].begin());
+ if (!sequence[1].empty())
+ {
+ result.push_back(sequence[1]);
+ size += nextsize; /* Account for mode character and whitespace */
+ }
+ sequence[0].erase(sequence[0].begin());
+ sequence.erase(sequence.begin() + 1);
+
+ if (sequence.size() > 1)
+ nextsize = sequence[1].length() + 2;
+
+ n++;
+ }
+ result[start] = modeline;
+
+ return n;
+}
+
+irc::stringjoiner::stringjoiner(const std::string &seperator, const std::vector<std::string> &sequence, int begin, int end)
+{
+ if (end < begin)
+ throw "stringjoiner logic error, this causes problems.";
+
+ for (int v = begin; v < end; v++)
+ joined.append(sequence[v]).append(seperator);
+ joined.append(sequence[end]);
+}
+
+irc::stringjoiner::stringjoiner(const std::string &seperator, const std::deque<std::string> &sequence, int begin, int end)
+{
+ if (end < begin)
+ throw "stringjoiner logic error, this causes problems.";
+
+ for (int v = begin; v < end; v++)
+ joined.append(sequence[v]).append(seperator);
+ joined.append(sequence[end]);
+}
+
+irc::stringjoiner::stringjoiner(const std::string &seperator, const char* const* sequence, int begin, int end)
+{
+ if (end < begin)
+ throw "stringjoiner logic error, this causes problems.";
+
+ for (int v = begin; v < end; v++)
+ joined.append(sequence[v]).append(seperator);
+ joined.append(sequence[end]);
+}
+
+std::string& irc::stringjoiner::GetJoined()
+{
+ return joined;