X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=01daaee86b6dfc1262e9e388efc1256ac461d77d;hb=2b51585f8be4fe954b07416f75787ca48f1f1a27;hp=d18854dc6ada1a2c155328b85621eff8077c396f;hpb=e81bad456aa55af8b0cb31d2ffeb0672ff0c6bbf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index d18854dc6..01daaee86 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -1,64 +1,85 @@
-#include "globals.h"
-#include <dlfcn.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
+#include "configreader.h"
 #include "dynamic.h"
+#ifndef WIN32
+#include <dlfcn.h>
+#endif
 
+DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
+{
+	err = NULL;
 
+	if (!strstr(fname,".so"))
+	{
+		err = "This doesn't look like a module file to me...";
+		return;
+	}
 
-DLLManager::DLLManager(const char *fname)
-{
-    // Try to open the library now and get any error message.
-	
-	h=dlopen( fname, RTLD_NOW );
-	err=dlerror();
+	h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
+	if (!h)
+	{
+		err = (char*)dlerror();
+		return;
+	}
 }
 
 DLLManager::~DLLManager()
 {
-	// close the library if it isn't null
-	if( h!=0 )
-    	dlclose(h);
+	/* close the library */
+	if (h)
+		dlclose(h);
 }
 
 
-bool DLLManager::GetSymbol(void **v, const char *sym_name)
+
+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!=0 )
+	if (h)
 	{
-		*v = dlsym( h, sym_name );
-    	err=dlerror();
-	    if( err==0 )
-       	  return true;
-    	else
-    	  return false;
-	}
-	else
-	{	
-        return false;
+		dlerror(); // clear value
+		*v = dlsym(h, sym_name);
+		err = (char*)dlerror();
+		if (!*v || err)
+			return false;
 	}
 	
+	/* succeeded :) */
+	return true;
 }
 
-
-DLLFactoryBase::DLLFactoryBase(const char *fname, const char *factory) : DLLManager(fname)
+DLLFactoryBase::DLLFactoryBase(InspIRCd* Instance, const char* fname, const char* symbol) : DLLManager(Instance, fname)
 {
-	// try get the factory function if there is no error yet
+	/* try get the factory function if there is no error yet */
+	factory_func = 0;
 	
-	factory_func=0;
-	
-	if( LastError()==0 )
-	{		
-    	GetSymbol( (void **)&factory_func, factory ? factory : "init_module" );
+	if (!LastError())
+	{
+		if (!GetSymbol( (void **)&factory_func, symbol ? symbol : "init_module"))
+		{
+			throw ModuleException("Missing init_module() entrypoint!");
+		}
 	}
-	
 }
 
-
 DLLFactoryBase::~DLLFactoryBase()
 {
 }
 
-
-