BUILD : 1.7.18 (1227) BUGS : 667 NOTES : Fixed inspircd11.c using strtok_r - myStrGetToken is more compatible (strtok_r does not work on windows)

git-svn-id: svn://svn.anope.org/anope/trunk@1227 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@946 5417fbe8-f217-4b02-8779-1006273d7864

3 files changed, 13 insertions, 7 deletions

diff --git a/Changes b/Changes
index 234b65d9b..68e0eb933 100644
--- a/Changes
+++ b/Changes
@@ -11,6 +11,7 @@ Anope Version  S V N
 01/10 F CHAN_SYMBOL_REQUIRED claimed one can register local (&) channels. [#666]
 01/10 F BotServ kicks now obeys the channel's SignKick option.            [#663]
 01/15 F Only send PONG during MySQL save when we're not syncing.          [#669]
+01/15 F InspIRCD 1.1 protocol module used windows incompatible strtok_r.  [#667]
 
 Anope Version 1.7.18
 --------------------
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 9aa36b4ad..45de2111b 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -721,16 +721,16 @@ int anope_event_fjoin(char *source, int ac, char **av)
     /* temporary buffer */
     char prefixandnick[60];
 
-    /* temporary pointer, not used except for strtok_r */
-    char *lasts;
-
     *nicklist = '\0';
     *prefixandnick = '\0';
+	
+	/* value used for myStrGetToken */
+	int curtoken = 0;
 
     if (ac < 3)
         return MOD_CONT;
-
-    curnick = strtok_r(av[2], " ", &lasts);
+	
+	curnick = myStrGetToken(av[2], ' ', curtoken);
     while (curnick != NULL) {
         for (; *curnick; curnick++) {
             /* I bet theres a better way to do this... */
@@ -753,7 +753,8 @@ int anope_event_fjoin(char *source, int ac, char **av)
         }
         strncat(nicklist, prefixandnick, 513);
         strncat(nicklist, " ", 513);
-        curnick = strtok_r(NULL, " ", &lasts);
+		curtoken++;
+		curnick = myStrGetToken(av[2], ' ', curtoken);
         nlen = 0;
     }
 
diff --git a/version.log b/version.log
index bbade0797..134921f3e 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="18"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1226"
+VERSION_BUILD="1227"
 
 # $Log$
 #
+# BUILD : 1.7.18 (1227)
+# BUGS  : 667
+# NOTES : Fixed inspircd11.c using strtok_r - myStrGetToken is more compatible (strtok_r does not work on windows)
+#
 # BUILD : 1.7.18 (1226)
 # BUGS  : 668
 # NOTES : Fixed win32 makefile for the inspircd protocol module changes