X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/637c4932f6bf6f68f52ab24501aa199d6bb1f555..43946961df9e7703c8877e4bbd9181507422429d:/modules/m_capab.c?ds=sidebyside diff --git a/modules/m_capab.c b/modules/m_capab.c index 4c56d8f8..3bc93724 100644 --- a/modules/m_capab.c +++ b/modules/m_capab.c @@ -26,7 +26,7 @@ #include "stdinc.h" #include "client.h" -#include "irc_string.h" +#include "match.h" #include "s_serv.h" #include "s_conf.h" #include "msg.h" @@ -79,12 +79,12 @@ mr_capab(struct Client *client_p, struct Client *source_p, int parc, const char client_p->localClient->caps |= CAP_CAP; rb_free(client_p->localClient->fullcaps); - DupString(client_p->localClient->fullcaps, parv[1]); + client_p->localClient->fullcaps = rb_strdup(parv[1]); 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 +119,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++) {