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

Aliases are executed before WeeChat/IRC commands, /builtin command added

Browse Source
This commit is contained in:
Sebastien Helleu
2006-03-21 11:41:02 +00:00
parent 6a55ee4f79
commit 27fd4beca7
32 changed files with 2670 additions and 2276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2 -1
View File
@@ -1,10 +1,11 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
ChangeLog - 2006-03-19
ChangeLog - 2006-03-21
Version 0.1.9 (under dev!):
* aliases are executed before WeeChat/IRC commands, /builtin command added
* added /cycle command, /part command does close buffer any more (use
/buffer close (or alias /close) to part and close buffer
doc/en/weechat_commands.xml
+8
View File
@@ -27,6 +27,14 @@ server
channel: jump to buffer by server and/or channel name
number: jump to buffer by number
</programlisting>
<command>builtin command</command>
<programlisting>
launch WeeChat/IRC builtin command (do not look at plugins handlers or aliases)
command: command to execute (a '/' is automatically added if not found at beginning of command)
</programlisting>
<command>charset [(decode_iso | decode_utf | encode) charset]</command>
<programlisting>
doc/fr/weechat_commands.xml
+8
View File
@@ -27,6 +27,14 @@ serveur
canal: sauter au tampon par serveur et/ou nom de canal
nombre: sauter au tampon qui a ce numéro
</programlisting>
<command>builtin commande</command>
<programlisting>
lance une commande WeeChat/IRC interne (sans regarder les gestionnaires de commandes et les alias)
commande: commande à exécuter (un '/' est automatiquement ajouté s'il n'est pas trouvé au début de la commande)
</programlisting>
<command>charset [(decode_iso | decode_utf | encode) charset]</command>
<programlisting>
po/cs.po
+232 -209
View File
File diff suppressed because it is too large Load Diff
po/es.po
+233 -209
View File
File diff suppressed because it is too large Load Diff
po/fr.po
+237 -210
View File
File diff suppressed because it is too large Load Diff
po/hu.po
+231 -209
View File
File diff suppressed because it is too large Load Diff
po/weechat.pot
+230 -209
View File
File diff suppressed because it is too large Load Diff
src/common/command.c
+133 -81
View File
@@ -60,6 +60,10 @@ t_weechat_command weechat_commands[] =
"channel: jump to buffer by server and/or channel name\n"
" number: jump to buffer by number"),
"move|close|list|notify", 0, MAX_ARGS, NULL, weechat_cmd_buffer },
{ "builtin", N_("launch WeeChat/IRC builtin command (do not look at plugins handlers or aliases)"),
N_("command"),
N_("command: command to execute (a '/' is automatically added if not found at beginning of command)\n"),
"%w|%i", 0, MAX_ARGS, NULL, weechat_cmd_builtin },
{ "charset", N_("change charset for server or channel"),
N_("[(decode_iso | decode_utf | encode) charset]"),
N_("decode_iso: charset used for decoding ISO\n"
@@ -329,6 +333,9 @@ alias_new (char *alias_name, char *alias_command)
if (alias_name[0] == '/')
alias_name++;
if (ascii_strcasecmp (alias_name, "builtin") == 0)
return NULL;
ptr_alias = alias_search (alias_name);
if (ptr_alias)
{
@@ -635,12 +642,15 @@ free_multi_command (char **commands)
/*
* exec_weechat_command: executes a command (WeeChat internal or IRC)
* if only_builtin == 1, then try only WeeChat/IRC commands
* (not plugins neither aliases)
* returns: 1 if command was executed succesfully
* 0 if error (command not executed)
*/
int
exec_weechat_command (t_irc_server *server, t_irc_channel *channel, char *string)
exec_weechat_command (t_irc_server *server, t_irc_channel *channel, char *string,
int only_builtin)
{
int i, rc, argc, return_code, length1, length2;
char *command, *pos, *ptr_args, *ptr_args_color, **argv, *alias_command;
@@ -685,7 +695,10 @@ exec_weechat_command (t_irc_server *server, t_irc_channel *channel, char *string
}
#ifdef PLUGINS
rc = plugin_cmd_handler_exec ((server) ? server->name : "", command + 1, ptr_args);
if (only_builtin)
rc = -1;
else
rc = plugin_cmd_handler_exec ((server) ? server->name : "", command + 1, ptr_args);
#else
rc = -1;
#endif
@@ -702,6 +715,88 @@ exec_weechat_command (t_irc_server *server, t_irc_channel *channel, char *string
default: /* plugin handler not found */
argv = explode_string (ptr_args, " ", 0, &argc);
/* look for alias */
if (!only_builtin)
{
for (ptr_alias = weechat_alias; ptr_alias;
ptr_alias = ptr_alias->next_alias)
{
if (ascii_strcasecmp (ptr_alias->alias_name, command + 1) == 0)
{
if (ptr_alias->running == 1)
{
irc_display_prefix (NULL, NULL, PREFIX_ERROR);
gui_printf (NULL,
_("%s circular reference when calling alias \"/%s\"\n"),
WEECHAT_ERROR, ptr_alias->alias_name);
}
else
{
/* an alias can contain many commandes separated by ';' */
commands = split_multi_command (ptr_alias->alias_command, ';');
if (commands)
{
ptr_alias->running = 1;
for (ptr_cmd=commands; *ptr_cmd; ptr_cmd++)
{
ptr_next_cmd = ptr_cmd;
ptr_next_cmd++;
if (*ptr_next_cmd == NULL && ptr_args)
{
/* if alias has arguments, they are now
arguments of the last command in the list */
length1 = strlen (*ptr_cmd);
length2 = strlen (ptr_args);
alias_command = (char *) malloc ( 1 + length1 + 1 + length2 + 1);
if (alias_command)
{
if (*ptr_cmd[0] != '/')
strcpy (alias_command, "/");
else
strcpy (alias_command, "");
strcat (alias_command, *ptr_cmd);
strcat (alias_command, " ");
strcat (alias_command, ptr_args);
(void) exec_weechat_command (server, channel, alias_command, only_builtin);
free (alias_command);
}
}
else
{
if (*ptr_cmd[0] == '/')
(void) exec_weechat_command (server, channel, *ptr_cmd, only_builtin);
else
{
alias_command = (char *) malloc (1 + strlen(*ptr_cmd) + 1);
if (alias_command)
{
strcpy (alias_command, "/");
strcat (alias_command, *ptr_cmd);
(void) exec_weechat_command (server, channel, alias_command, only_builtin);
free (alias_command);
}
}
}
}
ptr_alias->running = 0;
free_multi_command (commands);
}
}
free_exploded_string (argv);
free (command);
if (ptr_args_color)
free (ptr_args_color);
return 1;
}
}
}
/* look for WeeChat command */
for (i = 0; weechat_commands[i].command_name; i++)
{
if (ascii_strcasecmp (weechat_commands[i].command_name, command + 1) == 0)
@@ -759,6 +854,8 @@ exec_weechat_command (t_irc_server *server, t_irc_channel *channel, char *string
return 1;
}
}
/* look for IRC command */
for (i = 0; irc_commands[i].command_name; i++)
{
if ((ascii_strcasecmp (irc_commands[i].command_name, command + 1) == 0) &&
@@ -828,82 +925,6 @@ exec_weechat_command (t_irc_server *server, t_irc_channel *channel, char *string
return 1;
}
}
for (ptr_alias = weechat_alias; ptr_alias;
ptr_alias = ptr_alias->next_alias)
{
if (ascii_strcasecmp (ptr_alias->alias_name, command + 1) == 0)
{
if (ptr_alias->running == 1)
{
irc_display_prefix (NULL, NULL, PREFIX_ERROR);
gui_printf (NULL,
_("%s circular reference when calling alias \"/%s\"\n"),
WEECHAT_ERROR, ptr_alias->alias_name);
}
else
{
/* an alias can contain many commandes separated by ';' */
commands = split_multi_command (ptr_alias->alias_command, ';');
if (commands)
{
ptr_alias->running = 1;
for (ptr_cmd=commands; *ptr_cmd; ptr_cmd++)
{
ptr_next_cmd = ptr_cmd;
ptr_next_cmd++;
if (*ptr_next_cmd == NULL && ptr_args)
{
/* if alias has arguments, they are now
arguments of the last command in the list */
length1 = strlen (*ptr_cmd);
length2 = strlen (ptr_args);
alias_command = (char *) malloc ( 1 + length1 + 1 + length2 + 1);
if (alias_command)
{
if (*ptr_cmd[0] != '/')
strcpy (alias_command, "/");
else
strcpy (alias_command, "");
strcat (alias_command, *ptr_cmd);
strcat (alias_command, " ");
strcat (alias_command, ptr_args);
(void) exec_weechat_command (server, channel, alias_command);
free (alias_command);
}
}
else
{
if (*ptr_cmd[0] == '/')
(void) exec_weechat_command (server, channel, *ptr_cmd);
else
{
alias_command = (char *) malloc (1 + strlen(*ptr_cmd) + 1);
if (alias_command)
{
strcpy (alias_command, "/");
strcat (alias_command, *ptr_cmd);
(void) exec_weechat_command (server, channel, alias_command);
free (alias_command);
}
}
}
}
ptr_alias->running = 0;
free_multi_command (commands);
}
}
free_exploded_string (argv);
free (command);
if (ptr_args_color)
free (ptr_args_color);
return 1;
}
}
irc_display_prefix (NULL, NULL, PREFIX_ERROR);
gui_printf (NULL,
_("%s unknown command \"%s\" (type /help for help)\n"),
@@ -923,7 +944,7 @@ exec_weechat_command (t_irc_server *server, t_irc_channel *channel, char *string
*/
void
user_command (t_irc_server *server, t_irc_channel *channel, char *command)
user_command (t_irc_server *server, t_irc_channel *channel, char *command, int only_builtin)
{
t_gui_buffer *buffer;
t_irc_nick *ptr_nick;
@@ -941,7 +962,8 @@ user_command (t_irc_server *server, t_irc_channel *channel, char *command)
/* WeeChat internal command (or IRC command) */
command_encoded = channel_iconv_encode (server, channel, command);
(void) exec_weechat_command (server, channel,
(command_encoded) ? command_encoded : command);
(command_encoded) ? command_encoded : command,
only_builtin);
if (command_encoded)
free (command_encoded);
}
@@ -1518,6 +1540,36 @@ weechat_cmd_buffer (t_irc_server *server, t_irc_channel *channel,
return 0;
}
/*
* weechat_cmd_builtin: launch WeeChat/IRC builtin command
*/
int
weechat_cmd_builtin (t_irc_server *server, t_irc_channel *channel,
char *arguments)
{
char *command;
int length;
if (arguments && arguments[0])
{
if (arguments[0] == '/')
user_command (server, channel, arguments, 1);
else
{
length = strlen (arguments) + 2;
command = (char *)malloc (length);
if (command)
{
snprintf (command, length, "/%s", arguments);
user_command (server, channel, command, 1);
free (command);
}
}
}
return 0;
}
/*
* weechat_cmd_charset_display: display charsets for a server or channel
*/
@@ -3477,7 +3529,7 @@ weechat_cmd_uptime (t_irc_server *server, t_irc_channel *channel,
sec,
ctime (&weechat_start_time));
string[strlen (string) - 1] = '\0';
user_command (server, channel, string);
user_command (server, channel, string, 0);
}
else
{
src/common/command.h
+3 -2
View File
@@ -71,10 +71,11 @@ extern char **explode_string (char *, char *, int, int *);
extern void free_exploded_string (char **);
extern char **split_multi_command (char *, char);
extern void free_multi_command (char **);
extern int exec_weechat_command (t_irc_server *, t_irc_channel *, char *);
extern void user_command (t_irc_server *, t_irc_channel *, char *);
extern int exec_weechat_command (t_irc_server *, t_irc_channel *, char *, int);
extern void user_command (t_irc_server *, t_irc_channel *, char *, int);
extern int weechat_cmd_alias (t_irc_server *, t_irc_channel *, char *);
extern int weechat_cmd_buffer (t_irc_server *, t_irc_channel *, char *);
extern int weechat_cmd_builtin (t_irc_server *, t_irc_channel *, char *);
extern int weechat_cmd_charset (t_irc_server *, t_irc_channel *, int, char **);
extern int weechat_cmd_clear (t_irc_server *, t_irc_channel *, int, char **);
extern int weechat_cmd_connect (t_irc_server *, t_irc_channel *, int, char **);
src/common/fifo.c
+1 -1
View File
@@ -169,7 +169,7 @@ fifo_exec (char *text)
}
}
user_command (ptr_server, ptr_channel, pos_msg);
user_command (ptr_server, ptr_channel, pos_msg, 0);
}
/*
src/gui/gui-action.c
+1 -1
View File
@@ -109,7 +109,7 @@ gui_action_return (t_gui_window *window)
window->buffer->ptr_history = NULL;
gui_draw_buffer_input (window->buffer, 0);
user_command (SERVER(window->buffer), CHANNEL(window->buffer),
command);
command, 0);
free (command);
}
}
src/gui/gui-keyboard.c
+1 -1
View File
@@ -529,7 +529,7 @@ gui_key_pressed (char *key_str)
if (ptr_key->command)
user_command (SERVER(gui_current_window->buffer),
CHANNEL(gui_current_window->buffer),
ptr_key->command);
ptr_key->command, 0);
else
(void)(ptr_key->function)(gui_current_window);
}
src/irc/irc-recv.c
+2 -2
View File
@@ -2677,8 +2677,8 @@ irc_cmd_recv_004 (t_irc_server *server, char *host, char *nick, char *arguments)
commands = split_multi_command (server->command, ';');
if (commands)
{
for (ptr=commands; *ptr; ptr++)
user_command (server, NULL, *ptr);
for (ptr = commands; *ptr; ptr++)
user_command (server, NULL, *ptr, 0);
free_multi_command (commands);
}
src/plugins/plugins-interface.c
+3 -3
View File
@@ -365,11 +365,11 @@ weechat_plugin_exec_command (t_weechat_plugin *plugin,
else
{
if (ptr_server && ptr_channel)
user_command (ptr_server, ptr_channel, command);
user_command (ptr_server, ptr_channel, command, 0);
else if (ptr_server && (ptr_server->buffer))
user_command (ptr_server, NULL, command);
user_command (ptr_server, NULL, command, 0);
else
user_command (NULL, NULL, command);
user_command (NULL, NULL, command, 0);
}
}
src/plugins/plugins.c
+10
View File
@@ -262,6 +262,16 @@ plugin_cmd_handler_add (t_weechat_plugin *plugin, char *command,
WEECHAT_ERROR, plugin->name, command);
return NULL;
}
if (ascii_strcasecmp (command, "builtin") == 0)
{
irc_display_prefix (NULL, NULL, PREFIX_ERROR);
gui_printf (NULL,
_("%s plugin %s: unable to add handler for \"%s\" command "
"(forbidden)\n"),
WEECHAT_ERROR, plugin->name, command);
return NULL;
}
new_handler = (t_plugin_handler *)malloc (sizeof (t_plugin_handler));
if (new_handler)
weechat/ChangeLog
+2 -1
View File
@@ -1,10 +1,11 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
ChangeLog - 2006-03-19
ChangeLog - 2006-03-21
Version 0.1.9 (under dev!):
* aliases are executed before WeeChat/IRC commands, /builtin command added
* added /cycle command, /part command does close buffer any more (use
/buffer close (or alias /close) to part and close buffer
weechat/doc/en/weechat_commands.xml
+8
View File
@@ -27,6 +27,14 @@ server
channel: jump to buffer by server and/or channel name
number: jump to buffer by number
</programlisting>
<command>builtin command</command>
<programlisting>
launch WeeChat/IRC builtin command (do not look at plugins handlers or aliases)
command: command to execute (a '/' is automatically added if not found at beginning of command)
</programlisting>
<command>charset [(decode_iso | decode_utf | encode) charset]</command>
<programlisting>
weechat/doc/fr/weechat_commands.xml
+8
View File
@@ -27,6 +27,14 @@ serveur
canal: sauter au tampon par serveur et/ou nom de canal
nombre: sauter au tampon qui a ce numéro
</programlisting>
<command>builtin commande</command>
<programlisting>
lance une commande WeeChat/IRC interne (sans regarder les gestionnaires de commandes et les alias)
commande: commande à exécuter (un '/' est automatiquement ajouté s'il n'est pas trouvé au début de la commande)
</programlisting>
<command>charset [(decode_iso | decode_utf | encode) charset]</command>
<programlisting>
weechat/po/cs.po
+232 -209
View File
File diff suppressed because it is too large Load Diff
weechat/po/es.po
+233 -209
View File
File diff suppressed because it is too large Load Diff
weechat/po/fr.po
+237 -210
View File
File diff suppressed because it is too large Load Diff
weechat/po/hu.po
+231 -209
View File
File diff suppressed because it is too large Load Diff
weechat/po/weechat.pot
+230 -209
View File
File diff suppressed because it is too large Load Diff
weechat/src/common/command.c
+133 -81
View File
@@ -60,6 +60,10 @@ t_weechat_command weechat_commands[] =
"channel: jump to buffer by server and/or channel name\n"
" number: jump to buffer by number"),
"move|close|list|notify", 0, MAX_ARGS, NULL, weechat_cmd_buffer },
{ "builtin", N_("launch WeeChat/IRC builtin command (do not look at plugins handlers or aliases)"),
N_("command"),
N_("command: command to execute (a '/' is automatically added if not found at beginning of command)\n"),
"%w|%i", 0, MAX_ARGS, NULL, weechat_cmd_builtin },
{ "charset", N_("change charset for server or channel"),
N_("[(decode_iso | decode_utf | encode) charset]"),
N_("decode_iso: charset used for decoding ISO\n"
@@ -329,6 +333,9 @@ alias_new (char *alias_name, char *alias_command)
if (alias_name[0] == '/')
alias_name++;
if (ascii_strcasecmp (alias_name, "builtin") == 0)
return NULL;
ptr_alias = alias_search (alias_name);
if (ptr_alias)
{
@@ -635,12 +642,15 @@ free_multi_command (char **commands)
/*
* exec_weechat_command: executes a command (WeeChat internal or IRC)
* if only_builtin == 1, then try only WeeChat/IRC commands
* (not plugins neither aliases)
* returns: 1 if command was executed succesfully
* 0 if error (command not executed)
*/
int
exec_weechat_command (t_irc_server *server, t_irc_channel *channel, char *string)
exec_weechat_command (t_irc_server *server, t_irc_channel *channel, char *string,
int only_builtin)
{
int i, rc, argc, return_code, length1, length2;
char *command, *pos, *ptr_args, *ptr_args_color, **argv, *alias_command;
@@ -685,7 +695,10 @@ exec_weechat_command (t_irc_server *server, t_irc_channel *channel, char *string
}
#ifdef PLUGINS
rc = plugin_cmd_handler_exec ((server) ? server->name : "", command + 1, ptr_args);
if (only_builtin)
rc = -1;
else
rc = plugin_cmd_handler_exec ((server) ? server->name : "", command + 1, ptr_args);
#else
rc = -1;
#endif
@@ -702,6 +715,88 @@ exec_weechat_command (t_irc_server *server, t_irc_channel *channel, char *string
default: /* plugin handler not found */
argv = explode_string (ptr_args, " ", 0, &argc);
/* look for alias */
if (!only_builtin)
{
for (ptr_alias = weechat_alias; ptr_alias;
ptr_alias = ptr_alias->next_alias)
{
if (ascii_strcasecmp (ptr_alias->alias_name, command + 1) == 0)
{
if (ptr_alias->running == 1)
{
irc_display_prefix (NULL, NULL, PREFIX_ERROR);
gui_printf (NULL,
_("%s circular reference when calling alias \"/%s\"\n"),
WEECHAT_ERROR, ptr_alias->alias_name);
}
else
{
/* an alias can contain many commandes separated by ';' */
commands = split_multi_command (ptr_alias->alias_command, ';');
if (commands)
{
ptr_alias->running = 1;
for (ptr_cmd=commands; *ptr_cmd; ptr_cmd++)
{
ptr_next_cmd = ptr_cmd;
ptr_next_cmd++;
if (*ptr_next_cmd == NULL && ptr_args)
{
/* if alias has arguments, they are now
arguments of the last command in the list */
length1 = strlen (*ptr_cmd);
length2 = strlen (ptr_args);
alias_command = (char *) malloc ( 1 + length1 + 1 + length2 + 1);
if (alias_command)
{
if (*ptr_cmd[0] != '/')
strcpy (alias_command, "/");
else
strcpy (alias_command, "");
strcat (alias_command, *ptr_cmd);
strcat (alias_command, " ");
strcat (alias_command, ptr_args);
(void) exec_weechat_command (server, channel, alias_command, only_builtin);
free (alias_command);
}
}
else
{
if (*ptr_cmd[0] == '/')
(void) exec_weechat_command (server, channel, *ptr_cmd, only_builtin);
else
{
alias_command = (char *) malloc (1 + strlen(*ptr_cmd) + 1);
if (alias_command)
{
strcpy (alias_command, "/");
strcat (alias_command, *ptr_cmd);
(void) exec_weechat_command (server, channel, alias_command, only_builtin);
free (alias_command);
}
}
}
}
ptr_alias->running = 0;
free_multi_command (commands);
}
}
free_exploded_string (argv);
free (command);
if (ptr_args_color)
free (ptr_args_color);
return 1;
}
}
}
/* look for WeeChat command */
for (i = 0; weechat_commands[i].command_name; i++)
{
if (ascii_strcasecmp (weechat_commands[i].command_name, command + 1) == 0)
@@ -759,6 +854,8 @@ exec_weechat_command (t_irc_server *server, t_irc_channel *channel, char *string
return 1;
}
}
/* look for IRC command */
for (i = 0; irc_commands[i].command_name; i++)
{
if ((ascii_strcasecmp (irc_commands[i].command_name, command + 1) == 0) &&
@@ -828,82 +925,6 @@ exec_weechat_command (t_irc_server *server, t_irc_channel *channel, char *string
return 1;
}
}
for (ptr_alias = weechat_alias; ptr_alias;
ptr_alias = ptr_alias->next_alias)
{
if (ascii_strcasecmp (ptr_alias->alias_name, command + 1) == 0)
{
if (ptr_alias->running == 1)
{
irc_display_prefix (NULL, NULL, PREFIX_ERROR);
gui_printf (NULL,
_("%s circular reference when calling alias \"/%s\"\n"),
WEECHAT_ERROR, ptr_alias->alias_name);
}
else
{
/* an alias can contain many commandes separated by ';' */
commands = split_multi_command (ptr_alias->alias_command, ';');
if (commands)
{
ptr_alias->running = 1;
for (ptr_cmd=commands; *ptr_cmd; ptr_cmd++)
{
ptr_next_cmd = ptr_cmd;
ptr_next_cmd++;
if (*ptr_next_cmd == NULL && ptr_args)
{
/* if alias has arguments, they are now
arguments of the last command in the list */
length1 = strlen (*ptr_cmd);
length2 = strlen (ptr_args);
alias_command = (char *) malloc ( 1 + length1 + 1 + length2 + 1);
if (alias_command)
{
if (*ptr_cmd[0] != '/')
strcpy (alias_command, "/");
else
strcpy (alias_command, "");
strcat (alias_command, *ptr_cmd);
strcat (alias_command, " ");
strcat (alias_command, ptr_args);
(void) exec_weechat_command (server, channel, alias_command);
free (alias_command);
}
}
else
{
if (*ptr_cmd[0] == '/')
(void) exec_weechat_command (server, channel, *ptr_cmd);
else
{
alias_command = (char *) malloc (1 + strlen(*ptr_cmd) + 1);
if (alias_command)
{
strcpy (alias_command, "/");
strcat (alias_command, *ptr_cmd);
(void) exec_weechat_command (server, channel, alias_command);
free (alias_command);
}
}
}
}
ptr_alias->running = 0;
free_multi_command (commands);
}
}
free_exploded_string (argv);
free (command);
if (ptr_args_color)
free (ptr_args_color);
return 1;
}
}
irc_display_prefix (NULL, NULL, PREFIX_ERROR);
gui_printf (NULL,
_("%s unknown command \"%s\" (type /help for help)\n"),
@@ -923,7 +944,7 @@ exec_weechat_command (t_irc_server *server, t_irc_channel *channel, char *string
*/
void
user_command (t_irc_server *server, t_irc_channel *channel, char *command)
user_command (t_irc_server *server, t_irc_channel *channel, char *command, int only_builtin)
{
t_gui_buffer *buffer;
t_irc_nick *ptr_nick;
@@ -941,7 +962,8 @@ user_command (t_irc_server *server, t_irc_channel *channel, char *command)
/* WeeChat internal command (or IRC command) */
command_encoded = channel_iconv_encode (server, channel, command);
(void) exec_weechat_command (server, channel,
(command_encoded) ? command_encoded : command);
(command_encoded) ? command_encoded : command,
only_builtin);
if (command_encoded)
free (command_encoded);
}
@@ -1518,6 +1540,36 @@ weechat_cmd_buffer (t_irc_server *server, t_irc_channel *channel,
return 0;
}
/*
* weechat_cmd_builtin: launch WeeChat/IRC builtin command
*/
int
weechat_cmd_builtin (t_irc_server *server, t_irc_channel *channel,
char *arguments)
{
char *command;
int length;
if (arguments && arguments[0])
{
if (arguments[0] == '/')
user_command (server, channel, arguments, 1);
else
{
length = strlen (arguments) + 2;
command = (char *)malloc (length);
if (command)
{
snprintf (command, length, "/%s", arguments);
user_command (server, channel, command, 1);
free (command);
}
}
}
return 0;
}
/*
* weechat_cmd_charset_display: display charsets for a server or channel
*/
@@ -3477,7 +3529,7 @@ weechat_cmd_uptime (t_irc_server *server, t_irc_channel *channel,
sec,
ctime (&weechat_start_time));
string[strlen (string) - 1] = '\0';
user_command (server, channel, string);
user_command (server, channel, string, 0);
}
else
{
weechat/src/common/command.h
+3 -2
View File
@@ -71,10 +71,11 @@ extern char **explode_string (char *, char *, int, int *);
extern void free_exploded_string (char **);
extern char **split_multi_command (char *, char);
extern void free_multi_command (char **);
extern int exec_weechat_command (t_irc_server *, t_irc_channel *, char *);
extern void user_command (t_irc_server *, t_irc_channel *, char *);
extern int exec_weechat_command (t_irc_server *, t_irc_channel *, char *, int);
extern void user_command (t_irc_server *, t_irc_channel *, char *, int);
extern int weechat_cmd_alias (t_irc_server *, t_irc_channel *, char *);
extern int weechat_cmd_buffer (t_irc_server *, t_irc_channel *, char *);
extern int weechat_cmd_builtin (t_irc_server *, t_irc_channel *, char *);
extern int weechat_cmd_charset (t_irc_server *, t_irc_channel *, int, char **);
extern int weechat_cmd_clear (t_irc_server *, t_irc_channel *, int, char **);
extern int weechat_cmd_connect (t_irc_server *, t_irc_channel *, int, char **);
weechat/src/common/fifo.c
+1 -1
View File
@@ -169,7 +169,7 @@ fifo_exec (char *text)
}
}
user_command (ptr_server, ptr_channel, pos_msg);
user_command (ptr_server, ptr_channel, pos_msg, 0);
}
/*
weechat/src/gui/gui-action.c
+1 -1
View File
@@ -109,7 +109,7 @@ gui_action_return (t_gui_window *window)
window->buffer->ptr_history = NULL;
gui_draw_buffer_input (window->buffer, 0);
user_command (SERVER(window->buffer), CHANNEL(window->buffer),
command);
command, 0);
free (command);
}
}
weechat/src/gui/gui-keyboard.c
+1 -1
View File
@@ -529,7 +529,7 @@ gui_key_pressed (char *key_str)
if (ptr_key->command)
user_command (SERVER(gui_current_window->buffer),
CHANNEL(gui_current_window->buffer),
ptr_key->command);
ptr_key->command, 0);
else
(void)(ptr_key->function)(gui_current_window);
}
weechat/src/irc/irc-recv.c
+2 -2
View File
@@ -2677,8 +2677,8 @@ irc_cmd_recv_004 (t_irc_server *server, char *host, char *nick, char *arguments)
commands = split_multi_command (server->command, ';');
if (commands)
{
for (ptr=commands; *ptr; ptr++)
user_command (server, NULL, *ptr);
for (ptr = commands; *ptr; ptr++)
user_command (server, NULL, *ptr, 0);
free_multi_command (commands);
}
weechat/src/plugins/plugins-interface.c
+3 -3
View File
@@ -365,11 +365,11 @@ weechat_plugin_exec_command (t_weechat_plugin *plugin,
else
{
if (ptr_server && ptr_channel)
user_command (ptr_server, ptr_channel, command);
user_command (ptr_server, ptr_channel, command, 0);
else if (ptr_server && (ptr_server->buffer))
user_command (ptr_server, NULL, command);
user_command (ptr_server, NULL, command, 0);
else
user_command (NULL, NULL, command);
user_command (NULL, NULL, command, 0);
}
}
weechat/src/plugins/plugins.c
+10
View File
@@ -262,6 +262,16 @@ plugin_cmd_handler_add (t_weechat_plugin *plugin, char *command,
WEECHAT_ERROR, plugin->name, command);
return NULL;
}
if (ascii_strcasecmp (command, "builtin") == 0)
{
irc_display_prefix (NULL, NULL, PREFIX_ERROR);
gui_printf (NULL,
_("%s plugin %s: unable to add handler for \"%s\" command "
"(forbidden)\n"),
WEECHAT_ERROR, plugin->name, command);
return NULL;
}
new_handler = (t_plugin_handler *)malloc (sizeof (t_plugin_handler));
if (new_handler)