X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/c88cdb00957d1bafae4587343b5ab7df14b75f8b..8097430a810ac1535fe5304f74991b16ff58b064:/modules/m_user.c

diff --git a/modules/m_user.c b/modules/m_user.c
index df6c359..2f792a7 100644
--- a/modules/m_user.c
+++ b/modules/m_user.c
@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"
@@ -35,7 +35,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 #include "blacklist.h"
 
 static int mr_user(struct Client *, struct Client *, int, const char **);
@@ -72,9 +71,9 @@ mr_user(struct Client *client_p, struct Client *source_p, int parc, const char *
 	if((p = strchr(parv[1], '@')))
 		*p = '\0';
 
-	ircsnprintf(buf, sizeof(buf), "%s %s", parv[2], parv[3]);
-	MyFree(source_p->localClient->fullcaps);
-	DupString(source_p->localClient->fullcaps, buf);
+	rb_snprintf(buf, sizeof(buf), "%s %s", parv[2], parv[3]);
+	rb_free(source_p->localClient->fullcaps);
+	source_p->localClient->fullcaps = rb_strdup(buf);
 
 	do_local_user(client_p, source_p, parv[1], parv[4]);
 	return 0;
@@ -97,14 +96,14 @@ do_local_user(struct Client *client_p, struct Client *source_p,
 		source_p->flags |= FLAGS_SENTUSER;
 	}
 
-	strlcpy(source_p->info, realname, sizeof(source_p->info));
+	rb_strlcpy(source_p->info, realname, sizeof(source_p->info));
 
 	if(!IsGotId(source_p))
 	{
 		/* This is in this location for a reason..If there is no identd
 		 * and ping cookies are enabled..we need to have a copy of this
 		 */
-		strlcpy(source_p->username, username, sizeof(source_p->username));
+		rb_strlcpy(source_p->username, username, sizeof(source_p->username));
 	}
 
 	if(source_p->name[0])