X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=5b8b5b7f95e2992161916c80348d8394e198a914;hb=aa96718ad0c70a075f3bbb081b261afe3f2d7bc9;hp=887ef0551e63e78410056edcc33e7e5a02d69bfb;hpb=4b856bda135a08e800b96c970a10b0b6a34d433a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 887ef0551..5b8b5b7f9 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -27,7 +27,7 @@
 #include <dlfcn.h>
 #endif
 
-int InspIRCd::PassCompare(Extensible* ex, const char* data,const char* input, const char* hashtype)
+int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
 {
 	int MOD_RESULT = 0;
 	FOREACH_RESULT_I(this,I_OnPassCompare,OnPassCompare(ex, data, input, hashtype))
@@ -35,7 +35,7 @@ int InspIRCd::PassCompare(Extensible* ex, const char* data,const char* input, co
 		return 0;
 	if (MOD_RESULT == -1)
 		return 1;
-	return strcmp(data,input);
+	return data != input; // this seems back to front, but returns 0 if they *match*, 1 else
 }
 
 /* LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list.
@@ -133,10 +133,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<s
 
 			new_parameters[splithere] = item.c_str();
 
-			/* Execute the command handler over and over. If someone pulls our user
-			 * record out from under us (e.g. if we /kill a comma sep list, and we're
-			 * in that list ourselves) abort if we're gone.
-			 */
+			/* Execute the command handler. */
 			CommandObj->Handle(new_parameters, user);
 
 			dupes[item.c_str()] = true;
@@ -151,7 +148,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<s
 
 bool CommandParser::IsValidCommand(const std::string &commandname, unsigned int pcnt, User * user)
 {
-	Commandable::iterator n = cmdlist.find(commandname);
+	Commandtable::iterator n = cmdlist.find(commandname);
 
 	if (n != cmdlist.end())
 	{
@@ -175,7 +172,7 @@ bool CommandParser::IsValidCommand(const std::string &commandname, unsigned int
 
 Command* CommandParser::GetHandler(const std::string &commandname)
 {
-	Commandable::iterator n = cmdlist.find(commandname);
+	Commandtable::iterator n = cmdlist.find(commandname);
 	if (n != cmdlist.end())
 		return n->second;
 
@@ -186,7 +183,7 @@ Command* CommandParser::GetHandler(const std::string &commandname)
 
 CmdResult CommandParser::CallHandler(const std::string &commandname, const std::vector<std::string>& parameters, User *user)
 {
-	Commandable::iterator n = cmdlist.find(commandname);
+	Commandtable::iterator n = cmdlist.find(commandname);
 
 	if (n != cmdlist.end())
 	{
@@ -288,7 +285,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
 	}
 
 	/* find the command, check it exists */
-	Commandable::iterator cm = cmdlist.find(command);
+	Commandtable::iterator cm = cmdlist.find(command);
 	
 	if (cm == cmdlist.end())
 	{
@@ -332,7 +329,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
 		/* command is disabled! */
 		user->WriteNumeric(421, "%s %s :This command has been disabled.",user->nick.c_str(),command.c_str());
 		ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)",
-				command.c_str(), user->nick.c_str(), user->ident.c_str(), user->host);
+				command.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str());
 		return do_more;
 	}
 	if (command_p.size() < cm->second->min_params)
@@ -371,7 +368,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
 
 void CommandParser::RemoveCommands(const char* source)
 {
-	Commandable::iterator i,safei;
+	Commandtable::iterator i,safei;
 	for (i = cmdlist.begin(); i != cmdlist.end();)
 	{
 		safei = i;
@@ -380,7 +377,7 @@ void CommandParser::RemoveCommands(const char* source)
 	}
 }
 
-void CommandParser::RemoveCommand(Commandable::iterator safei, const char* source)
+void CommandParser::RemoveCommand(Commandtable::iterator safei, const char* source)
 {
 	Command* x = safei->second;
 	if (x->source == std::string(source))