diff options
| -rw-r--r-- | include/extern.h | 3 | ||||
| -rw-r--r-- | src/ircd.c | 6 | ||||
| -rw-r--r-- | src/process.c | 41 |
3 files changed, 12 insertions, 38 deletions
diff --git a/include/extern.h b/include/extern.h index b28e3dda5..f647e5f0c 100644 --- a/include/extern.h +++ b/include/extern.h @@ -605,7 +605,6 @@ E int servernum; /**** ircd.c ****/ E void pmodule_ircd_proto(IRCDProtoNew *); -E void pmodule_set_mod_current_buffer(void (*func) (int ac, char **av)); E void pmodule_cmd_372(void (*func) (const char *source, const char *msg)); E void pmodule_cmd_372_error(void (*func) (const char *source)); E void pmodule_cmd_375(void (*func) (const char *source)); @@ -1142,8 +1141,6 @@ E void notice(char *source, const char *dest, const char *fmt, ...); /******************************************************************************/ -E int anope_set_mod_current_buffer(int ac, char **av); - E void anope_cmd_211(const char *fmt, ...); /* 211 */ E void anope_cmd_219(const char *source, const char *who); /* 219 */ E void anope_cmd_242(const char *fmt, ...); /* 242 */ diff --git a/src/ircd.c b/src/ircd.c index 1aac8ecf1..de77e5be4 100644 --- a/src/ircd.c +++ b/src/ircd.c @@ -590,12 +590,6 @@ void anope_cmd_ctcp(const char *source, const char *dest, const char *fmt, ...) /** * Set routines for modules to set the prefered function for dealing with things. **/ - -void pmodule_set_mod_current_buffer(void (*func) (int ac, char **av)) -{ - ircdproto.ircd_set_mod_current_buffer = func; -} - void pmodule_cmd_372(void (*func) (const char *source, const char *msg)) { ircdproto.ircd_cmd_372 = func; diff --git a/src/process.c b/src/process.c index 552bb93b8..520f83949 100644 --- a/src/process.c +++ b/src/process.c @@ -351,40 +351,23 @@ void process() if (protocoldebug) { protocol_debug(source, cmd, ac, av); } + if (mod_current_buffer) { free(mod_current_buffer); } - /* fix to moduleGetLastBuffer() bug 296 */ - /* old logic was that since its meant for PRIVMSG that we would get - the NICK as AV[0] and the rest would be in av[1], however on Bahamut - based systems when you do /cs it assumes we will translate the command - to the NICK and thus AV[0] is the message. The new logic is to check - av[0] to see if its a service nick if so assign mod_current_buffer the - value from AV[1] else just assign av[0] - TSL */ - /* First check if the ircd proto module overrides this -GD */ - /* fix to moduleGetLastBuffer() bug 476: - fixed in part by adding {} to nickIsServices() - however if you have a pseudo they could not use moduleGetLastBuffer() - cause they are not part of nickIsServices, even those the ac count is 2 - that was ignored and only the first param was passed on which is fine for - Bahmut ircd aliases but not for pseudo clients on. So additional logic is - that if the ac is greater then 1 copy av[1] else copy av[0] - I also changed from if statments, cause attempting to access a array member - that is not set can lead to odd things - TSL (3/12/06) */ - // The function below is never declared in any protocol modules -- CyberBotX - //if (!anope_set_mod_current_buffer(ac, av)) { - if (ac >= 1) { - if (nickIsServices(av[0], 1)) { - mod_current_buffer = - (ac > 1 ? sstrdup(av[1]) : sstrdup(av[0])); - } else { - mod_current_buffer = - (ac > 1 ? sstrdup(av[1]) : sstrdup(av[0])); - } + + if (ac >= 1) { + if (nickIsServices(av[0], 1)) { + mod_current_buffer = + (ac > 1 ? sstrdup(av[1]) : sstrdup(av[0])); } else { - mod_current_buffer = NULL; + mod_current_buffer = + (ac > 1 ? sstrdup(av[1]) : sstrdup(av[0])); } - //} + } else { + mod_current_buffer = NULL; + } + /* Do something with the message. */ m = find_message(cmd); if (m) { |