Merge pull request #169 from staticfox/chghost_sync

[solanum.git] / ircd / parse.c

diff --git a/ircd/parse.c b/ircd/parse.c
index ca1ed7ebe70c881b2238105883ce693b523c6b82..9760e6e7a45e911b70af52982569b0696fe78849 100644 (file)
--- a/ircd/parse.c
+++ b/ircd/parse.c
@@ -21,8 +21,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: parse.c 3177 2007-02-01 00:19:14Z jilles $
  */
 
 #include "stdinc.h"
@@ -44,7 +42,7 @@
 #include "packet.h"
 #include "s_assert.h"
 
-static struct Dictionary *cmd_dict = NULL;
+struct Dictionary *cmd_dict = NULL;
 struct Dictionary *alias_dict = NULL;
 
 /* parv[0] is not used, and parv[LAST] == NULL */
@@ -109,7 +107,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
                return;
        }
 
-       if (msgbuf.origin != NULL)
+       if (msgbuf.origin != NULL && IsServer(client_p))
        {
                from = find_client(msgbuf.origin);
 
@@ -138,16 +136,25 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
        }
        else
        {
-               mptr = irc_dictionary_retrieve(cmd_dict, msgbuf.cmd);
+               mptr = rb_dictionary_retrieve(cmd_dict, msgbuf.cmd);
 
                /* no command or its encap only, error */
                if(!mptr || !mptr->cmd)
                {
                        if (IsPerson(client_p))
                        {
-                               struct alias_entry *aptr = irc_dictionary_retrieve(alias_dict, msgbuf.cmd);
+                               struct alias_entry *aptr = rb_dictionary_retrieve(alias_dict, msgbuf.cmd);
                                if (aptr != NULL)
                                {
+                                       if (msgbuf.n_para < 2)
+                                       {
+                                               sendto_one(client_p, form_str(ERR_NEEDMOREPARAMS),
+                                                          me.name,
+                                                          EmptyString(client_p->name) ? "*" : client_p->name,
+                                                          msgbuf.cmd);
+                                               return;
+                                       }
+
                                        do_alias(aptr, client_p, reconstruct_parv(msgbuf.n_para - 1, msgbuf.para + 1));
                                        return;
                                }
@@ -179,7 +186,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
                        /* Its expected this nasty code can be removed
                         * or rewritten later if still needed.
                         */
-                       if((unsigned long) (p + 8) > (unsigned long) end)
+                       if((p + 8) > end)
                        {
                                for (; p <= end; p++)
                                {
@@ -266,7 +273,7 @@ handle_encap(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *so
        struct MessageEntry ehandler;
        MessageHandler handler = 0;
 
-       mptr = irc_dictionary_retrieve(cmd_dict, command);
+       mptr = rb_dictionary_retrieve(cmd_dict, command);
 
        if(mptr == NULL || mptr->cmd == NULL)
                return;
@@ -288,12 +295,11 @@ handle_encap(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *so
  * output       - NONE
  * side effects - MUST MUST be called at startup ONCE before
  *                any other keyword hash routine is used.
- *
  */
 void
 clear_hash_parse()
 {
-       cmd_dict = irc_dictionary_create("command", strcasecmp);
+       cmd_dict = rb_dictionary_create("command", strcasecmp);
 }
 
 /* mod_add_cmd
@@ -312,14 +318,14 @@ mod_add_cmd(struct Message *msg)
        if(msg == NULL)
                return;
 
-       if (irc_dictionary_find(cmd_dict, msg->cmd) != NULL)
+       if (rb_dictionary_find(cmd_dict, msg->cmd) != NULL)
                return;
 
        msg->count = 0;
        msg->rcount = 0;
        msg->bytes = 0;
 
-       irc_dictionary_add(cmd_dict, msg->cmd, msg);
+       rb_dictionary_add(cmd_dict, msg->cmd, msg);
 }
 
 /* mod_del_cmd
@@ -335,7 +341,7 @@ mod_del_cmd(struct Message *msg)
        if(msg == NULL)
                return;
 
-       irc_dictionary_delete(cmd_dict, msg->cmd);
+       rb_dictionary_delete(cmd_dict, msg->cmd);
 }
 
 /* cancel_clients()
@@ -570,14 +576,13 @@ static void do_alias(struct alias_entry *aptr, struct Client *source_p, char *te
                        text);
 }
 
-int
+void
 m_not_oper(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
-       return 0;
 }
 
-int
+void
 m_unregistered(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        /* bit of a hack.
@@ -590,19 +595,16 @@ m_unregistered(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *
                sendto_one(client_p, form_str(ERR_NOTREGISTERED), me.name);
                client_p->localClient->number_of_nick_changes++;
        }
-
-       return 0;
 }
 
-int
+void
 m_registered(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        sendto_one(client_p, form_str(ERR_ALREADYREGISTRED), me.name, source_p->name);
-       return 0;
 }
 
-int
+void
 m_ignore(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-       return 0;
+       /* Does nothing */
 }