Fix total mess of makefile dependency macros (all depending on stuff they dont NEED...

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

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 833f538aea0189027b81c8d43803f94afc6558f3..b1c84e874eeaca703c06568530b29cdebd6930d9 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -2,40 +2,24 @@
  *       | 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-2008 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;
+/* $Core: libIRCDdynamic */
 
-#include "inspircd_config.h"
-#include "configreader.h"
-#include "globals.h"
+#include "inspircd.h"
 #include "dynamic.h"
-
-#ifndef STATIC_LINK
+#ifndef WIN32
 #include <dlfcn.h>
-#else
-#include "modlist.h"
 #endif
 
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include <unistd.h>
-#include <sys/types.h>
-#include <stdio.h>
-
-extern ServerConfig* Config;
-
-DLLManager::DLLManager(const char *fname)
+DLLManager::DLLManager(InspIRCd*, const char *fname)
 {
        err = NULL;
 
@@ -44,146 +28,40 @@ DLLManager::DLLManager(const char *fname)
                err = "This doesn't look like a module file to me...";
                return;
        }
-#ifdef STATIC_LINK
-       this->staticname[0] = '\0';
-       log(DEBUG,"Loading core-compiled module '%s'",fname);
-       for (int j = 0; modsyms[j].name; j++)
-       {
-               log(DEBUG,"Check %s",modsyms[j].name);
-               if (!strcmp(modsyms[j].name,fname))
-               {
-                       log(DEBUG,"Found %s",fname);
-                       strlcpy(this->staticname,fname,1020);
-                       err = 0;
-                       return;
-               }
-       }
-       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;
-       }
-       char tmpfile_template[255];
-       char buffer[65536];
-       snprintf(tmpfile_template, 255, "%s/inspircd_file.so.%d.XXXXXXXXXX",Config->TempDir,getpid());
-       int fd = mkstemp(tmpfile_template);
-       if (fd == -1)
-       {
-               fclose(x);
-               err = strerror(errno);
-               return;
-       }
-       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;
-                       }
-               }
-       }
-       // Try to open the library now and get any error message.
-       
-       h = dlopen(tmpfile_template, RTLD_NOW );
 
+       h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
        if (!h)
        {
-               err = dlerror();
+               err = (char*)dlerror();
                return;
        }
-       if (close(fd) == -1)
-               err = strerror(errno);
-       if (fclose(x) == EOF)
-               err = strerror(errno);
-
-       // We can delete the tempfile once it's loaded, leaving just the inode.
-       if (!err && !Config->debugging)
-       {
-               if (unlink(tmpfile_template) == -1)
-                       err = strerror(errno);
-       }
-#endif
 }
 
 DLLManager::~DLLManager()
 {
-#ifndef STATIC_LINK
-       // close the library if it isn't null
-       if (h != 0)
-       dlclose(h);
-#endif
+       /* close the library */
+       if (h)
+               dlclose(h);
 }
 
 
 
-#ifdef STATIC_LINK
-
-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;
-               }
-       }
-       err = "Module symbol missing from the core";
-       return false;
-}
-
-#else
-
 bool DLLManager::GetSymbol(void** v, const char* sym_name)
 {
-       // try extract a symbol from the library
-       // get any error message is there is any
+       /*
+        * try extract a symbol from the library
+        * get any error message is there is any
+        */
        
        if (h)
        {
+               dlerror(); // clear value
                *v = dlsym(h, sym_name);
-               err = dlerror();
-               return !err;
-       }
-       else
-       {       
-               return false;
+               err = (char*)dlerror();
+               if (!*v || err)
+                       return false;
        }
-}
-
-#endif
-
-DLLFactoryBase::DLLFactoryBase(const char* fname, const char* factory) : DLLManager(fname)
-{
-       // try get the factory function if there is no error yet
-       factory_func = 0;
        
-       if (!LastError())
-       {
-#ifdef STATIC_LINK
-               GetSymbol( factory_func, factory ? factory : "init_module" );
-#else
-               GetSymbol( (void **)&factory_func, factory ? factory : "init_module" );
-#endif
-       }
-}
-
-
-DLLFactoryBase::~DLLFactoryBase()
-{
+       /* succeeded :) */
+       return true;
 }