Missing a changeover

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 27bc22007c752c007fab1fd9d6c81207110f328f..cae073ff421aa0f29b181a80e7e22da2a4411adb 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;
@@ -975,7 +974,7 @@ void WriteOpers(char* text, ...)
 
                if (IS_LOCAL(a))
                {
-                       if (strchr(a->modes,'s'))
+                       if (a->modebits & UM_SERVERNOTICE)
                        {
                                // send server notices to all with +s
                                WriteServ(a->fd,"NOTICE %s :%s",a->nick,textbuffer);
@@ -1118,7 +1117,7 @@ void WriteWallOps(userrec *source, bool local_only, char* text, ...)
        {
                userrec* t = (userrec*)(*i);
 
-               if ((IS_LOCAL(t)) && (strchr(t->modes,'w')))
+               if ((IS_LOCAL(t)) && (t->modebits & UM_WALLOPS))
                {
                        WriteTo(source,t,"WALLOPS :%s",textbuffer);
                }
@@ -1323,8 +1322,10 @@ void userlist(userrec *user,chanrec *c)
                return;
        }
 
+       char list[MAXBUF];
        size_t dlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
-       size_t initial = dlen;
+       int numusers = 0;
+       char* ptr = list + dlen - 1;
 
        CUList *ulist= c->GetUsers();
 
@@ -1335,7 +1336,7 @@ void userlist(userrec *user,chanrec *c)
 
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               if ((!has_user) && (strchr(i->second->modes,'i')))
+               if ((!has_user) && (i->second->modebits & UM_INVISIBLE))
                {
                        /*
                         * user is +i, and source not on the channel, does not show
@@ -1344,21 +1345,28 @@ 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++;
+               const char* n = cmode(i->second,c);
+               if (*n)
+                       *ptr++ = *n;
+               for (char* t = i->second->nick; *t; t++)
+                       *ptr++ = *t;
+               *ptr++ = ' ';
+               numusers++;
 
-               if (dlen > (480-NICKMAX))
+               if ((ptr - list) > (480-NICKMAX))
                {
                        /* list overflowed into multiple numerics */
+                       *--ptr = 0;
                        WriteServ_NoFormat(user->fd,list);
                        dlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
+                       ptr = list + dlen - 1;
+                       numusers = 0;
                }
        }
+       *--ptr = 0;
 
        /* if whats left in the list isnt empty, send it */
-       if (dlen != initial)
+       if (numusers)
        {
                WriteServ_NoFormat(user->fd,list);
        }
@@ -1378,7 +1386,7 @@ int usercount_i(chanrec *c)
        CUList *ulist= c->GetUsers();
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               if (!strchr(i->second->modes,'i'))
+               if (!(i->second->modebits & UM_INVISIBLE))
                        count++;
        }
 
@@ -1467,7 +1475,7 @@ int usercount_invisible(void)
 
        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
        {
-               if ((i->second->registered == 7) && (strchr(i->second->modes,'i')))
+               if ((i->second->registered == 7) && (i->second->modebits & UM_INVISIBLE))
                        c++;
        }