1
0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00

"/WHOIS *" requires -yes option to work.

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@738 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-10-13 22:34:19 +00:00 committed by cras
parent 20bac288f6
commit f850204479

View File

@ -410,6 +410,7 @@ static char *get_redirect_nicklist(const char *nicks, int *free)
/* SYNTAX: WHOIS [<server>] [<nicks>] */ /* SYNTAX: WHOIS [<server>] [<nicks>] */
static void cmd_whois(const char *data, IRC_SERVER_REC *server) static void cmd_whois(const char *data, IRC_SERVER_REC *server)
{ {
GHashTable *optlist;
char *qserver, *query; char *qserver, *query;
void *free_arg; void *free_arg;
int free_nick; int free_nick;
@ -418,16 +419,20 @@ static void cmd_whois(const char *data, IRC_SERVER_REC *server)
if (!IS_IRC_SERVER(server) || !server->connected) if (!IS_IRC_SERVER(server) || !server->connected)
cmd_return_error(CMDERR_NOT_CONNECTED); cmd_return_error(CMDERR_NOT_CONNECTED);
if (!cmd_get_params(data, &free_arg, 2, &qserver, &query)) if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS,
"whois", &optlist, &qserver, &query))
return; return;
if (*query == '\0') { if (*query == '\0') {
cmd_params_free(free_arg); query = qserver;
if (!cmd_get_params(data, &free_arg, 1, &query)) return;
qserver = ""; qserver = "";
} }
if (*query == '\0') query = server->nick; if (*query == '\0') query = server->nick;
if (strcmp(query, "*") == 0 &&
g_hash_table_lookup(optlist, "yes") == NULL)
cmd_param_error(CMDERR_NOT_GOOD_IDEA);
if (*qserver == '\0') if (*qserver == '\0')
g_string_sprintf(tmpstr, "WHOIS %s", query); g_string_sprintf(tmpstr, "WHOIS %s", query);
else else
@ -985,6 +990,7 @@ void irc_commands_init(void)
command_set_options("topic", "delete"); command_set_options("topic", "delete");
command_set_options("list", "yes"); command_set_options("list", "yes");
command_set_options("away", "one all"); command_set_options("away", "one all");
command_set_options("whois", "yes");
} }
void irc_commands_deinit(void) void irc_commands_deinit(void)