fifo: ignore read failing with error EAGAIN (bug #37019) (patch from Matt Robinson)

This commit is contained in:
Sebastien Helleu 2012-08-02 22:59:30 +02:00
parent 04520c81d6
commit b7eef5105c
13 changed files with 41 additions and 38 deletions

View File

@ -1,7 +1,7 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
v0.3.9-dev, 2012-08-01
v0.3.9-dev, 2012-08-02
Version 0.3.9 (under dev!)
@ -41,6 +41,7 @@ Version 0.3.9 (under dev!)
* aspell: add missing dictionaries (ast/grc/hus/kn/ky)
* charset: do not allow "UTF-8" in charset options (useless because UTF-8 is the
internal WeeChat charset)
* fifo: ignore read failing with error EAGAIN (bug #37019)
* guile: fix crash when unloading a script without pointer to interpreter
* guile: fix path of guile include dirs in cmake build (patch #7790)
* irc: fix bug with prefix chars which are in chanmodes with a type different

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-08-02 08:54+0200\n"
"POT-Creation-Date: 2012-08-02 22:48+0200\n"
"PO-Revision-Date: 2012-06-03 09:49+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -3971,8 +3971,8 @@ msgstr "%s%s: chyba, přijat nekorektní text na rouře"
msgid "%s%s: error, buffer not found for pipe data"
msgstr "%s%s: chyba, nenalezen buffer pro data roury"
#, c-format
msgid "%s%s: error reading pipe, closing it"
#, fuzzy, c-format
msgid "%s%s: error reading pipe (%d %s), closing it"
msgstr "%s%s: chyba při znovunačtení roury, zavírám ji"
#, c-format

View File

@ -23,7 +23,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-08-02 08:54+0200\n"
"POT-Creation-Date: 2012-08-02 22:48+0200\n"
"PO-Revision-Date: 2012-07-22 23:37+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@ -4343,8 +4343,8 @@ msgstr "%s%s: Fehler: ungültiger Text von Pipe empfangen"
msgid "%s%s: error, buffer not found for pipe data"
msgstr "%s%s: Fehler: Buffer für PIPE-Daten nicht gefunden"
#, c-format
msgid "%s%s: error reading pipe, closing it"
#, fuzzy, c-format
msgid "%s%s: error reading pipe (%d %s), closing it"
msgstr ""
"%s%s: Fehler beim Lesen der Pipe. Pipe wird aufgrund des Fehlers geschlossen"

View File

@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-08-02 08:54+0200\n"
"POT-Creation-Date: 2012-08-02 22:48+0200\n"
"PO-Revision-Date: 2012-07-27 12:16+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -4170,8 +4170,8 @@ msgstr "%s%s: error, texto inválido recibido en la tubería"
msgid "%s%s: error, buffer not found for pipe data"
msgstr "%s%s: error, buffer no encontrado para los datos de la tubería"
#, c-format
msgid "%s%s: error reading pipe, closing it"
#, fuzzy, c-format
msgid "%s%s: error reading pipe (%d %s), closing it"
msgstr "%s%s: error al leer la tubería, cerrándolo"
#, c-format

View File

@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-08-02 08:54+0200\n"
"PO-Revision-Date: 2012-08-02 08:55+0200\n"
"POT-Creation-Date: 2012-08-02 22:48+0200\n"
"PO-Revision-Date: 2012-08-02 22:50+0200\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@ -4225,8 +4225,8 @@ msgid "%s%s: error, buffer not found for pipe data"
msgstr "%s%s: erreur, tampon non trouvé pour les données du tube"
#, c-format
msgid "%s%s: error reading pipe, closing it"
msgstr "%s%s: erreur en lecture du tube, fermeture"
msgid "%s%s: error reading pipe (%d %s), closing it"
msgstr "%s%s: erreur en lecture du tube (%d %s), fermeture"
#, c-format
msgid "%s%s: error opening file, closing it"

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-08-02 08:54+0200\n"
"POT-Creation-Date: 2012-08-02 22:48+0200\n"
"PO-Revision-Date: 2012-06-03 09:49+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -3598,7 +3598,7 @@ msgid "%s%s: error, buffer not found for pipe data"
msgstr "%s a \"%s\" szerver nem található (FIFO cső adat)\n"
#, fuzzy, c-format
msgid "%s%s: error reading pipe, closing it"
msgid "%s%s: error reading pipe (%d %s), closing it"
msgstr "%s hiba a FIFO cső olvasása közben, bezárás\n"
#, fuzzy, c-format

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-08-02 08:54+0200\n"
"POT-Creation-Date: 2012-08-02 22:48+0200\n"
"PO-Revision-Date: 2012-07-30 15:38+0200\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -4164,8 +4164,8 @@ msgstr "%s%s: errore, testo non valido ricevuto sulla pipe"
msgid "%s%s: error, buffer not found for pipe data"
msgstr "%s%s: errore, buffer non trovato per la pipe dati"
#, c-format
msgid "%s%s: error reading pipe, closing it"
#, fuzzy, c-format
msgid "%s%s: error reading pipe (%d %s), closing it"
msgstr "%s%s: errore nella lettura della pipe, chiusura"
#, c-format

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-08-02 08:54+0200\n"
"POT-Creation-Date: 2012-08-02 22:48+0200\n"
"PO-Revision-Date: 2012-07-27 12:16+0200\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@ -4060,8 +4060,8 @@ msgstr "%s%s: エラー、パイプを通して不正なテキストが渡され
msgid "%s%s: error, buffer not found for pipe data"
msgstr "%s%s: エラー、パイプデータで指定されたバッファが見つかりません"
#, c-format
msgid "%s%s: error reading pipe, closing it"
#, fuzzy, c-format
msgid "%s%s: error reading pipe (%d %s), closing it"
msgstr "%s%s: パイプ読み取り中にエラー、パイプを閉じています"
#, c-format

View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-08-02 08:54+0200\n"
"POT-Creation-Date: 2012-08-02 22:48+0200\n"
"PO-Revision-Date: 2012-07-27 12:16+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -4149,8 +4149,8 @@ msgstr "%s%s: błąd, otrzymano niewłaściwy tekst ze strumienia"
msgid "%s%s: error, buffer not found for pipe data"
msgstr "%s%s: błąd, nie znaleziono buforu dla danych ze strumienia"
#, c-format
msgid "%s%s: error reading pipe, closing it"
#, fuzzy, c-format
msgid "%s%s: error reading pipe (%d %s), closing it"
msgstr "%s%s: błąd odczytu ze strumienia, zamykam go"
#, c-format

View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-08-02 08:54+0200\n"
"POT-Creation-Date: 2012-08-02 22:48+0200\n"
"PO-Revision-Date: 2012-06-03 09:49+0200\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -4012,9 +4012,9 @@ msgstr ""
msgid "%s%s: error, buffer not found for pipe data"
msgstr ""
#, c-format
msgid "%s%s: error reading pipe, closing it"
msgstr ""
#, fuzzy, c-format
msgid "%s%s: error reading pipe (%d %s), closing it"
msgstr "%s%s: erro ao enviar dados ao cliente: %s"
#, c-format
msgid "%s%s: error opening file, closing it"
@ -8273,9 +8273,6 @@ msgstr ""
#~ msgid "%s%s: sending data to client error %d: %d %s"
#~ msgstr "%s%s: erro ao enviar dados ao cliente %d (%s)"
#~ msgid "%s%s: error sending data to client: %s"
#~ msgstr "%s%s: erro ao enviar dados ao cliente: %s"
#~ msgid "display channel modes in \"buffer_name\" bar item"
#~ msgstr "exibir modos do canal no item da barra \"buffer_name\""

View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-08-02 08:54+0200\n"
"POT-Creation-Date: 2012-08-02 22:48+0200\n"
"PO-Revision-Date: 2012-06-03 09:49+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -3628,7 +3628,7 @@ msgid "%s%s: error, buffer not found for pipe data"
msgstr "%s сервер \"%s\" не найден (данные FIFO pipe)\n"
#, fuzzy, c-format
msgid "%s%s: error reading pipe, closing it"
msgid "%s%s: error reading pipe (%d %s), closing it"
msgstr "%s ошибка чтения FIFO pipe, закрываю его\n"
#, fuzzy, c-format

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-08-02 08:54+0200\n"
"POT-Creation-Date: 2012-08-02 22:48+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -3184,7 +3184,7 @@ msgid "%s%s: error, buffer not found for pipe data"
msgstr ""
#, c-format
msgid "%s%s: error reading pipe, closing it"
msgid "%s%s: error reading pipe (%d %s), closing it"
msgstr ""
#, c-format

View File

@ -30,6 +30,7 @@
#include <dirent.h>
#include <limits.h>
#include <fcntl.h>
#include <errno.h>
#include "../weechat-plugin.h"
#include "fifo.h"
@ -369,9 +370,13 @@ fifo_read ()
{
if (num_read < 0)
{
if (errno == EAGAIN)
return WEECHAT_RC_OK;
weechat_printf (NULL,
_("%s%s: error reading pipe, closing it"),
weechat_prefix ("error"), FIFO_PLUGIN_NAME);
_("%s%s: error reading pipe (%d %s), closing it"),
weechat_prefix ("error"), FIFO_PLUGIN_NAME,
errno, strerror (errno));
fifo_remove ();
}
else