FIFO command/text not authorized on special buffers like DCC

8 files changed, 84 insertions, 38 deletions

diff --git a/po/es.po b/po/es.po
index 4aa51cd52..e9e99a460 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.1-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-03-12 04:08+0100\n"
+"POT-Creation-Date: 2005-03-12 14:40+0100\n"
 "PO-Revision-Date: 2005-03-12 04:10+0100\n"
 "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2542,27 +2542,32 @@ msgstr ""
 msgid "FIFO pipe is open\n"
 msgstr ""
 
-#: src/common/fifo.c:124 src/common/fifo.c:170
+#: src/common/fifo.c:121
+#, c-format
+msgid "%s invalid buffer for displaying text via FIFO pipe\n"
+msgstr ""
+
+#: src/common/fifo.c:132 src/common/fifo.c:178
 #, c-format
 msgid "%s invalid text received on FIFO pipe\n"
 msgstr ""
 
-#: src/common/fifo.c:146
+#: src/common/fifo.c:154
 #, c-format
 msgid "%s server \"%s\" not found (FIFO pipe data)\n"
 msgstr ""
 
-#: src/common/fifo.c:158
+#: src/common/fifo.c:166
 #, c-format
 msgid "%s channel \"%s\" not found (FIFO pipe data)\n"
 msgstr ""
 
-#: src/common/fifo.c:257 src/common/fifo.c:259
+#: src/common/fifo.c:265 src/common/fifo.c:267
 #, c-format
 msgid "%s error reading FIFO pipe, closing it\n"
 msgstr ""
 
-#: src/common/fifo.c:301
+#: src/common/fifo.c:309
 msgid "FIFO pipe is closed\n"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index acb69ccbc..a98ddde85 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.1-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-03-12 04:08+0100\n"
-"PO-Revision-Date: 2005-03-12 04:09+0100\n"
+"POT-Creation-Date: 2005-03-12 14:40+0100\n"
+"PO-Revision-Date: 2005-03-12 14:41+0100\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -2535,27 +2535,32 @@ msgstr "%s impossible d'ouvrir le tube FIFO (%s) en lecture\n"
 msgid "FIFO pipe is open\n"
 msgstr "le tube FIFO est ouvert\n"
 
-#: src/common/fifo.c:124 src/common/fifo.c:170
+#: src/common/fifo.c:121
+#, c-format
+msgid "%s invalid buffer for displaying text via FIFO pipe\n"
+msgstr "%s tampon invalide pour afficher le texte via le tube FIFO\n"
+
+#: src/common/fifo.c:132 src/common/fifo.c:178
 #, c-format
 msgid "%s invalid text received on FIFO pipe\n"
 msgstr "%s texte invalide reçu sur le tube FIFO\n"
 
-#: src/common/fifo.c:146
+#: src/common/fifo.c:154
 #, c-format
 msgid "%s server \"%s\" not found (FIFO pipe data)\n"
 msgstr "%s serveur \"%s\" non trouvé (données du tube FIFO)\n"
 
-#: src/common/fifo.c:158
+#: src/common/fifo.c:166
 #, c-format
 msgid "%s channel \"%s\" not found (FIFO pipe data)\n"
 msgstr "%s canal \"%s\" non trouvé (données du tube FIFO)\n"
 
-#: src/common/fifo.c:257 src/common/fifo.c:259
+#: src/common/fifo.c:265 src/common/fifo.c:267
 #, c-format
 msgid "%s error reading FIFO pipe, closing it\n"
 msgstr "%s erreur en lecture du tube FIFO, fermeture\n"
 
-#: src/common/fifo.c:301
+#: src/common/fifo.c:309
 msgid "FIFO pipe is closed\n"
 msgstr "le tube FIFO est fermé\n"
 
diff --git a/po/weechat.pot b/po/weechat.pot
index 38e02af94..25a3d943d 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-03-12 04:08+0100\n"
+"POT-Creation-Date: 2005-03-12 14:40+0100\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"
@@ -2366,27 +2366,32 @@ msgstr ""
 msgid "FIFO pipe is open\n"
 msgstr ""
 
