And more

[user/henk/code/inspircd.git] / src / helperfuncs.cpp

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index effffd6e9fb7fa6a8981d354743b7558d5e2a4a2..9157a7f62450379655528cf36870dd11bcf8c252 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -55,7 +55,6 @@ extern ServerConfig *Config;
 extern InspIRCd* ServerInstance;
 extern time_t TIME;
 extern char lowermap[255];
-static char list[MAXBUF];
 extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 static char already_sent[MAX_DESCRIPTORS];
 extern std::vector<userrec*> all_opers;
@@ -990,15 +989,18 @@ void ServerNoticeAll(char* text, ...)
                return;
 
        char textbuffer[MAXBUF];
+       char formatbuffer[MAXBUF];
        va_list argsPtr;
        va_start (argsPtr, text);
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
+       snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer);
+
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                userrec* t = (userrec*)(*i);
-               WriteServ(t->fd,"NOTICE $%s :%s",Config->ServerName,textbuffer);
+               WriteServ_NoFormat(t->fd,formatbuffer);
        }
 }
 
@@ -1008,15 +1010,18 @@ void ServerPrivmsgAll(char* text, ...)
                return;
 
        char textbuffer[MAXBUF];
+       char formatbuffer[MAXBUF];
        va_list argsPtr;
        va_start (argsPtr, text);
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
+       snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer);
+
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                userrec* t = (userrec*)(*i);
-               WriteServ(t->fd,"PRIVMSG $%s :%s",Config->ServerName,textbuffer);
+               WriteServ_NoFormat(t->fd,formatbuffer);
        }
 }
 
@@ -1079,6 +1084,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...)
 void NoticeAll(userrec *source, bool local_only, char* text, ...)
 {
        char textbuffer[MAXBUF];
+       char formatbuffer[MAXBUF];
        va_list argsPtr;
 
        if ((!text) || (!source))
@@ -1091,10 +1097,12 @@ void NoticeAll(userrec *source, bool local_only, char* text, ...)
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
+       snprintf(formatbuffer,MAXBUF,"NOTICE $* :%s",textbuffer);
+
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                userrec* t = (userrec*)(*i);
-               WriteFrom(t->fd,source,"NOTICE $* :%s",textbuffer);
+               WriteFrom_NoFormat(t->fd,source,formatbuffer);
        }
 }
 
@@ -1102,6 +1110,7 @@ void NoticeAll(userrec *source, bool local_only, char* text, ...)
 void WriteWallOps(userrec *source, bool local_only, char* text, ...)
 {
        char textbuffer[MAXBUF];
+       char formatbuffer[MAXBUF];
        va_list argsPtr;
 
        if ((!text) || (!source))
@@ -1114,13 +1123,15 @@ void WriteWallOps(userrec *source, bool local_only, char* text, ...)
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
+       snprintf(formatbuffer,MAXBUF,"WALLOPS :%s",textbuffer);
+
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                userrec* t = (userrec*)(*i);
 
                if ((IS_LOCAL(t)) && (t->modebits & UM_WALLOPS))
                {
-                       WriteTo(source,t,"WALLOPS :%s",textbuffer);
+                       WriteTo_NoFormat(source,t,formatbuffer);
                }
        }
 }
@@ -1145,7 +1156,7 @@ void strlower(char *n)
 
 /* Find a user record by nickname and return a pointer to it */
 
-userrec* Find(std::string nick)
+userrec* Find(const std::string &nick)
 {
        user_hash::iterator iter = clientlist.find(nick);
 
@@ -1323,8 +1334,13 @@ void userlist(userrec *user,chanrec *c)
                return;
        }
 
-       size_t dlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
-       size_t initial = dlen;
+       char list[MAXBUF];
+       size_t dlen, curlen;
+
+       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
+
+       int numusers = 0;
+       char* ptr = list + dlen;
 
        CUList *ulist= c->GetUsers();
 
@@ -1344,21 +1360,29 @@ void userlist(userrec *user,chanrec *c)
                        continue;
                }
 
-               dlen += strlcat(list,cmode(i->second,c),MAXBUF);
-               dlen += strlcat(list,i->second->nick,MAXBUF);
-               charlcat(list,' ',MAXBUF);
-               dlen++;
+               size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", cmode(i->second, c), i->second->nick);
+
+               curlen += ptrlen;
+               ptr += ptrlen;
+
+               numusers++;
 
-               if (dlen > (480-NICKMAX))
+               if (curlen > (480-NICKMAX))
                {
                        /* list overflowed into multiple numerics */
                        WriteServ_NoFormat(user->fd,list);
-                       dlen = 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 (dlen != initial)
+       if (numusers)
        {
                WriteServ_NoFormat(user->fd,list);
        }
@@ -1378,7 +1402,7 @@ int usercount_i(chanrec *c)
        CUList *ulist= c->GetUsers();
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               if (i->second->modebits & UM_INVISIBLE)
+               if (!(i->second->modebits & UM_INVISIBLE))
                        count++;
        }