Say commands are now properly splitted

Ayuto · Ayuto · commit 7ef00933641c · 2015-09-14T21:51:08.000+02:00
diff --git a/src/core/modules/commands/commands.h b/src/core/modules/commands/commands.h
@@ -69,6 +69,11 @@ class CCommandExt
 		const char* szValue = command.GetCommandString();
 		return PyUnicode_DecodeUTF8(szValue, strlen(szValue), "ignore");
 	}
+
+	static bool Tokenize(CCommand& command, const char* szCommand)
+	{
+		return command.Tokenize(szCommand);
+	}
 };
 
 
diff --git a/src/core/modules/commands/commands_say.cpp b/src/core/modules/commands/commands_say.cpp
@@ -225,11 +225,22 @@ void SayConCommand::Dispatch( const CCommand& command )
 	bool bTeamOnly = strcmp(command.Arg(0), "say_team") == 0;
 
 	// Create a new CCommand object that does not contain the first argument
-	// (say or say_team) as that is redundant
-	//CCommand( int nArgC, const char **ppArgV )
-	const char** argv = command.ArgV();
-	argv++;
-	const CCommand stripped_command = CCommand(command.ArgC() - 1, argv);
+	// (say or say_team) and is properly splitted
+	CCommand stripped_command = CCommand();
+	char* szCommand = (char*) command.ArgS();
+
+	// Remove quotes (if existant), so the arguments are not recognized as a
+	// single argument.
+	int iLastCharPos = strlen(szCommand) - 1;
+	if (szCommand[0] == '"' && szCommand[iLastCharPos] == '"') {
+		szCommand[iLastCharPos] = '\0';
+		szCommand++;
+	}
+
+	if (!stripped_command.Tokenize(szCommand)) {
+		PythonLog(0, "Failed to tokenize '%s'.", command.GetCommandString());
+		return;
+	}
 
 	// Loop through all registered Say Filter callbacks
 	for(int i = 0; i < s_SayFilters.m_vecCallables.Count(); i++)
@@ -252,39 +263,18 @@ void SayConCommand::Dispatch( const CCommand& command )
 		END_BOOST_PY_NORET()
 	}
 
-	// Get the name of the command used
-	std::string szCommandString (stripped_command.Arg(0));
-
-	// Don't handle empty command strings. This would cause a crash.
-	if (!szCommandString.empty())
+	// Find if the command is registered
+	SayCommandMap::iterator commandMapIter = g_SayCommandMap.find(szCommand);
+	if( commandMapIter != g_SayCommandMap.end() )
 	{
-
-		// Copy the string to get a char instance
-		char * szCopyCommandString = new char [szCommandString.length() + 1];
-		std::strcpy(szCopyCommandString, szCommandString.c_str());
-
-		// Split the command using <space> as the delimiter
-		// This should be the actual Say Command
-		char * szCommand = std::strtok(szCopyCommandString, " ");
-
-		// Is there a command?
-		// This check fixes https://github.com/Source-Python-Dev-Team/Source.Python/issues/17
-		if (szCommand)
-		{
-			// Find if the command is registered
-			SayCommandMap::iterator commandMapIter = g_SayCommandMap.find(szCommand);
-			if( commandMapIter != g_SayCommandMap.end() )
-			{
-				// Get the CSayCommandManager instance for the command
-				CSayCommandManager* pCSayCommandManager = commandMapIter->second;
+		// Get the CSayCommandManager instance for the command
+		CSayCommandManager* pCSayCommandManager = commandMapIter->second;
 		
-				// Call the command and see it wants to block the command
-				if( pCSayCommandManager->Dispatch(stripped_command, iIndex, bTeamOnly)  == BLOCK)
-				{
-					// Block the command
-					return;
-				}
-			}
+		// Call the command and see it wants to block the command
+		if( pCSayCommandManager->Dispatch(stripped_command, iIndex, bTeamOnly)  == BLOCK)
+		{
+			// Block the command
+			return;
 		}
 	}
 	
diff --git a/src/core/modules/commands/commands_wrap.cpp b/src/core/modules/commands/commands_wrap.cpp
@@ -123,6 +123,10 @@ void export_command(scope _commands)
 			args("index")
 		)
 
+		.def("tokenize",
+			&CCommandExt::Tokenize
+		)
+
 		.def("get_max_command_length",
 			&CCommand::MaxCommandLength
 		)

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,10 @@ void export_command(scope _commands)`
`123`	`123`	`args("index")`
`124`	`124`	`)`
`125`	`125`
	`126`	`+ .def("tokenize",`
	`127`	`+ &CCommandExt::Tokenize`
	`128`	`+ )`
	`129`	`+`
`126`	`130`	`.def("get_max_command_length",`
`127`	`131`	`&CCommand::MaxCommandLength`
`128`	`132`	`)`