From 26018713913475aaaaac60a527fb93df76ec45c7 Mon Sep 17 00:00:00 2001 From: Naram Qashat Date: Mon, 20 Jun 2011 23:09:03 -0400 Subject: [PATCH] Fix long-standing issue with the get token functions if the delimiter wasn't found in the string but you wanted the first "token". --- src/misc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/misc.cpp b/src/misc.cpp index 73791a0cc..da07eaa28 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -416,7 +416,7 @@ bool isvalidchar(char c) Anope::string myStrGetToken(const Anope::string &str, char dilim, int token_number) { if (str.empty() || str.find(dilim) == Anope::string::npos) - return ""; + return token_number ? "" : str; Anope::string substring; sepstream sep(str, dilim); @@ -438,7 +438,7 @@ Anope::string myStrGetToken(const Anope::string &str, char dilim, int token_numb Anope::string myStrGetTokenRemainder(const Anope::string &str, const char dilim, int token_number) { if (str.empty() || str.find(dilim) == Anope::string::npos) - return ""; + return token_number ? "" : str; Anope::string substring; sepstream sep(str, dilim);