Add a progress meter for loading of core commands, fix broken implementation for <disabled commands> with a module command, as discovered by Casey in bug #293

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7038 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 7 insertions, 1 deletions

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index ae580c6a7..7529461d0 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -549,6 +549,9 @@ void CommandParser::SetupCommandTable()
 {
 	RFCCommands.clear();
 
+	printf("\nLoading core commands");
+	fflush(stdout);
+
 	DIR* library = opendir(LIBRARYDIR);
 	if (library)
 	{
@@ -557,10 +560,13 @@ void CommandParser::SetupCommandTable()
 		{
 			if (match(entry->d_name, "cmd_*.so"))
 			{
+				printf(".");
+				fflush(stdout);
 				this->LoadCommand(entry->d_name);
 			}
 		}
 		closedir(library);
+		printf("\n");
 	}
 
 	this->CreateCommand(new cmd_reload(ServerInstance));
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 8ae91209f..069c8634d 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -419,7 +419,6 @@ InspIRCd::InspIRCd(int argc, char** argv)
 	this->Modes = new ModeParser(this);
 	this->AddServerName(Config->ServerName);
 	CheckDie();
-	InitializeDisabledCommands(Config->DisabledCommands, this);
 	int bounditems = BindPorts(true, found_ports, pl);
 
 	for(int t = 0; t < 255; t++)
@@ -434,6 +433,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
 	this->LoadAllModules();
 	/* Just in case no modules were loaded - fix for bug #101 */
 	this->BuildISupport();
+	InitializeDisabledCommands(Config->DisabledCommands, this);
 
 	if ((Config->ports.size() == 0) && (found_ports > 0))
 	{