X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=15be92bd7105cbd631824ea8076da9bbd50f59da;hb=8509727e16f1d9ce6c9719c8d62c7715d3699858;hp=b5740d95bc8c04429b6c5a53c9f3f7fcc0cc1ab2;hpb=3f3d3d302899aacf8b49fcc871265c965d1fb0fc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index b5740d95b..15be92bd7 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,6 +11,8 @@
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDhash */
+
 #include "inspircd.h"
 #include "hashcomp.h"
 #ifndef WIN32
@@ -245,32 +247,31 @@ irc::sepstream::sepstream(const std::string &source, char seperator) : tokens(so
 	n = tokens.begin();
 }
 
-const std::string irc::sepstream::GetToken()
+bool irc::sepstream::GetToken(std::string &token)
 {
 	std::string::iterator lsp = last_starting_position;
 
 	while (n != tokens.end())
 	{
-		/** Skip multi seps, converting "<sep><sep>" into "<sep>"
-		 */
-		while ((n+1 != tokens.end()) && (*n == sep) && (*(n+1) == sep))
-			n++;
-
 		if ((*n == sep) || (n+1 == tokens.end()))
 		{
 			last_starting_position = n+1;
-			std::string strip = std::string(lsp, n+1 == tokens.end() ? n+1  : n++);
+			token = std::string(lsp, n+1 == tokens.end() ? n+1  : n++);
 
-			while ((strip.length()) && (strip.find_last_of(sep) == strip.length() - 1))
-				strip.erase(strip.end() - 1);
+			while ((token.length()) && (token.find_last_of(sep) == token.length() - 1))
+				token.erase(token.end() - 1);
+
+			if (token.empty())
+				n++;
 
-			return strip;
+			return n == tokens.end() ? false : true;
 		}
 
 		n++;
 	}
 
-	return "";
+	token = "";
+	return false;
 }
 
 const std::string irc::sepstream::GetRemaining()
@@ -458,16 +459,15 @@ long irc::portparser::GetToken()
 			in_range = 0;
 	}
 
-	std::string x = sep->GetToken();
+	std::string x;
+	sep->GetToken(x);
 
 	if (x.empty())
 		return 0;
 
 	while (Overlaps(atoi(x.c_str())))
 	{
-		x = sep->GetToken();
-
-		if (x.empty())
+		if (!sep->GetToken(x))
 			return 0;
 	}