* +------------------------------------+
*
* 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.
*
* ---------------------------------------------------
*/
#include "inspircd.h"
#include "wildcard.h"
-void spy_userlist(userrec *user,chanrec *c)
+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:
}
};
+/** Handle /SPYNAMES
+ */
class cmd_spynames : public command_t
{
public:
CmdResult Handle (const char** parameters, int pcnt, userrec *user)
{
- chanrec* c;
+ chanrec* c = NULL;
if (!pcnt)
{
return CMD_FAILURE;
}
- if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 1))
+ if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
return CMD_FAILURE;
- ServerInstance->WriteOpers("*** Oper %s used SPYNAMES to view the users on %s",user->nick,parameters[0]);
-
c = ServerInstance->FindChan(parameters[0]);
if (c)
{
+ ServerInstance->WriteOpers("*** Oper %s used SPYNAMES to view the users on %s", user->nick, parameters[0]);
spy_userlist(user,c);
user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, c->name);
}
virtual Version GetVersion()
{
- return Version(1, 0, 0, 0, VF_VENDOR);
+ return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
}
};