File texinfo-zlib.patch of Package texinfo

Overview Repositories Revisions Requests Users Attributes Meta

File texinfo-zlib.patch of Package texinfo (Revision 2196ab45c0b4421e748f5733ad00eb0b)

Currently displaying revision 2196ab45c0b4421e748f5733ad00eb0b , Show latest

diff -Nur texinfo-6.8/install-info/install-info.c new/install-info/install-info.c
--- texinfo-6.8/install-info/install-info.c	2021-06-15 22:02:27.000000000 +0200
+++ new/install-info/install-info.c	2022-04-25 12:38:13.573744683 +0200
@@ -19,6 +19,7 @@
 #include <getopt.h>
 #include <regex.h>
 #include <argz.h>
+#include <zio.h>
 
 #define TAB_WIDTH 8
 
@@ -852,22 +853,33 @@
 
   if (*compression_program)
     {
-      /* Redirect stdin to the file and fork the decompression process
-         reading from stdin.  This allows shell metacharacters in filenames. */
-      char *command = concat (*compression_program, " -d", "");
-
       if (fclose (f) < 0)
         return 0;
-      f = freopen (*opened_filename, FOPEN_RBIN, stdin);
-      if (!f)
-        return 0;
-      f = popen (command, "r");
-      if (!f)
-        {
+
+      if (**compression_program == 'g' || **compression_program == 'z')
+        f = fzopen (*opened_filename, "rg");
+      if (**compression_program == 'b')
+        f = fzopen (*opened_filename, "rb");
+      if (**compression_program == 'Z')
+        f = fzopen (*opened_filename, "rZ");
+      if (**compression_program == 'l')
+        f = fzopen (*opened_filename, "rl");
+      if (**compression_program == 'x')
+        f = fzopen (*opened_filename, "rx");
+      if (!f) {
+        /* Redirect stdin to the file and fork the decompression process
+           reading from stdin.  This allows shell metacharacters in filenames. */
+        char *command = concat (*compression_program, " -d", "");
+        f = freopen (*opened_filename, FOPEN_RBIN, stdin);
+        if (!f)
+          return 0;
+        f = popen (command, "r");
+        if (!f) {
           /* Used for error message in calling code. */
           *opened_filename = command;
           return 0;
         }
+      }
     }
   else
     {
@@ -957,8 +969,22 @@
 
   if (compression_program)
     {
-      char *command = concat (compression_program, ">", dirfile);
-      output = popen (command, "w");
+      output = NULL;
+      if (*compression_program == 'g' || *compression_program == 'z')
+        output = fzopen (dirfile, "wg");
+      if (*compression_program == 'b')
+        output = fzopen (dirfile, "wb");
+      if (*compression_program == 'Z')
+        output = fzopen (dirfile, "wZ");
+      if (*compression_program == 'l')
+        output = fzopen (dirfile, "wl");
+      if (*compression_program == 'x')
+        output = fzopen (dirfile, "wx");
+      if (!output)
+      {
+        char *command = concat (compression_program, ">", dirfile);
+        output = popen (command, "w");
+      }
     }
   else
     output = fopen (dirfile, "w");
diff -Nur texinfo-6.8/install-info/Makefile.in new/install-info/Makefile.in
--- texinfo-6.8/install-info/Makefile.in	2021-07-03 11:13:01.000000000 +0200
+++ new/install-info/Makefile.in	2022-04-25 12:30:06.593744741 +0200
@@ -239,7 +239,7 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
 ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
-ginstall_info_LDADD = $(LDADD)
+ginstall_info_LDADD = $(LDADD) -lzio
 am__DEPENDENCIES_1 =
 ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

Places

File texinfo-zlib.patch of Package texinfo (Revision 2196ab45c0b4421e748f5733ad00eb0b)

Places