-#: src/common/fifo.c:124 src/common/fifo.c:170
+#: src/common/fifo.c:121
+#, c-format
+msgid "%s invalid buffer for displaying text via FIFO pipe\n"
+msgstr ""
+
+#: src/common/fifo.c:132 src/common/fifo.c:178
 #, c-format
 msgid "%s invalid text received on FIFO pipe\n"
 msgstr ""
 
-#: src/common/fifo.c:146
+#: src/common/fifo.c:154
 #, c-format
 msgid "%s server \"%s\" not found (FIFO pipe data)\n"
 msgstr ""
 
-#: src/common/fifo.c:158
+#: src/common/fifo.c:166
 #, c-format
 msgid "%s channel \"%s\" not found (FIFO pipe data)\n"
 msgstr ""
 
-#: src/common/fifo.c:257 src/common/fifo.c:259
+#: src/common/fifo.c:265 src/common/fifo.c:267
 #, c-format
 msgid "%s error reading FIFO pipe, closing it\n"
 msgstr ""
 
-#: src/common/fifo.c:301
+#: src/common/fifo.c:309
 msgid "FIFO pipe is closed\n"
 msgstr ""
 
diff --git a/src/common/fifo.c b/src/common/fifo.c
index 36a6c850e..94ebce332 100644
--- a/src/common/fifo.c
+++ b/src/common/fifo.c
@@ -114,6 +114,14 @@ fifo_exec (char *text)
         pos_msg = text + 1;
         ptr_server = SERVER(gui_current_window->buffer);
         ptr_buffer = gui_current_window->buffer;
