Author: Isomer <isomer@coders.net>

[ircu2.10.12-pk.git] / ircd / map.c

diff --git a/ircd/map.c b/ircd/map.c
index c4914ad83d2cee362b97e63d83e6663fcc5fb079..b4cfbf618f5849a99361e105c67d64ffcb1acef0 100644 (file)
--- a/ircd/map.c
+++ b/ircd/map.c
@@ -21,6 +21,7 @@
 #include "map.h"
 #include "client.h"
 #include "ircd.h"
+#include "ircd_reply.h"
 #include "list.h"
 #include "match.h"
 #include "numeric.h"
@@ -29,6 +30,7 @@
 #include "send.h"
 #include "struct.h"
 
+#include <stdio.h> /* sprintf */
 
 void dump_map(struct Client *cptr, struct Client *server, char *mask, int prompt_length)
 {
@@ -39,22 +41,18 @@ void dump_map(struct Client *cptr, struct Client *server, char *mask, int prompt
 
   *p = '\0';
   if (prompt_length > 60)
-    sendto_one(cptr, rpl_str(RPL_MAPMORE), me.name, cptr->name,
-        prompt, server->name);
+    send_reply(cptr, RPL_MAPMORE, prompt, server->name);
   else {
     char lag[512];
     if (server->serv->lag>10000)
-       strcpy(lag,"(--s)");
+       lag[0]=0;
     else if (server->serv->lag<0)
        strcpy(lag,"(0s)");
     else
        sprintf(lag,"(%is)",server->serv->lag);
-    sendto_one(cptr, rpl_str(RPL_MAP), me.name, cptr->name,
-        prompt, 
-       ((IsBurstOrBurstAck(server)) ? "*" : ""),
-        server->name, 
-        lag,
-        (server == &me) ? UserStats.local_clients : server->serv->clients);
+    send_reply(cptr, RPL_MAP, prompt, ((IsBurstOrBurstAck(server)) ? "*" : ""),
+              server->name, lag, (server == &me) ? UserStats.local_clients :
+              server->serv->clients);
   }
   if (prompt_length > 0)
   {
@@ -98,7 +96,7 @@ int m_map(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
     parv[1] = "*";
 
   dump_map(sptr, &me, parv[1], 0);
-  sendto_one(sptr, rpl_str(RPL_MAPEND), me.name, parv[0]);
+  sendto_one(sptr, rpl_str(RPL_MAPEND), me.name, parv[0]); /* XXX DEAD */
 
   return 0;
 }