Automated merge with ssh://hg.atheme.org//hg/charybdis

[irc/rqf/shadowircd.git] / modules / core / m_part.c

diff --git a/modules/core/m_part.c b/modules/core/m_part.c
index d7536d767bcf5f6b9391582c8c8ba49b01ac1825..64e9b35d7576991a668b512fad640ef9ae36d700 100644 (file)
--- a/modules/core/m_part.c
+++ b/modules/core/m_part.c
@@ -29,7 +29,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
@@ -39,6 +39,7 @@
 #include "modules.h"
 #include "s_conf.h"
 #include "packet.h"
+#include "inline/stringops.h"
 
 static int m_part(struct Client *, struct Client *, int, const char **);
 
@@ -71,9 +72,9 @@ m_part(struct Client *client_p, struct Client *source_p, int parc, const char *p
        reason[0] = '\0';
 
        if(parc > 2)
-               strlcpy(reason, parv[2], sizeof(reason));
+               rb_strlcpy(reason, parv[2], sizeof(reason));
 
-       name = strtoken(&p, s, ",");
+       name = rb_strtok_r(s, ",", &p);
 
        /* Finish the flood grace period... */
        if(MyClient(source_p) && !IsFloodDone(source_p))
@@ -84,7 +85,7 @@ m_part(struct Client *client_p, struct Client *source_p, int parc, const char *p
        while(name)
        {
                part_one_client(client_p, source_p, name, reason);
-               name = strtoken(&p, NULL, ",");
+               name = rb_strtok_r(NULL, ",", &p);
        }
        return 0;
 }