X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/bba1d5ba04c5af45313322a59c514d1f40f9f793..ea84bfdefffd4f120799ab6854ef78ea3766d986:/modules/m_capab.c

diff --git a/modules/m_capab.c b/modules/m_capab.c
index ae9edc8..8d078b5 100644
--- a/modules/m_capab.c
+++ b/modules/m_capab.c
@@ -1,6 +1,6 @@
 /*
  *  ircd-ratbox: A slightly useful ircd.
- *  m_away.c: Negotiates capabilities with a remote server.
+ *  m_capab.c: Negotiates capabilities with a remote server.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
  *  Copyright (C) 1996-2002 Hybrid Development Team
@@ -21,12 +21,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_capab.c 1295 2006-05-08 13:05:25Z nenolod $
  */
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "s_serv.h"
 #include "s_conf.h"
 #include "msg.h"
@@ -50,7 +49,6 @@ DECLARE_MODULE_AV1(capab, NULL, NULL, capab_clist, NULL, NULL, "$Revision: 1295
 
 /*
  * mr_capab - CAPAB message handler
- *      parv[0] = sender prefix
  *      parv[1] = space-separated list of capabilities
  *
  */
@@ -84,7 +82,7 @@ mr_capab(struct Client *client_p, struct Client *source_p, int parc, const char
 	for (i = 1; i < parc; i++)
 	{
 		char *t = LOCAL_COPY(parv[i]);
-		for (s = strtoken(&p, t, " "); s; s = strtoken(&p, NULL, " "))
+		for (s = rb_strtok_r(t, " ", &p); s; s = rb_strtok_r(NULL, " ", &p))
 		{
 			for (cap = captab; cap->name; cap++)
 			{
@@ -119,9 +117,9 @@ me_gcap(struct Client *client_p, struct Client *source_p,
 		rb_free(source_p->serv->fullcaps);
 	}
 
-	DupString(source_p->serv->fullcaps, parv[1]);
+	source_p->serv->fullcaps = rb_strdup(parv[1]);
 
-	for (s = strtoken(&p, t, " "); s; s = strtoken(&p, NULL, " "))
+	for (s = rb_strtok_r(t, " ", &p); s; s = rb_strtok_r(NULL, " ", &p))
 	{
 		for (cap = captab; cap->name; cap++)
 		{