Replaced vsnprintf with VAFORMAT pretty much everywhere.

[user/henk/code/inspircd.git] / src / command_parse.cpp

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index d16f38a858b2434e004eaf4910ac57285627bca7..d386337f2e9567b7ea235f868821db42eaf53ef1 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -1,16 +1,26 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2005-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006-2007 Dennis Friis <peavey@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
@@ -27,7 +37,7 @@ int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::st
                return 1;
 
        /* We dont handle any hash types except for plaintext - Thanks tra26 */
-       if (hashtype != "" && hashtype != "plaintext")
+       if (!hashtype.empty() && hashtype != "plaintext")
                /* See below. 1 because they dont match */
                return 1;
 
@@ -83,7 +93,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<s
                        std::vector<std::string> new_parameters(parameters);
 
                        if (!items2.GetToken(extrastuff))
-                               extrastuff = "";
+                               extrastuff.clear();
 
                        new_parameters[splithere] = item;
                        if (extra >= 0)
@@ -138,6 +148,9 @@ CmdResult CommandParser::CallHandler(const std::string &commandname, const std::
 
        if (n != cmdlist.end())
        {
+               if ((!parameters.empty()) && (parameters.back().empty()) && (!n->second->allow_empty_last_param))
+                       return CMD_INVALID;
+
                if (parameters.size() >= n->second->min_params)
                {
                        bool bOkay = false;
@@ -233,7 +246,7 @@ bool CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
                 *      a
                 *      test
                 */
-               std::string lparam = "";
+               std::string lparam;
 
                /*
                 * The '-1' here is a clever trick, we'll go backwards throwing everything into a temporary param
@@ -283,11 +296,11 @@ bool CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
                if (!user->HasPermission(command))
                {
                        user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to command %s",
-                               user->nick.c_str(), user->oper->NameStr(), command.c_str());
+                               user->nick.c_str(), user->oper->name.c_str(), command.c_str());
                        return do_more;
                }
        }
-       if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled()))
+       if ((user->registered == REG_ALL) && (!user->IsOper()) && (cm->second->IsDisabled()))
        {
                /* command is disabled! */
                if (ServerInstance->Config->DisabledDontExist)
@@ -304,6 +317,10 @@ bool CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
                                command.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str());
                return do_more;
        }
+
+       if ((!command_p.empty()) && (command_p.back().empty()) && (!cm->second->allow_empty_last_param))
+               command_p.pop_back();
+
        if (command_p.size() < cm->second->min_params)
        {
                user->WriteNumeric(ERR_NEEDMOREPARAMS, "%s %s :Not enough parameters.", user->nick.c_str(), command.c_str());
@@ -354,7 +371,7 @@ bool CommandParser::ProcessBuffer(std::string &buffer,LocalUser *user)
        if (!user || buffer.empty())
                return true;
 
-       ServerInstance->Logs->Log("USERINPUT", RAWIO, "C[%s] I :%s %s",
+       ServerInstance->Logs->Log("USERINPUT", LOG_RAWIO, "C[%s] I :%s %s",
                user->uuid.c_str(), user->nick.c_str(), buffer.c_str());
        return ProcessCommand(user,buffer);
 }