X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_abbreviation.cpp;h=3bc4c919344d6a75847b48259f60819bee377859;hb=dd501fba3fd7e5806186b79fa1d7c2b464884e69;hp=35a6082d9df7f3955687254de83c4faf2e681d96;hpb=61185fc62b7d3d05e33a116fca26aa9dc72ab691;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_abbreviation.cpp b/src/modules/m_abbreviation.cpp
index 35a6082d9..3bc4c9193 100644
--- a/src/modules/m_abbreviation.cpp
+++ b/src/modules/m_abbreviation.cpp
@@ -12,15 +12,14 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
-/* $ModDesc: Provides the ability to abbreviate commands. */
+/* $ModDesc: Provides the ability to abbreviate commands a-la BBC BASIC keywords. */
 
 class ModuleAbbreviation : public Module
 {
 
  public:
-	
+
 	ModuleAbbreviation(InspIRCd* Me)
 		: Module(Me)
 	{
@@ -31,7 +30,7 @@ class ModuleAbbreviation : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+		return Version("$Id$",VF_VENDOR,API_VERSION);
 	}
 
 	virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
@@ -43,24 +42,51 @@ class ModuleAbbreviation : public Module
 		/* Whack the . off the end */
 		command.erase(command.end() - 1);
 
-		ServerInstance->Logs->Log("m_abbreviation", DEBUG, "Abbreviated command: %s", command.c_str());
-
+		/* Look for any command that starts with the same characters, if it does, replace the command string with it */
 		size_t clen = command.length();
+		std::string foundcommand, matchlist;
+		bool foundmatch = false;
 		for (Commandtable::iterator n = ServerInstance->Parser->cmdlist.begin(); n != ServerInstance->Parser->cmdlist.end(); ++n)
 		{
 			if (n->first.length() < clen)
 				continue;
 
-			ServerInstance->Logs->Log("m_abbreviation", DEBUG, "command=%s abbr=%s", command.c_str(), n->first.substr(0, clen).c_str());
 			if (command == n->first.substr(0, clen))
 			{
-				/* Found the command */
-				command = n->first;
-				return false;
+				if (matchlist.length() > 450)
+				{
+					user->WriteNumeric(420, "%s :Ambiguous abbreviation and too many possible matches.", user->nick.c_str());
+					return true;
+				}
+
+				if (!foundmatch)
+				{
+					/* Found the command */
+					foundcommand = n->first;
+					foundmatch = true;
+				}
+				else
+					matchlist.append(" ").append(n->first);
 			}
 		}
 
-		command += '.';
+		/* Ambiguous command, list the matches */
+		if (!matchlist.empty())
+		{
+			user->WriteNumeric(420, "%s :Ambiguous abbreviation, posssible matches: %s%s", user->nick.c_str(), foundcommand.c_str(), matchlist.c_str());
+			return true;
+		}
+
+		if (foundcommand.empty())
+		{
+			/* No match, we have to put the . back again so that the invalid command numeric looks correct. */
+			command += '.';
+		}
+		else
+		{
+			command = foundcommand;
+		}
+
 		return false;
 	}
 };