X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fmodmanager_dynamic.cpp;h=27da56c692ab32f9a779403563d02b7d9082b9b6;hb=56cde817e033c6235cc6a846c90fd143ffb2a0ad;hp=e613508df8d333f503ff1412cb41179d5838413c;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index e613508df..27da56c69 100644
--- a/src/modmanager_dynamic.cpp
+++ b/src/modmanager_dynamic.cpp
@@ -24,8 +24,9 @@
 #include "command_parse.h"
 #include "dns.h"
 #include "exitcodes.h"
+#include <iostream>
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <dirent.h>
 #endif
 
@@ -66,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
 			{
@@ -77,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
@@ -182,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());
@@ -193,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");
@@ -213,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);
 		}
 	}
@@ -235,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);
 		}
 	}