Fix typos found by Zaba. Thanks.

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

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index f84df33427dfdabd5af31704fcba02783d0919d9..ab935559d9be0374bc972ad0e9a017eae8ff45ba 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -14,8 +14,6 @@
 #include "inspircd.h"
 #include "configreader.h"
 #include <algorithm>
-#include <dirent.h>
-#include <dlfcn.h>
 #include "users.h"
 #include "modules.h"
 #include "wildcard.h"
@@ -24,6 +22,12 @@
 #include "socket.h"
 #include "command_parse.h"
 
+/* Directory Searching for Unix-Only */
+#ifndef WIN32
+#include <dirent.h>
+#include <dlfcn.h>
+#endif
+
 bool InspIRCd::ULine(const char* server)
 {
        if (!server)
@@ -31,7 +35,15 @@ bool InspIRCd::ULine(const char* server)
        if (!*server)
                return true;
 
-       return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end());
+       return (Config->ulines.find(server) != Config->ulines.end());
+}
+
+bool InspIRCd::SilentULine(const char* server)
+{
+       std::map<irc::string,bool>::iterator n = Config->ulines.find(server);
+       if (n != Config->ulines.end())
+               return n->second;
+       else return false;
 }
 
 int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber)
@@ -45,6 +57,11 @@ int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber)
        return strcmp(data,input);
 }
 
+std::string InspIRCd::TimeString(time_t curtime)
+{
+       return std::string(ctime(&curtime),24);
+}
+
 long InspIRCd::Duration(const char* str)
 {
        char n_field[MAXBUF];
@@ -211,7 +228,7 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
 
 bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user)
 {
-       nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+       command_table::iterator n = cmdlist.find(commandname);
 
        if (n != cmdlist.end())
        {
@@ -232,7 +249,7 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use
 
 command_t* CommandParser::GetHandler(const std::string &commandname)
 {
-       nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+       command_table::iterator n = cmdlist.find(commandname);
        if (n != cmdlist.end())
                return n->second;
 
@@ -243,7 +260,7 @@ command_t* CommandParser::GetHandler(const std::string &commandname)
 
 CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user)
 {
-       nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+       command_table::iterator n = cmdlist.find(commandname);
 
        if (n != cmdlist.end())
        {
@@ -273,9 +290,18 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
        const char *command_p[127];
        int items = 0;
        irc::tokenstream tokens(cmd);
-       std::string command = tokens.GetToken();
+       std::string command;
+       tokens.GetToken(command);
+
+       /* A client sent a nick prefix on their command (ick)
+        * rhapsody and some braindead bouncers do this --
+        * the rfc says they shouldnt but also says the ircd should
+        * discard it if they do.
+        */
+       if (*command.c_str() == ':')
+               tokens.GetToken(command);
 
-       while (((para[items] = tokens.GetToken()) != "") && (items < 127))
+       while (tokens.GetToken(para[items]) && (items < 127))
        {
                command_p[items] = para[items].c_str();
                items++;
@@ -289,7 +315,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
                return;
        }
 
-       nspace::hash_map<std::string,command_t*>::iterator cm = cmdlist.find(command);
+       command_table::iterator cm = cmdlist.find(command);
        
        if (cm != cmdlist.end())
        {
@@ -301,16 +327,16 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
                        {
                                if (!user->IsModeSet(cm->second->flags_needed))
                                {
-                                       user->WriteServ("481 %s :Permission Denied- You do not have the required operator privileges",user->nick);
+                                       user->WriteServ("481 %s :Permission Denied - You do not have the required operator privileges",user->nick);
                                        return;
                                }
                                if (!user->HasPermission(command))
                                {
-                                       user->WriteServ("481 %s :Permission Denied- Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str());
+                                       user->WriteServ("481 %s :Permission Denied - Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str());
                                        return;
                                }
                        }
-                       if ((user->registered == REG_ALL) && (!*user->oper) && (cm->second->IsDisabled()))
+                       if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled()))
                        {
                                /* command is disabled! */
                                user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str());
@@ -320,7 +346,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
                        {
                                user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str());
                                /* If syntax is given, display this as the 461 reply */
-                               if ((ServerInstance->Config->SyntaxHints) && (cm->second->syntax.length()))
+                               if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (cm->second->syntax.length()))
                                        user->WriteServ("304 %s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str());
                                return;
                        }
@@ -361,7 +387,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
 
 bool CommandParser::RemoveCommands(const char* source)
 {
-       nspace::hash_map<std::string,command_t*>::iterator i,safei;
+       command_table::iterator i,safei;
        for (i = cmdlist.begin(); i != cmdlist.end(); i++)
        {
                safei = i;
@@ -379,7 +405,7 @@ bool CommandParser::RemoveCommands(const char* source)
        return true;
 }
 
-void CommandParser::RemoveCommand(nspace::hash_map<std::string,command_t*>::iterator safei, const char* source)
+void CommandParser::RemoveCommand(command_table::iterator safei, const char* source)
 {
        command_t* x = safei->second;
        if (x->source == std::string(source))
@@ -404,7 +430,7 @@ void CommandParser::ProcessBuffer(std::string &buffer,userrec *user)
        {
                if (!user->muted)
                {
-                       ServerInstance->Log(DEBUG,"-> :%s %s",user->nick,buffer.c_str());
+                       ServerInstance->Log(DEBUG,"C[%d] -> :%s %s",user->GetFd(), user->nick, buffer.c_str());
                        this->ProcessCommand(user,buffer);
                }
        }
@@ -442,7 +468,7 @@ bool CommandParser::FindSym(void** v, void* h)
 {
        *v = dlsym(h, "init_command");
        const char* err = dlerror();
-       if (err)
+       if (err && !(*v))
        {
                ServerInstance->Log(SPARSE, "Error loading core command: %s\n", err);
                return false;
@@ -527,6 +553,9 @@ void CommandParser::SetupCommandTable()
 {
        RFCCommands.clear();
 
+       printf("\nLoading core commands");
+       fflush(stdout);
+
        DIR* library = opendir(LIBRARYDIR);
        if (library)
        {
@@ -535,10 +564,13 @@ void CommandParser::SetupCommandTable()
                {
                        if (match(entry->d_name, "cmd_*.so"))
                        {
+                               printf(".");
+                               fflush(stdout);
                                this->LoadCommand(entry->d_name);
                        }
                }
                closedir(library);
+               printf("\n");
        }
 
        this->CreateCommand(new cmd_reload(ServerInstance));