m_mysql Fix escaping strings longer than MAXBUF/2

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 0a3bc1820a2a6bb0e61e966cf620bd99a8c94b1a..1403cdef5a5805b10b22c08810839a22cc8a58af 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -355,6 +355,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        this->Modes = 0;
        this->Res = 0;
        this->ConfigThread = NULL;
+       this->FakeClient = NULL;
 
        UpdateTime();
        this->startup_time = TIME.tv_sec;
@@ -374,8 +375,6 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        // Create base manager classes early, so nothing breaks
        this->Users = new UserManager;
 
-       this->Users->unregistered_count = 0;
-
        this->Users->clientlist = new user_hash();
        this->Users->uuidlist = new user_hash();
        this->chanlist = new chan_hash();
@@ -426,7 +425,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        };
 
        int index;
-       while ((c = getopt_long(argc, argv, ":f:", longopts, &index)) != -1)
+       while ((c = getopt_long(argc, argv, ":c:f:", longopts, &index)) != -1)
        {
                switch (c)
                {
@@ -510,7 +509,8 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        std::cout << con_green << "(C) InspIRCd Development Team." << con_reset << std::endl << std::endl;
        std::cout << "Developers:" << std::endl;
        std::cout << con_green << "\tBrain, FrostyCoolSlug, w00t, Om, Special, peavey" << std::endl;
-       std::cout << "\taquanight, psychon, dz, danieldg, jackmcbarn" << con_reset << std::endl << std::endl;
+       std::cout << "\taquanight, psychon, dz, danieldg, jackmcbarn" << std::endl;\r
+       std::cout << "\tAttila" << con_reset << std::endl << std::endl;
        std::cout << "Others:\t\t\t" << con_green << "See /INFO Output" << con_reset << std::endl;
 
        this->Modes = new ModeParser;
@@ -630,18 +630,17 @@ InspIRCd::InspIRCd(int argc, char** argv) :
         */
        if ((!do_nofork) && (!do_testsuite) && (!Config->cmdline.forcedebug))
        {
-               int fd;
+               int fd = open("/dev/null", O_RDWR);
 
                fclose(stdin);
                fclose(stderr);
                fclose(stdout);
 
-               fd = open("/dev/null", O_RDWR);
-               if (dup2(fd, 0) < 0)
+               if (dup2(fd, STDIN_FILENO) < 0)
                        Logs->Log("STARTUP", DEFAULT, "Failed to dup /dev/null to stdin.");
-               if (dup2(fd, 1) < 0)
+               if (dup2(fd, STDOUT_FILENO) < 0)
                        Logs->Log("STARTUP", DEFAULT, "Failed to dup /dev/null to stdout.");
-               if (dup2(fd, 2) < 0)
+               if (dup2(fd, STDERR_FILENO) < 0)
                        Logs->Log("STARTUP", DEFAULT, "Failed to dup /dev/null to stderr.");
                close(fd);
        }
@@ -789,7 +788,6 @@ int InspIRCd::Run()
                 */
                if (TIME.tv_sec != OLDTIME)
                {
-                       OLDTIME = TIME.tv_sec;
 #ifndef _WIN32
                        getrusage(RUSAGE_SELF, &ru);
                        stats->LastSampled = TIME;
@@ -816,6 +814,8 @@ int InspIRCd::Run()
                        {
                                SNO->WriteToSnoMask('d', "\002EH?!\002 -- Time is jumping FORWARDS! Clock skipped %lu secs.", (unsigned long)TIME.tv_sec - OLDTIME);
                        }
+\r
+                       OLDTIME = TIME.tv_sec;
 
                        if ((TIME.tv_sec % 3600) == 0)
                        {