Added <oper:swhois> to m_swhois, which will override <type:swhois> if specified

[user/henk/code/inspircd.git] / src / modules / m_spy.cpp

diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp
index 1698b16e24fce3626c1ac274b537ff1f514dc077..5cfcfba619b01ac3f9d2bff1519fa7c1a19a835b 100644 (file)
--- a/src/modules/m_spy.cpp
+++ b/src/modules/m_spy.cpp
@@ -3,13 +3,13 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *               <Craig@chatspike.net>
  *     
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -32,36 +32,51 @@ using namespace std;
 
 void spy_userlist(userrec *user, chanrec *c)
 {
-       static char list[MAXBUF];
+       char list[MAXBUF];
+       size_t dlen, curlen;
 
-       if (!c || !user)
-               return;
+       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
 
-       snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
+       int numusers = 0;
+       char* ptr = list + dlen;
 
        CUList *ulist= c->GetUsers();
+
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               strlcat(list,c->GetPrefixChar(i->second),MAXBUF);
-               strlcat(list,i->second->nick,MAXBUF);
-               strlcat(list," ",MAXBUF);
-               if (strlen(list)>(480-NICKMAX))
+               size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", c->GetPrefixChar(i->second), i->second->nick);
+
+               curlen += ptrlen;
+               ptr += ptrlen;
+
+               numusers++;
+
+               if (curlen > (480-NICKMAX))
                {
-                       /* list overflowed into
-                        * multiple numerics */
+                       /* list overflowed into multiple numerics */
                        user->WriteServ(std::string(list));
-                       snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
+
+                       /* reset our lengths */
+                       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
+                       ptr = list + dlen;
+
+                       ptrlen = 0;
+                       numusers = 0;
                }
        }
+
        /* if whats left in the list isnt empty, send it */
-       if (list[strlen(list)-1] != ':')
+       if (numusers)
        {
                user->WriteServ(std::string(list));
        }
-}
 
+       user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, c->name);
 
+}
 
+/** Handle /SPYLIST
+ */
 class cmd_spylist : public command_t
 {
   public:
@@ -88,6 +103,8 @@ class cmd_spylist : public command_t
        }
 };
 
+/** Handle /SPYNAMES
+ */
 class cmd_spynames : public command_t
 {
   public:
@@ -146,7 +163,7 @@ class ModuleSpy : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 0, VF_VENDOR);
+               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
        }
 };