Filter out newlines from error messages on Windows

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

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index e9cddcbbf91ac46020f2bb3b0bc561284315a983..b17f131904a165234fc7b69810af4ecf8daeefba 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -1,70 +1,109 @@
-#include "globals.h"
-#include <dlfcn.h>
-#include "dynamic.h"
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2003, 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 
+#include "inspircd.h"
+#include "dynamic.h"
+#ifndef _WIN32
+#include <dlfcn.h>
+#else
+#define dlopen(path, state) (void*)LoadLibraryA(path)
+#define dlsym(handle, export) (void*)GetProcAddress((HMODULE)handle, export)
+#define dlclose(handle) FreeLibrary((HMODULE)handle)
+#endif
 
-DLLManager::DLLManager( const char *fname )
+DLLManager::DLLManager(const char *fname)
 {
-    // Try to open the library now and get any error message.
-       
-       h=dlopen( fname, RTLD_NOW );
-       err=dlerror();
+       if (!strstr(fname,".so"))
+       {
+               err = "This doesn't look like a module file to me...";
+               h = NULL;
+               return;
+       }
+
+       h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
+       if (!h)
+       {
+#ifdef _WIN32
+               RetrieveLastError();
+#else
+               err = dlerror();
+#endif
+       }
 }
 
 DLLManager::~DLLManager()
 {
-       // close the library if it isn't null
-       if( h!=0 )
-       dlclose(h);
+       /* close the library */
+       if (h)
+               dlclose(h);
 }
 
+union init_t {
+       void* vptr;
+       Module* (*fptr)();
+};
 
-bool DLLManager::GetSymbol( 
-                          void **v,
-                          const char *sym_name
-                          )
+Module* DLLManager::CallInit()
 {
-       // try extract a symbol from the library
-       // get any error message is there is any
-       
-       if( h!=0 )
+       if (!h)
+               return NULL;
+
+       init_t initfn;
+       initfn.vptr = dlsym(h, MODULE_INIT_STR);
+       if (!initfn.vptr)
        {
-               *v = dlsym( h, sym_name );
-       err=dlerror();
-           if( err==0 )
-                 return true;
-       else
-         return false;
+#ifdef _WIN32
+               RetrieveLastError();
+#else
+               err = dlerror();
+#endif
+               return NULL;
        }
-       else
-       {       
-        return false;
-       }
-       
-}
-
 
-DLLFactoryBase::DLLFactoryBase(
-                              const char *fname,
-                              const char *factory=0
-                              ) : DLLManager(fname)
-{
-       // 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" );
-       }
-       
+       return (*initfn.fptr)();
 }
 
-
-DLLFactoryBase::~DLLFactoryBase()
+std::string DLLManager::GetVersion()
 {
-}
+       if (!h)
+               return "";
 
+       const char* srcver = (char*)dlsym(h, "inspircd_src_version");
+       if (srcver)
+               return srcver;
+       return "Unversioned module";
+}
 
+#ifdef _WIN32
+void DLLManager::RetrieveLastError()
+{
+       CHAR errmsg[100];
+       FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, 0, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), errmsg, 100, 0);
+       SetLastError(ERROR_SUCCESS);
+       err = errmsg;
 
+       std::string::size_type p;
+       while ((p = err.find_last_of("\r\n")) != std::string::npos)
+               err.erase(p, 1);
+}
+#endif