e2c65a
diff -up texinfo-5.1/install-info/install-info.c.orig texinfo-5.1/install-info/install-info.c
e2c65a
--- texinfo-5.1/install-info/install-info.c.orig	2013-03-09 03:21:55.000000000 +0100
e2c65a
+++ texinfo-5.1/install-info/install-info.c	2013-03-18 12:47:02.721136885 +0100
e2c65a
@@ -22,6 +22,7 @@
e2c65a
 #include <getopt.h>
e2c65a
 #include <regex.h>
e2c65a
 #include <argz.h>
e2c65a
+#include <zlib.h>
e2c65a
 
e2c65a
 #define TAB_WIDTH 8
e2c65a
 
e2c65a
@@ -670,7 +671,7 @@ The first time you invoke Info you start
e2c65a
    
e2c65a
    MAGIC number, not the filename.  */
e2c65a
 
e2c65a
-FILE *
e2c65a
+void *
e2c65a
 open_possibly_compressed_file (char *filename,
e2c65a
     void (*create_callback) (char *),
e2c65a
     char **opened_filename, char **compression_program, int *is_pipe) 
e2c65a
@@ -678,7 +679,7 @@ open_possibly_compressed_file (char *fil
e2c65a
   char *local_opened_filename, *local_compression_program;
e2c65a
   int nread;
e2c65a
   char data[13];
e2c65a
-  FILE *f;
e2c65a
+  gzFile *f;
e2c65a
 
e2c65a
   /* We let them pass NULL if they don't want this info, but it's easier
e2c65a
      to always determine it.  */
e2c65a
@@ -686,48 +687,48 @@ open_possibly_compressed_file (char *fil
e2c65a
     opened_filename = &local_opened_filename;
e2c65a
 
e2c65a
   *opened_filename = filename;
e2c65a
-  f = fopen (*opened_filename, FOPEN_RBIN);
e2c65a
+  f = gzopen (*opened_filename, FOPEN_RBIN);
e2c65a
   if (!f)
e2c65a
     {
e2c65a
       *opened_filename = concat (filename, ".gz", "");
e2c65a
-      f = fopen (*opened_filename, FOPEN_RBIN);
e2c65a
+      f = gzopen (*opened_filename, FOPEN_RBIN);
e2c65a
     }
e2c65a
   if (!f)
e2c65a
     {
e2c65a
       free (*opened_filename);
e2c65a
       *opened_filename = concat (filename, ".xz", "");
e2c65a
-      f = fopen (*opened_filename, FOPEN_RBIN);
e2c65a
+      f = gzopen (*opened_filename, FOPEN_RBIN);
e2c65a
     }
e2c65a
   if (!f)
e2c65a
     {
e2c65a
       free (*opened_filename);
e2c65a
       *opened_filename = concat (filename, ".bz2", "");
e2c65a
-      f = fopen (*opened_filename, FOPEN_RBIN);
e2c65a
+      f = gzopen (*opened_filename, FOPEN_RBIN);
e2c65a
     }
e2c65a
   if (!f)
e2c65a
     {
e2c65a
       free (*opened_filename);
e2c65a
       *opened_filename = concat (filename, ".lz", "");
e2c65a
-      f = fopen (*opened_filename, FOPEN_RBIN);
e2c65a
+      f = gzopen (*opened_filename, FOPEN_RBIN);
e2c65a
     }
e2c65a
   if (!f)
e2c65a
     {
e2c65a
      free (*opened_filename);
e2c65a
      *opened_filename = concat (filename, ".lzma", "");
e2c65a
-     f = fopen (*opened_filename, FOPEN_RBIN);
e2c65a
+     f = gzopen (*opened_filename, FOPEN_RBIN);
e2c65a
     }
e2c65a
 #ifdef __MSDOS__
e2c65a
   if (!f)
e2c65a
     {
e2c65a
       free (*opened_filename);
e2c65a
       *opened_filename = concat (filename, ".igz", "");
e2c65a
-      f = fopen (*opened_filename, FOPEN_RBIN);
e2c65a
+      f = gzopen (*opened_filename, FOPEN_RBIN);
e2c65a
     }
e2c65a
   if (!f)
e2c65a
     {
e2c65a
       free (*opened_filename);
e2c65a
       *opened_filename = concat (filename, ".inz", "");
e2c65a
-      f = fopen (*opened_filename, FOPEN_RBIN);
e2c65a
+      f = gzopen (*opened_filename, FOPEN_RBIN);
e2c65a
     }
e2c65a
 #endif /* __MSDOS__ */
e2c65a
    if (!f)
e2c65a
@@ -739,7 +740,7 @@ open_possibly_compressed_file (char *fil
e2c65a
            /* And try opening it again.  */
e2c65a
            free (*opened_filename);
e2c65a
            *opened_filename = filename;
e2c65a
-           f = fopen (*opened_filename, FOPEN_RBIN);
e2c65a
+           f = gzopen (*opened_filename, FOPEN_RBIN);
e2c65a
            if (!f)
e2c65a
              pfatal_with_name (filename);
e2c65a
          }
e2c65a
@@ -749,12 +750,12 @@ open_possibly_compressed_file (char *fil
e2c65a
 
e2c65a
   /* Read first few bytes of file rather than relying on the filename.
e2c65a
      If the file is shorter than this it can't be usable anyway.  */
e2c65a
-  nread = fread (data, sizeof (data), 1, f);
e2c65a
-  if (nread != 1)
e2c65a
+  nread = gzread (f, data, sizeof (data));
e2c65a
+  if (nread != sizeof (data))
e2c65a
     {
e2c65a
       /* Empty files don't set errno, so we get something like
e2c65a
          "install-info: No error for foo", which is confusing.  */
e2c65a
-      if (nread == 0)
e2c65a
+      if (nread >= 0)
e2c65a
         fatal (_("%s: empty file"), *opened_filename);
e2c65a
       pfatal_with_name (*opened_filename);
e2c65a
     }
e2c65a
@@ -821,20 +822,22 @@ open_possibly_compressed_file (char *fil
e2c65a
 
e2c65a
   if (*compression_program)
e2c65a
     { /* It's compressed, so fclose the file and then open a pipe.  */
e2c65a
+      FILE *p;
e2c65a
       char *command = concat (*compression_program," -cd <", *opened_filename);
e2c65a
-      if (fclose (f) < 0)
e2c65a
+      if (gzclose (f) < 0)
e2c65a
         pfatal_with_name (*opened_filename);
e2c65a
-      f = popen (command, "r");
e2c65a
-      if (f)
e2c65a
+      p = popen (command, "r");
e2c65a
+      if (p)
e2c65a
         *is_pipe = 1;
e2c65a
       else
e2c65a
         pfatal_with_name (command);
e2c65a
+      return p;
e2c65a
     }
e2c65a
   else
e2c65a
     { /* It's a plain file, seek back over the magic bytes.  */
e2c65a
-      if (fseek (f, 0, 0) < 0)
e2c65a
+      if (gzseek (f, 0, SEEK_SET) < 0)
e2c65a
         pfatal_with_name (*opened_filename);
e2c65a
-#if O_BINARY
e2c65a
+#if 0 && O_BINARY
e2c65a
       /* Since this is a text file, and we opened it in binary mode,
e2c65a
          switch back to text mode.  */
e2c65a
       f = freopen (*opened_filename, "r", f);
e2c65a
@@ -859,7 +862,7 @@ readfile (char *filename, int *sizep,
e2c65a
     char **compression_program)
e2c65a
 {
e2c65a
   char *real_name;
e2c65a
-  FILE *f;
e2c65a
+  void *f;
e2c65a
   int pipe_p;
e2c65a
   int filled = 0;
e2c65a
   int data_size = 8192;
e2c65a
@@ -873,7 +876,12 @@ readfile (char *filename, int *sizep,
e2c65a
 
e2c65a
   for (;;)
e2c65a
     {
e2c65a
-      int nread = fread (data + filled, 1, data_size - filled, f);
e2c65a
+      int nread;
e2c65a
+
e2c65a
+      if (pipe_p)
e2c65a
+        nread = fread (data + filled, 1, data_size - filled, f);
e2c65a
+      else
e2c65a
+        nread = gzread (f, data + filled, data_size - filled);
e2c65a
       if (nread < 0)
e2c65a
         pfatal_with_name (real_name);
e2c65a
       if (nread == 0)
e2c65a
@@ -895,7 +903,7 @@ readfile (char *filename, int *sizep,
e2c65a
   if (pipe_p)
e2c65a
     pclose (f);
e2c65a
   else
e2c65a
-    fclose (f);
e2c65a
+    gzclose (f);
e2c65a
 
e2c65a
   *sizep = filled;
e2c65a
   return data;
e2c65a
diff -up texinfo-5.1/install-info/Makefile.in.orig texinfo-5.1/install-info/Makefile.in
e2c65a
--- texinfo-5.1/install-info/Makefile.in.orig	2013-03-12 23:56:43.000000000 +0100
e2c65a
+++ texinfo-5.1/install-info/Makefile.in	2013-03-18 12:42:57.165767101 +0100
e2c65a
@@ -171,7 +171,7 @@ am__installdirs = "$(DESTDIR)$(bindir)"
e2c65a
 PROGRAMS = $(bin_PROGRAMS)
e2c65a
 am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
e2c65a
 ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
e2c65a
-ginstall_info_LDADD = $(LDADD)
e2c65a
+ginstall_info_LDADD = $(LDADD) -lz
e2c65a
 am__DEPENDENCIES_1 =
e2c65a
 ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \
e2c65a
 	$(am__DEPENDENCIES_1)