X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=3d2d15b4f4cb3c65ae8a338931d0a996e4259758;hb=b844d1cbbe79585facc69b9247baa8427cff0b62;hp=ab6f5561035afdff443b9114e60e35cb2af9bde4;hpb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index ab6f55610..3d2d15b4f 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -2,20 +2,15 @@
  *       | 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 "configreader.h"
 #include "dynamic.h"
 
@@ -38,13 +33,10 @@ DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
 	}
 #ifdef STATIC_LINK
 	this->staticname[0] = '\0';
-	ServerInstance->Log(DEBUG,"Loading core-compiled module '%s'",fname);
 	for (int j = 0; modsyms[j].name; j++)
 	{
-		ServerInstance->Log(DEBUG,"Check %s",modsyms[j].name);
 		if (!strcmp(modsyms[j].name,fname))
 		{
-			ServerInstance->Log(DEBUG,"Found %s",fname);
 			strlcpy(this->staticname,fname,1020);
 			err = 0;
 			return;
@@ -52,67 +44,12 @@ 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;
-	}
-	ServerInstance->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;
-	}
-	ServerInstance->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;
-			}
-		}
-	}
-	ServerInstance->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)
 	{
-		ServerInstance->Log(DEBUG,"dlerror occured!");
 		err = (char*)dlerror();
 		return;
 	}
-
-	ServerInstance->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)
-	{
-		ServerInstance->Log(DEBUG,"Deleteting %s",tmpfile_template);
-		if (unlink(tmpfile_template) == -1)
-			err = strerror(errno);
-	}
 #endif
 }