Jesus, look who's the commit whore today. More header updates, and removal of namespa...

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

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 23e1e32671e2537ce2d795a4a2620ccb6b455eb5..2092d0f4ecbca73d780a4259ba893151bf4d33a9 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -2,23 +2,16 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "configreader.h"
-#include "globals.h"
 #include "dynamic.h"
 
 #ifndef STATIC_LINK
@@ -27,12 +20,7 @@ using namespace std;
 #include "modlist.h"
 #endif
 
-#include "inspstring.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
-#include <unistd.h>
-#include <sys/types.h>
-#include <stdio.h>
 
 DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
 {
@@ -45,13 +33,13 @@ DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
        }
 #ifdef STATIC_LINK
        this->staticname[0] = '\0';
-       log(DEBUG,"Loading core-compiled module '%s'",fname);
+       ServerInstance->Log(DEBUG,"Loading core-compiled module '%s'",fname);
        for (int j = 0; modsyms[j].name; j++)
        {
-               log(DEBUG,"Check %s",modsyms[j].name);
+               ServerInstance->Log(DEBUG,"Check %s",modsyms[j].name);
                if (!strcmp(modsyms[j].name,fname))
                {
-                       log(DEBUG,"Found %s",fname);
+                       ServerInstance->Log(DEBUG,"Found %s",fname);
                        strlcpy(this->staticname,fname,1020);
                        err = 0;
                        return;
@@ -59,67 +47,15 @@ DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
        }
        err = "Module is not statically compiled into the ircd";
 #else
-       // Copy the library to a temp location, this makes recompiles
-       // a little safer if the ircd is running at the time as the
-       // shared libraries are mmap()ed and not doing this causes
-       // segfaults.
-       FILE* x = fopen(fname,"rb");
-       if (!x)
-       {
-               err = strerror(errno);
-               return;
-       }
-       log(DEBUG,"Opened module file %s",fname);
-       char tmpfile_template[255];
-       char buffer[65536];
-       snprintf(tmpfile_template, 255, "%s/inspircd_file.so.%d.XXXXXXXXXX",ServerInstance->Config->TempDir,getpid());
-       int fd = mkstemp(tmpfile_template);
-       if (fd == -1)
-       {
-               fclose(x);
-               err = strerror(errno);
-               return;
-       }
-       log(DEBUG,"Copying %s to %s",fname, tmpfile_template);
-       while (!feof(x))
-       {
-               int n = fread(buffer, 1, 65535, x);
-               if (n)
-               {
-                       int written = write(fd,buffer,n);
-                       if (written != n)
-                       {
-                               fclose(x);
-                               err = strerror(errno);
-                               return;
-                       }
-               }
-       }
-       log(DEBUG,"Copied entire file.");
-       // Try to open the library now and get any error message.
-
-       if (close(fd) == -1)
-               err = strerror(errno);
-       if (fclose(x) == EOF)
-               err = strerror(errno);
-
        h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
        if (!h)
        {
-               log(DEBUG,"dlerror occured!");
                err = (char*)dlerror();
+               ServerInstance->Log(DEBUG,"dlerror '%s' occured!", err);
                return;
        }
 
-       log(DEBUG,"Finished loading '%s': %0x",tmpfile_template, h);
-
-       // We can delete the tempfile once it's loaded, leaving just the inode.
-       if (!err && !ServerInstance->Config->debugging)
-       {
-               log(DEBUG,"Deleteting %s",tmpfile_template);
-               if (unlink(tmpfile_template) == -1)
-                       err = strerror(errno);
-       }
+       ServerInstance->Log(DEBUG,"Finished loading '%s': %0x", fname, h);
 #endif
 }
 
@@ -138,12 +74,10 @@ DLLManager::~DLLManager()
 
 bool DLLManager::GetSymbol(initfunc* &v, const char *sym_name)
 {
-       log(DEBUG,"Symbol search...");
        for (int j = 0; modsyms[j].name; j++)
        {
                if (!strcmp(this->staticname,modsyms[j].name))
                {
-                       log(DEBUG,"Loading symbol...");
                        v = modsyms[j].value;
                        err = 0;
                        return true;
@@ -162,7 +96,6 @@ bool DLLManager::GetSymbol(void** v, const char* sym_name)
        
        if (h)
        {
-               log(DEBUG,"Found symbol %s", sym_name);
                dlerror(); // clear value
                *v = dlsym(h, sym_name);
                err = (char*)dlerror();