From f5d72291213ae9749f1c727ff984c536d7d6fe68 Mon Sep 17 00:00:00 2001 From: brain Date: Sat, 28 Oct 2006 12:57:31 +0000 Subject: Remove ancient copy-to-tmp system for modules, this is no longer required so long as we keep using 'install' to overwrite the files git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5561 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/dynamic.cpp | 56 ++------------------------------------------------------ 1 file changed, 2 insertions(+), 54 deletions(-) (limited to 'src/dynamic.cpp') diff --git a/src/dynamic.cpp b/src/dynamic.cpp index ab6f55610..76efd4b1f 100644 --- a/src/dynamic.cpp +++ b/src/dynamic.cpp @@ -52,67 +52,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; - } - 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(); + ServerInstance->Log(DEBUG,"dlerror '%s' occured!", err); 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); - } + ServerInstance->Log(DEBUG,"Finished loading '%s': %0x", fname, h); #endif } -- cgit v1.2.3