Remove InspIRCd* parameters and fields

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

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index c9742082047d07d93bd7229778294b101369bef9..8731489c435cc5761f0a452b2ca6dbd5fedbaa90 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -2,79 +2,66 @@
  *       | 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.
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include "globals.h"
-#include <dlfcn.h>
-#include "dynamic.h"
-
+/* $Core */
 
+#include "inspircd.h"
+#include "dynamic.h"
+#ifndef WIN32
+#include <dlfcn.h>
+#endif
 
 DLLManager::DLLManager(const char *fname)
 {
-    // Try to open the library now and get any error message.
-       
-       h=dlopen( fname, RTLD_NOW );
-       err=dlerror();
-}
-
-DLLManager::~DLLManager()
-{
-       // close the library if it isn't null
-       if (h!=0)
-       dlclose(h);
-}
-
+       err = NULL;
 
-bool DLLManager::GetSymbol(void **v, const char *sym_name)
-{
-       // try extract a symbol from the library
-       // get any error message is there is any
-       
-       if( h!=0 )
+       if (!strstr(fname,".so"))
        {
-               *v = dlsym( h, sym_name );
-       err=dlerror();
-           if( err==0 )
-                 return true;
-       else
-         return false;
+               err = "This doesn't look like a module file to me...";
+               return;
        }
-       else
-       {       
-        return false;
+
+       h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
+       if (!h)
+       {
+               err = dlerror();
+               return;
        }
-       
 }
 
-
-DLLFactoryBase::DLLFactoryBase(const char *fname, const char *factory) : DLLManager(fname)
+DLLManager::~DLLManager()
 {
-       // try get the factory function if there is no error yet
-       
-       factory_func=0;
-       
-       if( LastError()==0 )
-       {               
-       GetSymbol( (void **)&factory_func, factory ? factory : "init_module" );
-       }
-       
+       /* close the library */
+       if (h)
+               dlclose(h);
 }
 
 
-DLLFactoryBase::~DLLFactoryBase()
-{
-}
 
+bool DLLManager::GetSymbol(void** v, const char* sym_name)
+{
+       /*
+        * 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();
+               if (!*v || err)
+                       return false;
+       }
 
+       /* succeeded :) */
+       return true;
+}