blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bug with buffer for execution of alias, when called from plugin API with function "command" (bug #27697)

Browse Source
This commit is contained in:
Sebastien Helleu 2009-10-14 14:22:39 +02:00
parent fbf1e0286e
commit 37835df573
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,7 +1,7 @@
WeeChat ChangeLog
=================
FlashCode <flashcode@flashtux.org>
v0.3.1-dev, 2009-10-10
v0.3.1-dev, 2009-10-14
Version 0.3.1 (under dev!)
@ -18,6 +18,8 @@ Version 0.3.1 (under dev!)
(patch #6917)
* alias: allow use of wildcards for /alias list (patch #6925)
* alias: allow /unalias to remove multiple aliases (patch #6926)
* alias: fix bug with buffer for execution of alias, when called from plugin API
with function "command" (bug #27697)
* alias: fix bug with arguments (bug #27440)
* irc: add commands /sajoin, /samode, /sanick, /sapart, /saquit (task #9770)
* irc: add options for CTCP, to block/customize CTCP reply (task #9693)

26
src/plugins/alias/alias.c
View File

@ -291,15 +291,28 @@ alias_replace_args (const char *alias_args, const char *user_args)
*/
void
alias_run_command (struct t_gui_buffer *buffer, const char *command)
alias_run_command (struct t_gui_buffer **buffer, const char *command)
{
char *string;
struct t_gui_buffer *old_current_buffer, *new_current_buffer;
string = weechat_buffer_string_replace_local_var (buffer, command);
weechat_command (buffer,
/* save current buffer pointer */
old_current_buffer = weechat_current_buffer();
/* execute command */
string = weechat_buffer_string_replace_local_var (*buffer, command);
weechat_command (*buffer,
(string) ? string : command);
if (string)
free (string);
/* get new current buffer */
new_current_buffer = weechat_current_buffer();
/* if current buffer was changed by command, then we'll use this one for
next commands in alias */
if (old_current_buffer != new_current_buffer)
*buffer = new_current_buffer;
}
/*
@ -316,7 +329,6 @@ alias_cb (void *data, struct t_gui_buffer *buffer, int argc, char **argv,
int some_args_replaced, length1, length2;
/* make C compiler happy */
(void) buffer;
(void) argc;
(void) argv;
@ -368,7 +380,7 @@ alias_cb (void *data, struct t_gui_buffer *buffer, int argc, char **argv,
strcat (alias_command, " ");
strcat (alias_command, argv_eol[1]);
alias_run_command (weechat_current_buffer (),
alias_run_command (&buffer,
alias_command);
free (alias_command);
}
@ -377,7 +389,7 @@ alias_cb (void *data, struct t_gui_buffer *buffer, int argc, char **argv,
{
if (*ptr_cmd[0] == '/')
{
alias_run_command (weechat_current_buffer (),
alias_run_command (&buffer,
(args_replaced) ? args_replaced : *ptr_cmd);
}
else
@ -387,7 +399,7 @@ alias_cb (void *data, struct t_gui_buffer *buffer, int argc, char **argv,
{
strcpy (alias_command, "/");
strcat (alias_command, (args_replaced) ? args_replaced : *ptr_cmd);
alias_run_command (weechat_current_buffer (),
alias_run_command (&buffer,
alias_command);
free (alias_command);
}