X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/c127b45b83ee6e7f53b57cd81340cb668fbeabb4..53b209c748704d0c1ca40fba931d9af83a15eaf3:/modules/m_userhost.c

diff --git a/modules/m_userhost.c b/modules/m_userhost.c
index 108974e7..6b0a9ac1 100644
--- a/modules/m_userhost.c
+++ b/modules/m_userhost.c
@@ -20,8 +20,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: m_userhost.c 254 2005-09-21 23:35:12Z nenolod $
  */
 
 #include "stdinc.h"
@@ -35,26 +33,31 @@
 #include "parse.h"
 #include "modules.h"
 #include "s_conf.h"
+#include "s_newconf.h"
+
+static const char userhost_desc[] =
+	"Provides the USERHOST command to show a user's host";
 
 static char buf[BUFSIZE];
 
-static int m_userhost(struct Client *, struct Client *, int, const char **);
+static void m_userhost(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message userhost_msgtab = {
-	"USERHOST", 0, 0, 0, MFLG_SLOW,
+	"USERHOST", 0, 0, 0, 0,
 	{mg_unreg, {m_userhost, 2}, mg_ignore, mg_ignore, mg_ignore, {m_userhost, 2}}
 };
 
 mapi_clist_av1 userhost_clist[] = { &userhost_msgtab, NULL };
-DECLARE_MODULE_AV1(userhost, NULL, NULL, userhost_clist, NULL, NULL, "$Revision: 254 $");
+
+DECLARE_MODULE_AV2(userhost, NULL, NULL, userhost_clist, NULL, NULL, NULL, NULL, userhost_desc);
 
 /*
  * m_userhost added by Darren Reed 13/8/91 to aid clients and reduce
  * the need for complicated requests like WHOIS. It returns user/host
  * information only (no spurious AWAY labels or channels).
  */
-static int
-m_userhost(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+m_userhost(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Client *target_p;
 	char response[NICKLEN * 2 + USERLEN + HOSTLEN + 30];
@@ -63,7 +66,7 @@ m_userhost(struct Client *client_p, struct Client *source_p, int parc, const cha
 	int cur_len;
 	int rl;
 
-	cur_len = rb_sprintf(buf, form_str(RPL_USERHOST), me.name, source_p->name, "");
+	cur_len = sprintf(buf, form_str(RPL_USERHOST), me.name, source_p->name, "");
 	t = buf + cur_len;
 
 	for (i = 1; i <= 5; i++)
@@ -81,25 +84,25 @@ m_userhost(struct Client *client_p, struct Client *source_p, int parc, const cha
 			 */
 			if(MyClient(target_p) && (target_p == source_p))
 			{
-				rl = rb_sprintf(response, "%s%s=%c%s@%s ",
+				rl = sprintf(response, "%s%s=%c%s@%s ",
 						target_p->name,
-						IsOper(target_p) ? "*" : "",
+						SeesOper(target_p, source_p) ? "*" : "",
 						(target_p->user->away) ? '-' : '+',
 						target_p->username,
 						target_p->sockhost);
 			}
 			else
 			{
-				rl = rb_sprintf(response, "%s%s=%c%s@%s ",
+				rl = sprintf(response, "%s%s=%c%s@%s ",
 						target_p->name,
-						IsOper(target_p) ? "*" : "",
+						SeesOper(target_p, source_p) ? "*" : "",
 						(target_p->user->away) ? '-' : '+',
 						target_p->username, target_p->host);
 			}
 
 			if((rl + cur_len) < (BUFSIZE - 10))
 			{
-				rb_sprintf(t, "%s", response);
+				sprintf(t, "%s", response);
 				t += rl;
 				cur_len += rl;
 			}
@@ -109,6 +112,4 @@ m_userhost(struct Client *client_p, struct Client *source_p, int parc, const cha
 	}
 
 	sendto_one(source_p, "%s", buf);
-
-	return 0;
 }