Release v3.0.0 alpha 5.

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

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 1470dff0cae7c0df683b7d4cd0484e2d8694267f..f138b04d1dd9f30d49a3eb48fd56058ab0b0ec28 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -22,7 +22,7 @@
 
 
 #include "inspircd.h"
-#include "dynamic.h"
+
 #ifndef _WIN32
 #include <dlfcn.h>
 #else
@@ -43,11 +43,7 @@ DLLManager::DLLManager(const char *fname)
        h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
        if (!h)
        {
-#ifdef _WIN32
                RetrieveLastError();
-#else
-               err = dlerror();
-#endif
        }
 }
 
@@ -72,11 +68,7 @@ Module* DLLManager::CallInit()
        initfn.vptr = dlsym(h, MODULE_INIT_STR);
        if (!initfn.vptr)
        {
-#ifdef _WIN32
                RetrieveLastError();
-#else
-               err = dlerror();
-#endif
                return NULL;
        }
 
@@ -91,15 +83,24 @@ std::string DLLManager::GetVersion()
        const char* srcver = (char*)dlsym(h, "inspircd_src_version");
        if (srcver)
                return srcver;
-       return "Unversioned module";
+       return "";
 }
 
-#ifdef _WIN32
 void DLLManager::RetrieveLastError()
 {
-       CHAR errmsg[100];
-       FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, 0, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), errmsg, 100, 0);
+#if defined _WIN32
+       char errmsg[500];
+       DWORD dwErrorCode = GetLastError();
+       if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)errmsg, _countof(errmsg), NULL) == 0)
+               sprintf_s(errmsg, _countof(errmsg), "Error code: %u", dwErrorCode);
        SetLastError(ERROR_SUCCESS);
        err = errmsg;
-}
+#else
+       char* errmsg = dlerror();
+       err = errmsg ? errmsg : "Unknown error";
 #endif
+
+       std::string::size_type p;
+       while ((p = err.find_last_of("\r\n")) != std::string::npos)
+               err.erase(p, 1);
+}