Fixed strange join behavior reported by w00t (mirc requesting MODE immediately after...

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

diff --git a/src/channels.cpp b/src/channels.cpp
index 86df2124a9c5daadba540a97a84cd136a931556b..05bc7fa0d24623c6d0b010e56670fac5d73cf6bf 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -1,3 +1,19 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *                       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.
+ *
+ * ---------------------------------------------------
+ */
+
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
@@ -34,6 +50,7 @@
 #include "message.h"
 #include "mode.h"
 #include "xline.h"
+#include "inspstring.h"
 
 #ifdef GCC3
 #define nspace __gnu_cxx
@@ -44,8 +61,8 @@
 using namespace std;
 
 extern int MODCOUNT;
-extern vector<Module*> modules;
-extern vector<ircd_module*> factory;
+extern std::vector<Module*> modules;
+extern std::vector<ircd_module*> factory;
 
 extern int LogLevel;
 extern char ServerName[MAXBUF];
@@ -74,7 +91,6 @@ extern time_t nb_start;
 extern std::vector<int> fd_reap;
 extern std::vector<std::string> module_names;
 
-extern char bannerBuffer[MAXBUF];
 extern int boundPortCount;
 extern int portCount;
 extern int UDPportCount;
@@ -88,6 +104,7 @@ extern serverrec* me[32];
 
 extern FILE *log_file;
 
+extern time_t TIME;
 
 using namespace std;
 
@@ -112,21 +129,18 @@ void chanrec::SetCustomMode(char mode,bool mode_on)
                m[1] = '\0';
                if (!strchr(this->custom_modes,mode))
                {
-                       strncat(custom_modes,m,MAXMODES);
+                       strlcat(custom_modes,m,MAXMODES);
                }
                log(DEBUG,"Custom mode %c set",mode);
        }
        else {
-               char temp[MAXBUF];
-               int count = 0;
-               for (int q = 0; q < strlen(custom_modes); q++) {
-                       if (custom_modes[q] != mode) {
-                               temp[count++] = mode;
-                       }
-               }
-               temp[count] = '\0';
-               strncpy(custom_modes,temp,MAXMODES);
-               log(DEBUG,"Custom mode %c removed",mode);
+
+               std::string a = this->custom_modes;
+               int pos = a.find(mode);
+               a.erase(pos,1);
+               strncpy(this->custom_modes,a.c_str(),MAXMODES);
+
+               log(DEBUG,"Custom mode %c removed: modelist='%s'",mode,this->custom_modes);
                this->SetCustomModeParam(mode,"",false);
        }
 }
@@ -138,8 +152,8 @@ void chanrec::SetCustomModeParam(char mode,char* parameter,bool mode_on)
        log(DEBUG,"SetCustomModeParam called");
        ModeParameter M;
        M.mode = mode;
-       strcpy(M.channel,this->name);
-       strcpy(M.parameter,parameter);
+       strlcpy(M.channel,this->name,CHANMAX);
+       strlcpy(M.parameter,parameter,MAXBUF);
        if (mode_on)
        {
                log(DEBUG,"Custom mode parameter %c %s added",mode,parameter);