pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-01 07:16:37 +02:00
Code Activity

api: return value in function command(), remove WeeChat error after command callback if return code is WEECHAT_RC_ERROR

Browse Source
This commit is contained in:
Sébastien Helleu
2014-11-22 08:14:29 +01:00
parent e253a2509a
commit 1ef3237b6b
50 changed files with 668 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/alias/alias.c
+1 -2
View File
@@ -815,8 +815,7 @@ unalias_command_cb (void *data, struct t_gui_buffer *buffer, int argc,
(void) buffer;
(void) argv_eol;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
for (i = 1; i < argc; i++)
{
src/plugins/aspell/weechat-aspell-command.c
+3 -5
View File
@@ -420,8 +420,7 @@ weechat_aspell_command_cb (void *data, struct t_gui_buffer *buffer,
/* set dictionary for current buffer */
if (weechat_strcasecmp (argv[1], "setdict") == 0)
{
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "setdict");
dicts = weechat_string_replace (argv_eol[2], " ", "");
weechat_aspell_command_set_dict (buffer,
(dicts) ? dicts : argv[2]);
@@ -440,8 +439,7 @@ weechat_aspell_command_cb (void *data, struct t_gui_buffer *buffer,
/* add word to personal dictionary */
if (weechat_strcasecmp (argv[1], "addword") == 0)
{
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "addword");
if (argc > 3)
{
/* use a given dict */
@@ -455,7 +453,7 @@ weechat_aspell_command_cb (void *data, struct t_gui_buffer *buffer,
return WEECHAT_RC_OK;
}
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
/*
src/plugins/charset/charset.c
+1 -1
View File
@@ -488,7 +488,7 @@ charset_command_cb (void *data, struct t_gui_buffer *buffer, int argc,
length = strlen (plugin_name) + 1 + strlen (name) + 1;
option_name = malloc (length);
if (!option_name)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
snprintf (option_name, length, "%s.%s", plugin_name, name);
}
src/plugins/exec/exec-command.c
+6 -12
View File
@@ -627,8 +627,7 @@ exec_command_exec (void *data, struct t_gui_buffer *buffer, int argc,
/* send text to a running process */
if (weechat_strcasecmp (argv[1], "-in") == 0)
{
if (argc < 4)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(4, "-in");
ptr_exec_cmd = exec_command_search_running_id (argv[2]);
if (ptr_exec_cmd && ptr_exec_cmd->hook)
{
@@ -647,8 +646,7 @@ exec_command_exec (void *data, struct t_gui_buffer *buffer, int argc,
/* send text to a running process (if given), then close stdin */
if (weechat_strcasecmp (argv[1], "-inclose") == 0)
{
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "-inclose");
ptr_exec_cmd = exec_command_search_running_id (argv[2]);
if (ptr_exec_cmd && ptr_exec_cmd->hook)
{
@@ -671,8 +669,7 @@ exec_command_exec (void *data, struct t_gui_buffer *buffer, int argc,
/* send a signal to a running process */
if (weechat_strcasecmp (argv[1], "-signal") == 0)
{
if (argc < 4)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(4, "-signal");
ptr_exec_cmd = exec_command_search_running_id (argv[2]);
if (ptr_exec_cmd)
weechat_hook_set (ptr_exec_cmd->hook, "signal", argv[3]);
@@ -682,8 +679,7 @@ exec_command_exec (void *data, struct t_gui_buffer *buffer, int argc,
/* send a KILL signal to a running process */
if (weechat_strcasecmp (argv[1], "-kill") == 0)
{
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "-kill");
ptr_exec_cmd = exec_command_search_running_id (argv[2]);
if (ptr_exec_cmd)
weechat_hook_set (ptr_exec_cmd->hook, "signal", "kill");
@@ -707,8 +703,7 @@ exec_command_exec (void *data, struct t_gui_buffer *buffer, int argc,
/* set a hook property */
if (weechat_strcasecmp (argv[1], "-set") == 0)
{
if (argc < 5)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(5, "-set");
ptr_exec_cmd = exec_command_search_running_id (argv[2]);
if (ptr_exec_cmd)
weechat_hook_set (ptr_exec_cmd->hook, argv[3], argv_eol[4]);
@@ -718,8 +713,7 @@ exec_command_exec (void *data, struct t_gui_buffer *buffer, int argc,
/* delete terminated command(s) */
if (weechat_strcasecmp (argv[1], "-del") == 0)
{
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "-del");
if (weechat_strcasecmp (argv[2], "-all") == 0)
{
count = 0;
src/plugins/guile/weechat-guile-api.c
+7 -5
View File
@@ -3875,16 +3875,18 @@ weechat_guile_api_bar_remove (SCM bar)
SCM
weechat_guile_api_command (SCM buffer, SCM command)
{
int rc;
API_FUNC(1, "command", API_RETURN_ERROR);
if (!scm_is_string (buffer) || !scm_is_string (command))
API_WRONG_ARGS(API_RETURN_ERROR);
plugin_script_api_command (weechat_guile_plugin,
guile_current_script,
API_STR2PTR(API_SCM_TO_STRING(buffer)),
API_SCM_TO_STRING(command));
rc = plugin_script_api_command (weechat_guile_plugin,
guile_current_script,
API_STR2PTR(API_SCM_TO_STRING(buffer)),
API_SCM_TO_STRING(command));
API_RETURN_OK;
API_RETURN_INT(rc);
}
SCM
src/plugins/guile/weechat-guile.c
+2 -2
View File
@@ -630,7 +630,7 @@ weechat_guile_command_cb (void *data, struct t_gui_buffer *buffer,
weechat_guile_unload_all ();
}
else
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
else
{
@@ -691,7 +691,7 @@ weechat_guile_command_cb (void *data, struct t_gui_buffer *buffer,
weechat_guile_stdout_flush ();
}
else
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
return WEECHAT_RC_OK;
src/plugins/irc/irc-command.c
+65 -113
View File
@@ -373,8 +373,7 @@ irc_command_allchan (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
current_server = 0;
ptr_exclude_channels = NULL;
@@ -425,8 +424,7 @@ irc_command_allpv (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
current_server = 0;
ptr_exclude_channels = NULL;
@@ -547,8 +545,7 @@ irc_command_allserv (void *data, struct t_gui_buffer *buffer, int argc,
(void) data;
(void) buffer;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
ptr_exclude_servers = NULL;
ptr_command = argv_eol[1];
@@ -1277,12 +1274,11 @@ irc_command_ctcp (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "");
irc_cmd = strdup (argv[2]);
if (!irc_cmd)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
weechat_string_toupper (irc_cmd);
@@ -1462,8 +1458,7 @@ irc_command_dcc (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "");
/* use the local interface, from the server socket */
memset (&addr, 0, sizeof (addr));
@@ -1484,8 +1479,7 @@ irc_command_dcc (void *data, struct t_gui_buffer *buffer, int argc,
/* DCC SEND file */
if (weechat_strcasecmp (argv[1], "send") == 0)
{
if (argc < 4)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(4, "send");
infolist = weechat_infolist_new ();
if (infolist)
{
@@ -1513,8 +1507,7 @@ irc_command_dcc (void *data, struct t_gui_buffer *buffer, int argc,
/* DCC CHAT */
if (weechat_strcasecmp (argv[1], "chat") == 0)
{
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "chat");
infolist = weechat_infolist_new ();
if (infolist)
{
@@ -1539,7 +1532,7 @@ irc_command_dcc (void *data, struct t_gui_buffer *buffer, int argc,
return WEECHAT_RC_OK;
}
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
/*
@@ -1948,8 +1941,7 @@ irc_command_ignore (void *data, struct t_gui_buffer *buffer, int argc,
/* add ignore */
if (weechat_strcasecmp (argv[1], "add") == 0)
{
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "add");
mask = argv[2];
server = (argc > 3) ? argv[3] : NULL;
@@ -2015,8 +2007,7 @@ irc_command_ignore (void *data, struct t_gui_buffer *buffer, int argc,
/* delete ignore */
if (weechat_strcasecmp (argv[1], "del") == 0)
{
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "del");
if (weechat_strcasecmp (argv[2], "-all") == 0)
{
@@ -2069,7 +2060,7 @@ irc_command_ignore (void *data, struct t_gui_buffer *buffer, int argc,
return WEECHAT_RC_OK;
}
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
/*
@@ -2119,8 +2110,7 @@ irc_command_invite (void *data, struct t_gui_buffer *buffer, int argc,
(void) data;
(void) argv_eol;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
if (argc > 2)
{
@@ -2182,8 +2172,7 @@ irc_command_ison (void *data, struct t_gui_buffer *buffer, int argc,
(void) data;
(void) argv;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"ISON :%s", argv_eol[1]);
@@ -2345,10 +2334,10 @@ irc_command_join (void *data, struct t_gui_buffer *buffer, int argc,
if (weechat_strcasecmp (argv[i], "-server") == 0)
{
if (argc <= i + 1)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
ptr_server = irc_server_search (argv[i + 1]);
if (!ptr_server)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
arg_channels = i + 2;
i++;
}
@@ -2380,7 +2369,7 @@ irc_command_join (void *data, struct t_gui_buffer *buffer, int argc,
1, noswitch);
}
else
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
return WEECHAT_RC_OK;
@@ -2437,13 +2426,11 @@ irc_command_kick (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
if (irc_channel_is_channel (ptr_server, argv[1]))
{
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "");
pos_channel = argv[1];
pos_nick = argv[2];
pos_comment = argv_eol[3];
@@ -2488,13 +2475,11 @@ irc_command_kickban (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
if (irc_channel_is_channel (ptr_server, argv[1]))
{
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "");
pos_channel = argv[1];
pos_nick = argv[2];
pos_comment = argv_eol[3];
@@ -2518,7 +2503,7 @@ irc_command_kickban (void *data, struct t_gui_buffer *buffer, int argc,
/* kick nick from channel */
nick_only = strdup (pos_nick);
if (!nick_only)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
pos = strchr (nick_only, '@');
if (pos)
@@ -2582,8 +2567,7 @@ irc_command_kill (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
if (argc < 3)
{
@@ -2951,8 +2935,7 @@ irc_command_msg (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "");
arg_target = 1;
arg_text = 2;
@@ -2970,7 +2953,7 @@ irc_command_msg (void *data, struct t_gui_buffer *buffer, int argc,
targets = weechat_string_split (argv[arg_target], ",", 0, 0,
&num_targets);
if (!targets)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
for (i = 0; i < num_targets; i++)
{
@@ -3222,13 +3205,12 @@ irc_command_nick (void *data, struct t_gui_buffer *buffer, int argc,
(void) data;
(void) argv_eol;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
if (argc > 2)
{
if (weechat_strcasecmp (argv[1], "-all") != 0)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
{
@@ -3259,8 +3241,7 @@ irc_command_notice (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "");
arg_target = 1;
arg_text = 2;
@@ -3356,8 +3337,7 @@ irc_command_notify (void *data, struct t_gui_buffer *buffer, int argc,
/* add notify */
if (weechat_strcasecmp (argv[1], "add") == 0)
{
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "add");
check_away = 0;
@@ -3440,8 +3420,7 @@ irc_command_notify (void *data, struct t_gui_buffer *buffer, int argc,
/* delete notify */
if (weechat_strcasecmp (argv[1], "del") == 0)
{
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "del");
if (argc > 3)
{
@@ -3514,7 +3493,7 @@ irc_command_notify (void *data, struct t_gui_buffer *buffer, int argc,
return WEECHAT_RC_OK;
}
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
/*
@@ -3572,8 +3551,7 @@ irc_command_oper (void *data, struct t_gui_buffer *buffer, int argc,
(void) data;
(void) argv;
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "");
irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"OPER %s", argv_eol[1]);
@@ -3693,8 +3671,7 @@ irc_command_ping (void *data, struct t_gui_buffer *buffer, int argc,
(void) data;
(void) argv;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"PING %s", argv_eol[1]);
@@ -3717,8 +3694,7 @@ irc_command_pong (void *data, struct t_gui_buffer *buffer, int argc,
(void) data;
(void) argv;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"PONG %s", argv_eol[1]);
@@ -3742,8 +3718,7 @@ irc_command_query (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
arg_nick = 1;
arg_text = 2;
@@ -3758,7 +3733,7 @@ irc_command_query (void *data, struct t_gui_buffer *buffer, int argc,
nicks = weechat_string_split (argv[arg_nick], ",", 0, 0, &num_nicks);
if (!nicks)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
for (i = 0; i < num_nicks; i++)
{
@@ -3901,21 +3876,20 @@ irc_command_quote (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
if ((argc >= 4) && (weechat_strcasecmp (argv[1], "-server") == 0))
{
ptr_server = irc_server_search (argv[2]);
if (!ptr_server || (ptr_server->sock < 0))
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"%s", argv_eol[3]);
}
else
{
if (!ptr_server || (ptr_server->sock < 0))
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"%s", argv_eol[1]);
}
@@ -4102,16 +4076,14 @@ irc_command_remove (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
ptr_channel_name = (ptr_channel) ? ptr_channel->name : NULL;
index_nick = 1;
if (irc_channel_is_channel (ptr_server, argv[1]))
{
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "");
ptr_channel_name = argv[1];
index_nick = 2;
}
@@ -4192,8 +4164,7 @@ irc_command_sajoin (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "");
irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"SAJOIN %s %s", argv[1], argv_eol[2]);
@@ -4276,8 +4247,7 @@ irc_command_sanick (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "");
irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"SANICK %s %s", argv[1], argv_eol[2]);
@@ -4299,8 +4269,7 @@ irc_command_sapart (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "");
irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"SAPART %s %s", argv[1], argv_eol[2]);
@@ -4322,8 +4291,7 @@ irc_command_saquit (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "");
irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"SAQUIT %s :%s", argv[1], argv_eol[2]);
@@ -4784,8 +4752,7 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
if (weechat_strcasecmp (argv[1], "add") == 0)
{
if (argc < 4)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(4, "add");
ptr_server2 = irc_server_casesearch (argv[2]);
if (ptr_server2)
{
@@ -4829,8 +4796,7 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
if (weechat_strcasecmp (argv[1], "copy") == 0)
{
if (argc < 4)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(4, "copy");
/* look for server by name */
server_found = irc_server_search (argv[2]);
@@ -4873,13 +4839,12 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
return WEECHAT_RC_OK;
}
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
if (weechat_strcasecmp (argv[1], "rename") == 0)
{
if (argc < 4)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(4, "rename");
/* look for server by name */
server_found = irc_server_search (argv[2]);
@@ -4921,13 +4886,12 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
return WEECHAT_RC_OK;
}
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
if (weechat_strcasecmp (argv[1], "keep") == 0)
{
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "keep");
/* look for server by name */
server_found = irc_server_search (argv[2]);
@@ -4968,8 +4932,7 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
if (weechat_strcasecmp (argv[1], "del") == 0)
{
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "del");
/* look for server by name */
server_found = irc_server_search (argv[2]);
@@ -5040,8 +5003,7 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
if (weechat_strcasecmp (argv[1], "fakerecv") == 0)
{
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "fakerecv");
IRC_COMMAND_CHECK_SERVER("server fakerecv", 1);
length = strlen (argv_eol[2]);
if (length > 0)
@@ -5060,7 +5022,7 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
return WEECHAT_RC_OK;
}
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
/*
@@ -5078,8 +5040,7 @@ irc_command_service (void *data, struct t_gui_buffer *buffer, int argc,
(void) data;
(void) argv;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"SERVICE %s", argv_eol[1]);
@@ -5131,8 +5092,7 @@ irc_command_squery (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
if (argc > 2)
{
@@ -5163,8 +5123,7 @@ irc_command_squit (void *data, struct t_gui_buffer *buffer, int argc,
(void) data;
(void) argv;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
irc_server_sendf (ptr_server, 0, NULL, "SQUIT %s", argv_eol[1]);
@@ -5216,8 +5175,7 @@ irc_command_summon (void *data, struct t_gui_buffer *buffer, int argc,
(void) data;
(void) argv;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"SUMMON %s", argv_eol[1]);
@@ -5379,8 +5337,7 @@ irc_command_unban (void *data, struct t_gui_buffer *buffer, int argc,
(void) data;
(void) argv_eol;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
if (irc_channel_is_channel (ptr_server, argv[1]))
{
@@ -5438,8 +5395,7 @@ irc_command_unquiet (void *data, struct t_gui_buffer *buffer, int argc,
(void) data;
(void) argv_eol;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
if (irc_channel_is_channel (ptr_server, argv[1]))
{
@@ -5505,8 +5461,7 @@ irc_command_userhost (void *data, struct t_gui_buffer *buffer, int argc,
(void) data;
(void) argv;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"USERHOST %s", argv_eol[1]);
@@ -5641,8 +5596,7 @@ irc_command_wallchops (void *data, struct t_gui_buffer *buffer, int argc,
/* make C compiler happy */
(void) data;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
if (irc_channel_is_channel (ptr_server, argv[1]))
{
@@ -5750,8 +5704,7 @@ irc_command_wallops (void *data, struct t_gui_buffer *buffer, int argc,
(void) data;
(void) argv;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"WALLOPS :%s", argv_eol[1]);
@@ -5829,7 +5782,7 @@ irc_command_whois (void *data, struct t_gui_buffer *buffer, int argc,
}
if (!ptr_nick)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"WHOIS %s%s%s",
@@ -5856,8 +5809,7 @@ irc_command_whowas (void *data, struct t_gui_buffer *buffer, int argc,
(void) data;
(void) argv;
if (argc < 2)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(2, "");
irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"WHOWAS %s", argv_eol[1]);
src/plugins/logger/logger.c
+1 -1
View File
@@ -906,7 +906,7 @@ logger_command_cb (void *data, struct t_gui_buffer *buffer,
return WEECHAT_RC_OK;
}
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
/*
src/plugins/lua/weechat-lua-api.c
+6 -5
View File
@@ -4249,6 +4249,7 @@ static int
weechat_lua_api_command (lua_State *L)
{
const char *buffer, *command;
int rc;
API_FUNC(1, "command", API_RETURN_ERROR);
if (lua_gettop (L) < 2)
@@ -4257,12 +4258,12 @@ weechat_lua_api_command (lua_State *L)
buffer = lua_tostring (L, -2);
command = lua_tostring (L, -1);
plugin_script_api_command (weechat_lua_plugin,
lua_current_script,
API_STR2PTR(buffer),
command);
rc = plugin_script_api_command (weechat_lua_plugin,
lua_current_script,
API_STR2PTR(buffer),
command);
API_RETURN_OK;
API_RETURN_INT(rc);
}
static int
src/plugins/lua/weechat-lua.c
+2 -2
View File
@@ -645,7 +645,7 @@ weechat_lua_command_cb (void *data, struct t_gui_buffer *buffer,
weechat_lua_unload_all ();
}
else
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
else
{
@@ -695,7 +695,7 @@ weechat_lua_command_cb (void *data, struct t_gui_buffer *buffer,
lua_quiet = 0;
}
else
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
return WEECHAT_RC_OK;
src/plugins/perl/weechat-perl-api.c
+6 -5
View File
@@ -4019,6 +4019,7 @@ XS (XS_weechat_api_bar_remove)
XS (XS_weechat_api_command)
{
char *buffer, *command;
int rc;
dXSARGS;
API_FUNC(1, "command", API_RETURN_ERROR);
@@ -4028,12 +4029,12 @@ XS (XS_weechat_api_command)
buffer = SvPV_nolen (ST (0));
command = SvPV_nolen (ST (1));
plugin_script_api_command (weechat_perl_plugin,
perl_current_script,
API_STR2PTR(buffer),
command);
rc = plugin_script_api_command (weechat_perl_plugin,
perl_current_script,
API_STR2PTR(buffer),
command);
API_RETURN_OK;
API_RETURN_INT(rc);
}
XS (XS_weechat_api_info_get)
src/plugins/perl/weechat-perl.c
+2 -2
View File
@@ -674,7 +674,7 @@ weechat_perl_command_cb (void *data, struct t_gui_buffer *buffer,
weechat_perl_unload_all ();
}
else
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
else
{
@@ -724,7 +724,7 @@ weechat_perl_command_cb (void *data, struct t_gui_buffer *buffer,
perl_quiet = 0;
}
else
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
return WEECHAT_RC_OK;
src/plugins/plugin-api.c
+6 -3
View File
@@ -260,21 +260,24 @@ plugin_api_color (const char *color_name)
* Executes a command on a buffer (simulates user entry).
*/
void
int
plugin_api_command (struct t_weechat_plugin *plugin,
struct t_gui_buffer *buffer, const char *command)
{
char *command2;
int rc;
if (!plugin || !command)
return;
return WEECHAT_RC_ERROR;
command2 = string_iconv_to_internal (plugin->charset, command);
if (!buffer)
buffer = gui_current_window->buffer;
input_data (buffer, (command2) ? command2 : command);
rc = input_data (buffer, (command2) ? command2 : command);
if (command2)
free (command2);
return rc;
}
/*
src/plugins/plugin-api.h
+3 -2
View File
@@ -53,8 +53,9 @@ extern const char *plugin_api_prefix (const char *prefix);
extern const char *plugin_api_color (const char *color_name);
/* command */
extern void plugin_api_command (struct t_weechat_plugin *plugin,
struct t_gui_buffer *buffer, const char *command);
extern int plugin_api_command (struct t_weechat_plugin *plugin,
struct t_gui_buffer *buffer,
const char *command);
/* infolist */
extern int plugin_api_infolist_next (struct t_infolist *infolist);
src/plugins/plugin-script-api.c
+5 -2
View File
@@ -1331,20 +1331,23 @@ plugin_script_api_bar_item_remove (struct t_weechat_plugin *weechat_plugin,
* Executes a command on a buffer (simulates user entry).
*/
void
int
plugin_script_api_command (struct t_weechat_plugin *weechat_plugin,
struct t_plugin_script *script,
struct t_gui_buffer *buffer, const char *command)
{
char *command2;
int rc;
command2 = (script->charset && script->charset[0]) ?
weechat_iconv_to_internal (script->charset, command) : NULL;
weechat_command (buffer, (command2) ? command2 : command);
rc = weechat_command (buffer, (command2) ? command2 : command);
if (command2)
free (command2);
return rc;
}
/*
src/plugins/plugin-script-api.h
+4 -4
View File
@@ -330,10 +330,10 @@ extern struct t_gui_bar_item *plugin_script_api_bar_item_new (struct t_weechat_p
extern void plugin_script_api_bar_item_remove (struct t_weechat_plugin *weechat_plugin,
struct t_plugin_script *script,
struct t_gui_bar_item *item);
extern void plugin_script_api_command (struct t_weechat_plugin *weechat_plugin,
struct t_plugin_script *script,
struct t_gui_buffer *buffer,
const char *command);
extern int plugin_script_api_command (struct t_weechat_plugin *weechat_plugin,
struct t_plugin_script *script,
struct t_gui_buffer *buffer,
const char *command);
extern const char *plugin_script_api_config_get_plugin (struct t_weechat_plugin *weechat_plugin,
struct t_plugin_script *script,
const char *option);
src/plugins/python/weechat-python-api.c
+6 -5
View File
@@ -4198,6 +4198,7 @@ static PyObject *
weechat_python_api_command (PyObject *self, PyObject *args)
{
char *buffer, *command;
int rc;
API_FUNC(1, "command", API_RETURN_ERROR);
buffer = NULL;
@@ -4205,12 +4206,12 @@ weechat_python_api_command (PyObject *self, PyObject *args)
if (!PyArg_ParseTuple (args, "ss", &buffer, &command))
API_WRONG_ARGS(API_RETURN_ERROR);
plugin_script_api_command (weechat_python_plugin,
python_current_script,
API_STR2PTR(buffer),
command);
rc = plugin_script_api_command (weechat_python_plugin,
python_current_script,
API_STR2PTR(buffer),
command);
API_RETURN_OK;
API_RETURN_INT(rc);
}
static PyObject *
src/plugins/python/weechat-python.c
+2 -2
View File
@@ -960,7 +960,7 @@ weechat_python_command_cb (void *data, struct t_gui_buffer *buffer,
weechat_python_unload_all ();
}
else
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
else
{
@@ -1010,7 +1010,7 @@ weechat_python_command_cb (void *data, struct t_gui_buffer *buffer,
python_quiet = 0;
}
else
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
return WEECHAT_RC_OK;
src/plugins/relay/relay-command.c
+5 -9
View File
@@ -216,8 +216,7 @@ relay_command_relay (void *data, struct t_gui_buffer *buffer, int argc,
if (weechat_strcasecmp (argv[1], "add") == 0)
{
if (argc < 4)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(4, "add");
if (relay_config_create_option_port (NULL,
relay_config_file,
relay_config_section_port,
@@ -234,8 +233,7 @@ relay_command_relay (void *data, struct t_gui_buffer *buffer, int argc,
if (weechat_strcasecmp (argv[1], "del") == 0)
{
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "del");
ptr_server = relay_server_search (argv_eol[2]);
if (ptr_server)
{
@@ -264,8 +262,7 @@ relay_command_relay (void *data, struct t_gui_buffer *buffer, int argc,
if (weechat_strcasecmp (argv[1], "stop") == 0)
{
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "stop");
ptr_server = relay_server_search (argv_eol[2]);
if (ptr_server)
{
@@ -284,8 +281,7 @@ relay_command_relay (void *data, struct t_gui_buffer *buffer, int argc,
if (weechat_strcasecmp (argv[1], "restart") == 0)
{
if (argc < 3)
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_MIN_ARGS(3, "restart");
ptr_server = relay_server_search (argv_eol[2]);
if (ptr_server)
{
@@ -315,7 +311,7 @@ relay_command_relay (void *data, struct t_gui_buffer *buffer, int argc,
return WEECHAT_RC_OK;
}
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
if (!relay_buffer)
src/plugins/ruby/weechat-ruby-api.c
+6 -5
View File
@@ -4897,6 +4897,7 @@ static VALUE
weechat_ruby_api_command (VALUE class, VALUE buffer, VALUE command)
{
char *c_buffer, *c_command;
int rc;
API_FUNC(1, "command", API_RETURN_ERROR);
if (NIL_P (buffer) || NIL_P (command))
@@ -4908,12 +4909,12 @@ weechat_ruby_api_command (VALUE class, VALUE buffer, VALUE command)
c_buffer = StringValuePtr (buffer);
c_command = StringValuePtr (command);
plugin_script_api_command (weechat_ruby_plugin,
ruby_current_script,
API_STR2PTR(c_buffer),
c_command);
rc = plugin_script_api_command (weechat_ruby_plugin,
ruby_current_script,
API_STR2PTR(c_buffer),
c_command);
API_RETURN_OK;
API_RETURN_INT(rc);
}
static VALUE
src/plugins/ruby/weechat-ruby.c
+2 -2
View File
@@ -814,7 +814,7 @@ weechat_ruby_command_cb (void *data, struct t_gui_buffer *buffer,
weechat_ruby_unload_all ();
}
else
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
else
{
@@ -864,7 +864,7 @@ weechat_ruby_command_cb (void *data, struct t_gui_buffer *buffer,
ruby_quiet = 0;
}
else
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
return WEECHAT_RC_OK;
src/plugins/script/script-command.c
+1 -1
View File
@@ -275,7 +275,7 @@ script_command_script (void *data, struct t_gui_buffer *buffer, int argc,
return WEECHAT_RC_OK;
}
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
/*
src/plugins/tcl/weechat-tcl-api.c
+6 -6
View File
@@ -4663,7 +4663,7 @@ weechat_tcl_api_command (ClientData clientData, Tcl_Interp *interp,
{
Tcl_Obj *objp;
char *buffer, *command;
int i;
int i, rc;
API_FUNC(1, "command", API_RETURN_ERROR);
if (objc < 3)
@@ -4672,12 +4672,12 @@ weechat_tcl_api_command (ClientData clientData, Tcl_Interp *interp,
buffer = Tcl_GetStringFromObj (objv[1], &i);
command = Tcl_GetStringFromObj (objv[2], &i);
plugin_script_api_command (weechat_tcl_plugin,
tcl_current_script,
API_STR2PTR(buffer),
command);
rc = plugin_script_api_command (weechat_tcl_plugin,
tcl_current_script,
API_STR2PTR(buffer),
command);
API_RETURN_OK;
API_RETURN_INT(rc);
}
static int
src/plugins/tcl/weechat-tcl.c
+2 -2
View File
@@ -550,7 +550,7 @@ weechat_tcl_command_cb (void *data, struct t_gui_buffer *buffer,
weechat_tcl_unload_all ();
}
else
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
else
{
@@ -600,7 +600,7 @@ weechat_tcl_command_cb (void *data, struct t_gui_buffer *buffer,
tcl_quiet = 0;
}
else
return WEECHAT_RC_ERROR;
WEECHAT_COMMAND_ERROR;
}
return WEECHAT_RC_OK;
src/plugins/trigger/trigger-command.c
+3
View File
@@ -1049,6 +1049,9 @@ end:
if (sargv)
weechat_string_free_split (sargv);
if (rc == WEECHAT_RC_ERROR)
WEECHAT_COMMAND_ERROR;
return rc;
}
src/plugins/weechat-plugin.h
+35 -3
View File
@@ -57,7 +57,7 @@ struct timeval;
* please change the date with current one; for a second change at same
* date, increment the 01, otherwise please keep 01.
*/
#define WEECHAT_PLUGIN_API_VERSION "20140829-01"
#define WEECHAT_PLUGIN_API_VERSION "20141122-01"
/* macros for defining plugin infos */
#define WEECHAT_PLUGIN_NAME(__name) \
@@ -192,6 +192,38 @@ struct timeval;
} \
}
/*
* macro to return error in case of missing arguments in callback of
* hook_command
*/
#define WEECHAT_COMMAND_MIN_ARGS(__min_args, __option) \
if (argc < __min_args) \
{ \
weechat_printf_date_tags ( \
NULL, 0, "no_filter", \
_("%sToo few arguments for command \"%s%s%s\" " \
"(help on command: /help %s)"), \
weechat_prefix ("error"), \
argv[0], \
(__option && __option[0]) ? " " : "", \
(__option && __option[0]) ? __option : "", \
argv[0] + 1); \
return WEECHAT_RC_ERROR; \
}
/* macro to return error in callback of hook_command */
#define WEECHAT_COMMAND_ERROR \
{ \
weechat_printf_date_tags ( \
NULL, 0, "no_filter", \
_("%sError with command \"%s\" " \
"(help on command: /help %s)"), \
weechat_prefix ("error"), \
argv_eol[0], \
argv[0] + 1); \
return WEECHAT_RC_ERROR; \
}
struct t_weechat_plugin
{
/* plugin variables */
@@ -813,8 +845,8 @@ struct t_weechat_plugin
void (*bar_remove) (struct t_gui_bar *bar);
/* command */
void (*command) (struct t_weechat_plugin *plugin,
struct t_gui_buffer *buffer, const char *command);
int (*command) (struct t_weechat_plugin *plugin,
struct t_gui_buffer *buffer, const char *command);
/* network */
int (*network_pass_proxy) (const char *proxy, int sock,