summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/irc/irc-protocol.c23
1 files changed, 15 insertions, 8 deletions
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index 21ff5d8f0..c9e2d7b49 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -3941,30 +3941,37 @@ IRC_PROTOCOL_CALLBACK(whowas_nick_msg)
* Callback for the IRC command "311": whois, user.
*
* Command looks like:
- * :server 311 mynick nick user host * :realname here
+ * 311 mynick nick user host * :realname here
*/
IRC_PROTOCOL_CALLBACK(311)
{
- IRC_PROTOCOL_MIN_ARGS(8);
+ char *str_params;
+
+ IRC_PROTOCOL_MIN_PARAMS(6);
+
+ str_params = irc_protocol_string_params (params, 5, num_params - 1);
weechat_printf_date_tags (
irc_msgbuffer_get_target_buffer (
- server, argv[3], command, "whois", NULL),
+ server, params[1], command, "whois", NULL),
date,
irc_protocol_tags (command, "irc_numeric", NULL, NULL),
"%s%s[%s%s%s] (%s%s@%s%s)%s: %s",
weechat_prefix ("network"),
IRC_COLOR_CHAT_DELIMITERS,
- irc_nick_color_for_msg (server, 1, NULL, argv[3]),
- argv[3],
+ irc_nick_color_for_msg (server, 1, NULL, params[1]),
+ params[1],
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_HOST,
- argv[4],
- argv[5],
+ params[2],
+ params[3],
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
- (argv_eol[7][0] == ':') ? argv_eol[7] + 1 : argv_eol[7]);
+ str_params);
+
+ if (str_params)
+ free (str_params);
return WEECHAT_RC_OK;
}