Fix bug with fifo pipe when setting fifo option to "on"

This commit is contained in:
Sebastien Helleu 2010-06-18 17:45:50 +02:00
parent de49e31965
commit 97c41c60a4
2 changed files with 10 additions and 13 deletions

View File

@ -1,7 +1,7 @@
WeeChat ChangeLog
=================
FlashCode <flashcode@flashtux.org>
v0.3.3-dev, 2010-06-11
v0.3.3-dev, 2010-06-18
Version 0.3.3 (under dev!)
@ -40,6 +40,7 @@ Version 0.3.3 (under dev!)
* irc: try other nick when connecting to server and receiving message 437
(nick unavailable)
* irc: set buffer local variable "away" when opening new channel (bug #29618)
* fifo: fix bug with fifo pipe when setting fifo option to "on"
Version 0.3.2 (2010-04-18)
--------------------------

View File

@ -58,6 +58,9 @@ char *fifo_filename;
char *fifo_unterminated = NULL;
int fifo_read();
/*
* fifo_remove_old_pipes: remove old fifo pipes in directory
*/
@ -111,18 +114,14 @@ fifo_remove_old_pipes ()
/*
* fifo_create: create FIFO pipe for remote control
* return: 1 if ok
* 0 if error
*/
int
void
fifo_create ()
{
int rc, filename_length;
int filename_length;
const char *fifo_option, *weechat_home;
rc = 0;
fifo_option = weechat_config_get_plugin ("fifo");
if (!fifo_option)
{
@ -166,7 +165,8 @@ fifo_create ()
_("%s: pipe opened"),
FIFO_PLUGIN_NAME);
}
rc = 1;
fifo_fd_hook = weechat_hook_fd (fifo_fd, 1, 0, 0,
&fifo_read, NULL);
}
else
weechat_printf (NULL,
@ -183,8 +183,6 @@ fifo_create ()
fifo_filename);
}
}
return rc;
}
/*
@ -438,9 +436,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
fifo_quiet = 1;
if (fifo_create ())
fifo_fd_hook = weechat_hook_fd (fifo_fd, 1, 0, 0,
&fifo_read, NULL);
fifo_create ();
weechat_hook_config ("plugins.var.fifo.fifo", &fifo_config_cb, NULL);