pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-23 19:36:37 +02:00
Code Activity

scripts: fix duplicated lines in output of script eval (python, perl, ruby, lua and guile)

Browse Source 
When there was a call to a hook callback during the eval, the output buffer was
cleared too late, and displayed multiple times in the buffer.

This commit clears the buffer even before we display it (this display can
trigger a hook callback).
This commit is contained in:
Sébastien Helleu
2018-07-25 20:19:26 +02:00
parent df27a3b76a
commit b7d6be5936
6 changed files with 96 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/python/weechat-python.c
+19 -13
View File
@@ -337,36 +337,42 @@ void
weechat_python_output_flush ()
{
const char *ptr_command;
char *command;
char *temp_buffer, *command;
int length;
if (!*python_buffer_output[0])
return;
/* if there's no buffer, we catch the output, so there's no flush */
if (python_eval_mode && !python_eval_buffer)
return;
temp_buffer = strdup (*python_buffer_output);
if (!temp_buffer)
return;
weechat_string_dyn_copy (python_buffer_output, NULL);
if (python_eval_mode)
{
/* if there's no buffer, we catch the output, so there's no flush */
if (!python_eval_buffer)
return;
if (python_eval_send_input)
{
if (python_eval_exec_commands)
ptr_command = *python_buffer_output;
ptr_command = temp_buffer;
else
ptr_command = weechat_string_input_for_buffer (*python_buffer_output);
ptr_command = weechat_string_input_for_buffer (temp_buffer);
if (ptr_command)
{
weechat_command (python_eval_buffer, *python_buffer_output);
weechat_command (python_eval_buffer, temp_buffer);
}
else
{
length = 1 + strlen (*python_buffer_output) + 1;
length = 1 + strlen (temp_buffer) + 1;
command = malloc (length);
if (command)
{
snprintf (command, length, "%c%s",
*python_buffer_output[0], *python_buffer_output);
temp_buffer[0], temp_buffer);
weechat_command (python_eval_buffer,
(command[0]) ? command : " ");
free (command);
@@ -375,7 +381,7 @@ weechat_python_output_flush ()
}
else
{
weechat_printf (python_eval_buffer, "%s", *python_buffer_output);
weechat_printf (python_eval_buffer, "%s", temp_buffer);
}
}
else
@@ -386,10 +392,10 @@ weechat_python_output_flush ()
weechat_gettext ("%s: stdout/stderr (%s): %s"),
PYTHON_PLUGIN_NAME,
(python_current_script) ? python_current_script->name : "?",
*python_buffer_output);
temp_buffer);
}
weechat_string_dyn_copy (python_buffer_output, NULL);
free (temp_buffer);
}
/*