From 1ea2fca7678ca3fe585c5812f9f62799e4a46ec5 Mon Sep 17 00:00:00 2001
From: danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Wed, 2 Sep 2009 00:46:29 +0000
Subject: Valgrind cleanup: Add RemoveRFCCommands() to dlclose() and delete the
 core commands

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11613 e03df62e-2008-0410-955e-edbf42e46eb7
---
 include/command_parse.h |  4 ++++
 src/command_parse.cpp   | 13 +++++++++++++
 src/inspircd.cpp        |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/include/command_parse.h b/include/command_parse.h
index 3177dc95b..2cf403de1 100644
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -182,6 +182,10 @@ class CoreExport CommandParser : public classbase
 	 */
 	void RemoveCommands(const char* source);
 
+	/** Remove all core commands and unload their shared objects
+	 */
+	void RemoveRFCCommands();
+
 	/** Add a new command to the commands hash
 	 * @param f The new Command to add to the list
 	 * @param so_handle The handle to the shared object where the command can be found.
diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index b063e392c..3f8f63c48 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -425,6 +425,19 @@ void CommandParser::RemoveCommands(const char* source)
 	}
 }
 
+void CommandParser::RemoveRFCCommands()
+{
+	for(SharedObjectList::iterator c = RFCCommands.begin(); c != RFCCommands.end(); c++)
+	{
+		std::string cmd = c->first;
+		Command* cmdptr = cmdlist.find(cmd)->second;
+		cmdlist.erase(cmdlist.find(cmd));
+		delete cmdptr;
+		dlclose(c->second);
+	}
+	RFCCommands.clear();
+}
+
 void CommandParser::RemoveCommand(Commandtable::iterator safei, const char* source)
 {
 	Command* x = safei->second;
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index d7239e0b4..28aa0e1b9 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -127,7 +127,7 @@ void InspIRCd::Cleanup()
 		}
 	}
 	/* Remove core commands */
-	Parser->RemoveCommands("<core>");
+	Parser->RemoveRFCCommands();
 
 	/* Cleanup Server Names */
 	for(servernamelist::iterator itr = servernames.begin(); itr != servernames.end(); ++itr)
-- 
cgit v1.2.3