summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/commands/cmd_commands.cpp2
-rw-r--r--src/commands/cmd_stats.cpp2
-rw-r--r--src/modules/m_abbreviation.cpp32
3 files changed, 29 insertions, 7 deletions
diff --git a/src/commands/cmd_commands.cpp b/src/commands/cmd_commands.cpp
index 3f8542aa2..9d77de6ca 100644
--- a/src/commands/cmd_commands.cpp
+++ b/src/commands/cmd_commands.cpp
@@ -23,7 +23,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
CmdResult CommandCommands::Handle (const std::vector<std::string>&, User *user)
{
- for (Commandable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
+ for (Commandtable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
{
user->WriteNumeric(702, "%s :%s %s %d %d",
user->nick.c_str(),
diff --git a/src/commands/cmd_stats.cpp b/src/commands/cmd_stats.cpp
index fafa97581..03c48609f 100644
--- a/src/commands/cmd_stats.cpp
+++ b/src/commands/cmd_stats.cpp
@@ -163,7 +163,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
/* stats m (list number of times each command has been used, plus bytecount) */
case 'm':
- for (Commandable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
+ for (Commandtable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
{
if (i->second->use_count)
{
diff --git a/src/modules/m_abbreviation.cpp b/src/modules/m_abbreviation.cpp
index f94f8a5cc..dbda047b5 100644
--- a/src/modules/m_abbreviation.cpp
+++ b/src/modules/m_abbreviation.cpp
@@ -44,6 +44,8 @@ class ModuleAbbreviation : public Module
/* 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)
@@ -51,14 +53,34 @@ class ModuleAbbreviation : public Module
if (command == n->first.substr(0, clen))
{
- /* Found the command */
- command = n->first;
- return false;
+ if (!foundmatch)
+ {
+ /* Found the command */
+ foundcommand = n->first;
+ foundmatch = true;
+ }
+ else
+ matchlist.append(" ").append(n->first);
}
}
- /* No match, we have to put the . back again so that the invalid command numeric looks correct. */
- 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;
}
};