Fix GnuTLS certificate generation on OS X.

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

diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index c75ea3123b0648d211380d3e01d48894067bc30f..27da56c692ab32f9a779403563d02b7d9082b9b6 100644 (file)
--- a/src/modmanager_dynamic.cpp
+++ b/src/modmanager_dynamic.cpp
@@ -1,16 +1,22 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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 "xline.h"
 #include "socket.h"
@@ -18,8 +24,9 @@
 #include "command_parse.h"
 #include "dns.h"
 #include "exitcodes.h"
+#include <iostream>
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <dirent.h>
 #endif
 
@@ -60,10 +67,11 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
                        newmod->ModuleSourceFile = filename;
                        newmod->ModuleDLLManager = newhandle;
                        Modules[filename] = newmod;
+                       std::string version = newhandle->GetVersion();
                        if (defer)
                        {
                                ServerInstance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (Module version %s)",
-                                       filename.c_str(), newhandle->GetVersion().c_str());
+                                       filename.c_str(), version.c_str());
                        }
                        else
                        {
@@ -71,7 +79,7 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
 
                                Version v = newmod->GetVersion();
                                ServerInstance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (Module version %s)%s",
-                                       filename.c_str(), newhandle->GetVersion().c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
+                                       filename.c_str(), version.c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
                        }
                }
                else
@@ -176,7 +184,7 @@ void ModuleManager::LoadAll()
 {
        ModCount = 0;
 
-       printf("\nLoading core commands");
+       std::cout << std::endl << "Loading core commands";
        fflush(stdout);
 
        DIR* library = opendir(ServerInstance->Config->ModPath.c_str());
@@ -187,19 +195,19 @@ void ModuleManager::LoadAll()
                {
                        if (InspIRCd::Match(entry->d_name, "cmd_*.so", ascii_case_insensitive_map))
                        {
-                               printf(".");
+                               std::cout << ".";
                                fflush(stdout);
 
                                if (!Load(entry->d_name, true))
                                {
                                        ServerInstance->Logs->Log("MODULE", DEFAULT, this->LastError());
-                                       printf_c("\n[\033[1;31m*\033[0m] %s\n\n", this->LastError().c_str());
+                                       std::cout << std::endl << "[" << con_red << "*" << con_reset << "]" << this->LastError() << std::endl << std::endl;
                                        ServerInstance->Exit(EXIT_STATUS_MODULE);
                                }
                        }
                }
                closedir(library);
-               printf("\n");
+               std::cout << std::endl;
        }
 
        ConfigTagList tags = ServerInstance->Config->ConfTags("module");
@@ -207,12 +215,12 @@ void ModuleManager::LoadAll()
        {
                ConfigTag* tag = i->second;
                std::string name = tag->getString("name");
-               printf_c("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",name.c_str());
+               std::cout << "[" << con_green << "*" << con_reset << "] Loading module:\t" << con_green << name << con_reset << std::endl;
 
                if (!this->Load(name, true))
                {
                        ServerInstance->Logs->Log("MODULE", DEFAULT, this->LastError());
-                       printf_c("\n[\033[1;31m*\033[0m] %s\n\n", this->LastError().c_str());
+                       std::cout << std::endl << "[" << con_red << "*" << con_reset << "]" << this->LastError() << std::endl << std::endl;
                        ServerInstance->Exit(EXIT_STATUS_MODULE);
                }
        }
@@ -229,7 +237,7 @@ void ModuleManager::LoadAll()
                {
                        LastModuleError = "Unable to initialize " + mod->ModuleSourceFile + ": " + modexcept.GetReason();
                        ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
-                       printf_c("\n[\033[1;31m*\033[0m] %s\n\n", LastModuleError.c_str());
+                       std::cout << std::endl << "[" << con_red << "*" << con_reset << "]" << LastModuleError << std::endl << std::endl;
                        ServerInstance->Exit(EXIT_STATUS_MODULE);
                }
        }