+        
+        if (!ptr_server)
+        {
+            irc_display_prefix (NULL, PREFIX_ERROR);
+            gui_printf (NULL, _("%s invalid buffer for displaying text via FIFO pipe\n"),
+                        WEECHAT_WARNING);
+            return;
+        }
     }
     else
     {
diff --git a/weechat/po/es.po b/weechat/po/es.po
index 4aa51cd52..e9e99a460 100644
--- a/weechat/po/es.po
+++ b/weechat/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.1-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-03-12 04:08+0100\n"
+"POT-Creation-Date: 2005-03-12 14:40+0100\n"
 "PO-Revision-Date: 2005-03-12 04:10+0100\n"
 "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2542,27 +2542,32 @@ msgstr ""
 msgid "FIFO pipe is open\n"
 msgstr ""
 
-#: src/common/fifo.c:124 src/common/fifo.c:170
+#: src/common/fifo.c:121
+#, c-format
+msgid "%s invalid buffer for displaying text via FIFO pipe\n"
+msgstr ""
+
+#: src/common/fifo.c:132 src/common/fifo.c:178
 #, c-format
 msgid "%s invalid text received on FIFO pipe\n"
 msgstr ""
 
-#: src/common/fifo.c:146
+#: src/common/fifo.c:154
 #, c-format
 msgid "%s server \"%s\" not found (FIFO pipe data)\n"
 msgstr ""
 
-#: src/common/fifo.c:158
+#: src/common/fifo.c:166
 #, c-format
 msgid "%s channel \"%s\" not found (FIFO pipe data)\n"
 msgstr ""
 
-#: src/common/fifo.c:257 src/common/fifo.c:259
+#: src/common/fifo.c:265 src/common/fifo.c:267
 #, c-format
 msgid "%s error reading FIFO pipe, closing it\n"
 msgstr ""
 
-#: src/common/fifo.c:301
+#: src/common/fifo.c:309
 msgid "FIFO pipe is closed\n"
 msgstr ""
 
diff --git a/weechat/po/fr.po b/weechat/po/fr.po
index acb69ccbc..a98ddde85 100644
--- a/weechat/po/fr.po
+++ b/weechat/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.1-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-03-12 04:08+0100\n"
-"PO-Revision-Date: 2005-03-12 04:09+0100\n"
+"POT-Creation-Date: 2005-03-12 14:40+0100\n"
+"PO-Revision-Date: 2005-03-12 14:41+0100\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -2535,27 +2535,32 @@ msgstr "%s impossible d'ouvrir le tube FIFO (%s) en lecture\n"
 msgid "FIFO pipe is open\n"
 msgstr "le tube FIFO est ouvert\n"
 
-#: src/common/fifo.c:124 src/common/fifo.c:170
+#: src/common/fifo.c:121
+#, c-format
+msgid "%s invalid buffer for displaying text via FIFO pipe\n"
+msgstr "%s tampon invalide pour afficher le texte via le tube FIFO\n"
+
+#: src/common/fifo.c:132 src/common/fifo.c:178
 #, c-format
 msgid "%s invalid text received on FIFO pipe\n"
 msgstr "%s texte invalide reçu sur le tube FIFO\n"
 
-#: src/common/fifo.c:146
+#: src/common/fifo.c:154
 #, c-format
 msgid "%s server \"%s\" not found (FIFO pipe data)\n"
 msgstr "%s serveur \"%s\" non trouvé (données du tube FIFO)\n"
 
-#: src/common/fifo.c:158
+#: src/common/fifo.c:166
 #, c-format
 msgid "%s channel \"%s\" not found (FIFO pipe data)\n"
 msgstr "%s canal \"%s\" non trouvé (données du tube FIFO)\n"
 
-#: src/common/fifo.c:257 src/common/fifo.c:259
+#: src/common/fifo.c:265 src/common/fifo.c:267
 #, c-format
 msgid "%s error reading FIFO pipe, closing it\n"
 msgstr "%s erreur en lecture du tube FIFO, fermeture\n"
 
-#: src/common/fifo.c:301
+#: src/common/fifo.c:309
 msgid "FIFO pipe is closed\n"
 msgstr "le tube FIFO est fermé\n"
 
diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot
index 38e02af94..25a3d943d 100644
--- a/weechat/po/weechat.pot
+++ b/weechat/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-03-12 04:08+0100\n"
+"POT-Creation-Date: 2005-03-12 14:40+0100\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"
@@ -2366,27 +2366,32 @@ msgstr ""
 msgid "FIFO pipe is open\n"
 msgstr ""
 
-#: src/common/fifo.c:124 src/common/fifo.c:170
+#: src/common/fifo.c:121
+#, c-format
+msgid "%s invalid buffer for displaying text via FIFO pipe\n"
+msgstr ""
+
+#: src/common/fifo.c:132 src/common/fifo.c:178
 #, c-format
 msgid "%s invalid text received on FIFO pipe\n"
 msgstr ""
 
-#: src/common/fifo.c:146
+#: src/common/fifo.c:154
 #, c-format
 msgid "%s server \"%s\" not found (FIFO pipe data)\n"
 msgstr ""
 
-#: src/common/fifo.c:158
+#: src/common/fifo.c:166
 #, c-format
 msgid "%s channel \"%s\" not found (FIFO pipe data)\n"
 msgstr ""
 
-#: src/common/fifo.c:257 src/common/fifo.c:259
+#: src/common/fifo.c:265 src/common/fifo.c:267
 #, c-format
 msgid "%s error reading FIFO pipe, closing it\n"
 msgstr ""
 
-#: src/common/fifo.c:301
+#: src/common/fifo.c:309
 msgid "FIFO pipe is closed\n"
 msgstr ""
 
diff --git a/weechat/src/common/fifo.c b/weechat/src/common/fifo.c
index 36a6c850e..94ebce332 100644
--- a/weechat/src/common/fifo.c
+++ b/weechat/src/common/fifo.c
@@ -114,6 +114,14 @@ fifo_exec (char *text)
         pos_msg = text + 1;
         ptr_server = SERVER(gui_current_window->buffer);
         ptr_buffer = gui_current_window->buffer;
+        
+        if (!ptr_server)
+        {
+            irc_display_prefix (NULL, PREFIX_ERROR);
+            gui_printf (NULL, _("%s invalid buffer for displaying text via FIFO pipe\n"),
+                        WEECHAT_WARNING);
+            return;
+        }
     }
     else
     {