]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/dynamic.cpp
Change the error message, just for LeaChim <3
[user/henk/code/inspircd.git] / src / dynamic.cpp
index 833f538aea0189027b81c8d43803f94afc6558f3..d38405d48f5507899091bb21732200a44ea98d78 100644 (file)
@@ -70,6 +70,7 @@ DLLManager::DLLManager(const char *fname)
                err = strerror(errno);
                return;
        }
+       log(DEBUG,"Opened module file %s",fname);
        char tmpfile_template[255];
        char buffer[65536];
        snprintf(tmpfile_template, 255, "%s/inspircd_file.so.%d.XXXXXXXXXX",Config->TempDir,getpid());
@@ -80,6 +81,7 @@ DLLManager::DLLManager(const char *fname)
                err = strerror(errno);
                return;
        }
+       log(DEBUG,"Copying %s to %s",fname, tmpfile_template);
        while (!feof(x))
        {
                int n = fread(buffer, 1, 65535, x);
@@ -94,23 +96,28 @@ DLLManager::DLLManager(const char *fname)
                        }
                }
        }
+       log(DEBUG,"Copied entire file.");
        // Try to open the library now and get any error message.
-       
-       h = dlopen(tmpfile_template, RTLD_NOW );
 
-       if (!h)
-       {
-               err = dlerror();
-               return;
-       }
        if (close(fd) == -1)
                err = strerror(errno);
        if (fclose(x) == EOF)
                err = strerror(errno);
 
+       h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
+       if (!h)
+       {
+               log(DEBUG,"dlerror occured!");
+               err = (char*)dlerror();
+               return;
+       }
+
+       log(DEBUG,"Finished loading '%s': %0x",tmpfile_template, h);
+
        // We can delete the tempfile once it's loaded, leaving just the inode.
        if (!err && !Config->debugging)
        {
+               log(DEBUG,"Deleteting %s",tmpfile_template);
                if (unlink(tmpfile_template) == -1)
                        err = strerror(errno);
        }
@@ -121,8 +128,8 @@ DLLManager::~DLLManager()
 {
 #ifndef STATIC_LINK
        // close the library if it isn't null
-       if (h != 0)
-       dlclose(h);
+       if (h)
+               dlclose(h);
 #endif
 }
 
@@ -156,19 +163,27 @@ bool DLLManager::GetSymbol(void** v, const char* sym_name)
        
        if (h)
        {
+               log(DEBUG,"Found symbol %s", sym_name);
+               dlerror(); // clear value
                *v = dlsym(h, sym_name);
-               err = dlerror();
-               return !err;
+               err = (char*)dlerror();
+               if (!*v || err)
+                       return false;
+       }
+       
+       if (err)
+       {
+               return false;
        }
        else
        {       
-               return false;
+               return true;
        }
 }
 
 #endif
 
-DLLFactoryBase::DLLFactoryBase(const char* fname, const char* factory) : DLLManager(fname)
+DLLFactoryBase::DLLFactoryBase(const char* fname, const char* symbol) : DLLManager(fname)
 {
        // try get the factory function if there is no error yet
        factory_func = 0;
@@ -176,14 +191,17 @@ DLLFactoryBase::DLLFactoryBase(const char* fname, const char* factory) : DLLMana
        if (!LastError())
        {
 #ifdef STATIC_LINK
-               GetSymbol( factory_func, factory ? factory : "init_module" );
+               if (!GetSymbol( factory_func, symbol ? symbol : "init_module"))
 #else
-               GetSymbol( (void **)&factory_func, factory ? factory : "init_module" );
+               if (!GetSymbol( (void **)&factory_func, symbol ? symbol : "init_module"))
 #endif
+               {
+                       throw ModuleException("Missing init_module() entrypoint!");
+               }
        }
 }
 
-
 DLLFactoryBase::~DLLFactoryBase()
 {
 }
+