Author: Kev <klmitch@mit.edu>

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

diff --git a/ircd/m_info.c b/ircd/m_info.c
index f06d0bb9a5e3dbfe2080cca5f10cd9b97f65f1e0..d1c28c9d82a411f44cb1784bfe7f86a136f8dd67 100644 (file)
--- a/ircd/m_info.c
+++ b/ircd/m_info.c
@@ -111,25 +111,26 @@ int m_info(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 {
   const char **text = infotext;
 
-  if (hunt_server(1, cptr, sptr, "%s%s " TOK_INFO " :%s", 1, parc, parv) == HUNTED_ISME)
+  if (hunt_server_cmd(sptr, CMD_INFO, cptr, 1, ":%C", 1, parc, parv) ==
+      HUNTED_ISME)
   {
     while (text[2])
     {
       if (!IsOper(sptr))
-        sendto_one(sptr, rpl_str(RPL_INFO), me.name, parv[0], *text);
+       send_reply(sptr, RPL_INFO, *text);
       text++;
     }
     if (IsOper(sptr))
     {
       while (*text)
-        sendto_one(sptr, rpl_str(RPL_INFO), me.name, parv[0], *text++);
-      sendto_one(sptr, rpl_str(RPL_INFO), me.name, parv[0], "");
+       send_reply(sptr, RPL_INFO, *text++);
+      send_reply(sptr, RPL_INFO, "");
     }
-    sendto_one(sptr, ":%s %d %s :Birth Date: %s, compile # %s",
-        me.name, RPL_INFO, parv[0], creation, generation);
-    sendto_one(sptr, ":%s %d %s :On-line since %s",
-        me.name, RPL_INFO, parv[0], myctime(me.firsttime));
-    sendto_one(sptr, rpl_str(RPL_ENDOFINFO), me.name, parv[0]);
+    send_reply(sptr, RPL_EXPLICIT | RPL_INFO, ":Birth Date: %s, compile # %s",
+              creation, generation);
+    send_reply(sptr, RPL_EXPLICIT | RPL_INFO, ":On-line since %s",
+              myctime(me.firsttime));
+    send_reply(sptr, RPL_ENDOFINFO);
   }
   return 0;
 }
@@ -147,25 +148,26 @@ int ms_info(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   if (IsServer(sptr))
     return 0;
 
-  if (hunt_server(1, cptr, sptr, "%s%s " TOK_INFO " :%s", 1, parc, parv) == HUNTED_ISME)
+  if (hunt_server_cmd(sptr, CMD_INFO, cptr, 1, ":%C", 1, parc, parv) ==
+      HUNTED_ISME)
   {
     while (text[2])
     {
       if (!IsOper(sptr))
-        sendto_one(sptr, rpl_str(RPL_INFO), me.name, parv[0], *text);
+       send_reply(sptr, RPL_INFO, *text);
       text++;
     }
     if (IsOper(sptr))
     {
       while (*text)
-        sendto_one(sptr, rpl_str(RPL_INFO), me.name, parv[0], *text++);
-      sendto_one(sptr, rpl_str(RPL_INFO), me.name, parv[0], "");
+       send_reply(sptr, RPL_INFO, *text++);
+      send_reply(sptr, RPL_INFO, "");
     }
-    sendto_one(sptr, ":%s %d %s :Birth Date: %s, compile # %s",
-        me.name, RPL_INFO, parv[0], creation, generation);
-    sendto_one(sptr, ":%s %d %s :On-line since %s",
-        me.name, RPL_INFO, parv[0], myctime(me.firsttime));
-    sendto_one(sptr, rpl_str(RPL_ENDOFINFO), me.name, parv[0]);
+    send_reply(sptr, RPL_EXPLICIT | RPL_INFO, ":Birth Date: %s, compile # %s",
+              creation, generation);
+    send_reply(sptr, RPL_EXPLICIT | RPL_INFO, ":On-line since %s",
+              myctime(me.firsttime));
+    send_reply(sptr, RPL_ENDOFINFO);
   }
   return 0;
 }
@@ -180,25 +182,26 @@ int mo_info(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 {
   const char **text = infotext;
 
-  if (hunt_server(1, cptr, sptr, "%s%s " TOK_INFO " :%s", 1, parc, parv) == HUNTED_ISME)
+  if (hunt_server_cmd(sptr, CMD_INFO, cptr, 1, ":%C", 1, parc, parv) ==
+      HUNTED_ISME)
   {
     while (text[2])
     {
       if (!IsOper(sptr))
-        sendto_one(sptr, rpl_str(RPL_INFO), me.name, parv[0], *text);
+       send_reply(sptr, RPL_INFO, *text);
       text++;
     }
     if (IsOper(sptr))
     {
       while (*text)
-        sendto_one(sptr, rpl_str(RPL_INFO), me.name, parv[0], *text++);
-      sendto_one(sptr, rpl_str(RPL_INFO), me.name, parv[0], "");
+       send_reply(sptr, RPL_INFO, *text++);
+      send_reply(sptr, RPL_INFO, "");
     }
-    sendto_one(sptr, ":%s %d %s :Birth Date: %s, compile # %s",
-        me.name, RPL_INFO, parv[0], creation, generation);
-    sendto_one(sptr, ":%s %d %s :On-line since %s",
-        me.name, RPL_INFO, parv[0], myctime(me.firsttime));
-    sendto_one(sptr, rpl_str(RPL_ENDOFINFO), me.name, parv[0]);
+    send_reply(sptr, RPL_EXPLICIT | RPL_INFO, ":Birth Date: %s, compile # %s",
+              creation, generation);
+    send_reply(sptr, RPL_EXPLICIT | RPL_INFO, ":On-line since %s",
+              myctime(me.firsttime));
+    send_reply(sptr, RPL_ENDOFINFO);
   }
   return 0;
 }
@@ -215,25 +218,25 @@ int m_info(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
 {
   const char **text = infotext;
 
-  if (hunt_server(1, cptr, sptr, "%s%s " TOK_INFO " :%s", 1, parc, parv) == HUNTED_ISME)
+  if (hunt_server(1, cptr, sptr, "%s%s " TOK_INFO " :%s", 1, parc, parv) == HUNTED_ISME) /* XXX DEAD */
   {
     while (text[2])
     {
       if (!IsOper(sptr))
-        sendto_one(sptr, rpl_str(RPL_INFO), me.name, parv[0], *text);
+        sendto_one(sptr, rpl_str(RPL_INFO), me.name, parv[0], *text); /* XXX DEAD */
       text++;
     }
     if (IsOper(sptr))
     {
       while (*text)
-        sendto_one(sptr, rpl_str(RPL_INFO), me.name, parv[0], *text++);
-      sendto_one(sptr, rpl_str(RPL_INFO), me.name, parv[0], "");
+        sendto_one(sptr, rpl_str(RPL_INFO), me.name, parv[0], *text++); /* XXX DEAD */
+      sendto_one(sptr, rpl_str(RPL_INFO), me.name, parv[0], ""); /* XXX DEAD */
     }
-    sendto_one(sptr, ":%s %d %s :Birth Date: %s, compile # %s",
+    sendto_one(sptr, ":%s %d %s :Birth Date: %s, compile # %s", /* XXX DEAD */
         me.name, RPL_INFO, parv[0], creation, generation);
-    sendto_one(sptr, ":%s %d %s :On-line since %s",
+    sendto_one(sptr, ":%s %d %s :On-line since %s", /* XXX DEAD */
         me.name, RPL_INFO, parv[0], myctime(me.firsttime));
-    sendto_one(sptr, rpl_str(RPL_ENDOFINFO), me.name, parv[0]);
+    sendto_one(sptr, rpl_str(RPL_ENDOFINFO), me.name, parv[0]); /* XXX DEAD */
   }
   return 0;
 }