#include "stdinc.h"
#include "client.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
#include "ircd.h"
#include "numeric.h"
#include "send.h"
current_insert_point2 = buf2;
*buf2 = '\0';
- ircsprintf(buf, form_str(RPL_ISON), me.name, source_p->name);
+ rb_sprintf(buf, form_str(RPL_ISON), me.name, source_p->name);
len = strlen(buf);
current_insert_point = buf + len;
for (i = 1; i < parc; i++)
{
char *cs = LOCAL_COPY(parv[i]);
- for (nick = strtoken(&p, cs, " "); nick; nick = strtoken(&p, NULL, " "))
+ for (nick = rb_strtok_r(cs, " ", &p); nick; nick = rb_strtok_r(NULL, " ", &p))
{
target_p = find_named_client(nick);