Fix generation of TAGS from compressed files (Bug#19735)

 lib-src/etags.c (process_file_name) [!DOS_NT]: Use "r", not "rb" in the
 call to 'popen'.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 534d253cabb5e8d4dafd835a35647283bec9f7ef..05511164706f40a2636b4cc7ef79f2ca04e30076 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-19  Eli Zaretskii  <eliz@gnu.org>
+
+       * etags.c (process_file_name) [!DOS_NT]: Use "r", not "rb" in the
+       call to 'popen'.  (Bug#19735)
+
 2015-02-13  Paul Eggert  <eggert@cs.ucla.edu>
 
        Better support for future plugins

diff --git a/lib-src/etags.c b/lib-src/etags.c
index dc2ced50933ff210dacfc91257101fe44910d4b2..cdac9289230380c54ca4b17cbb67b7e6b9b74291 100644 (file)
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -1532,7 +1532,14 @@ process_file_name (char *file, language *lang)
   if (real_name == compressed_name)
     {
       char *cmd = concat (compr->command, " ", real_name);
+
+      /* Unix implementations of 'popen' generally don't support "rb", whereas
+        DOS_NT needs it.  */
+#ifdef DOS_NT
       inf = popen (cmd, "rb");
+#else
+      inf = popen (cmd, "r");
+#endif
       free (cmd);
     }
   else