---- texinfo-3.12f/util/install-info.c.zlib Wed Mar 17 18:35:46 1999
-+++ texinfo-3.12f/util/install-info.c Wed Mar 17 18:35:47 1999
+--- texinfo-3.12s/util/install-info.c.wiget Wed Sep 8 17:37:16 1999
++++ texinfo-3.12s/util/install-info.c Wed Sep 8 18:01:09 1999
@@ -19,6 +19,7 @@
#include "system.h"
static char *progname = "install-info";
-@@ -474,7 +475,7 @@
+@@ -481,7 +482,7 @@
COMPRESSION_PROGRAM. The compression program is determined by the
magic number, not the filename. */
open_possibly_compressed_file (filename, create_callback,
opened_filename, compression_program, is_pipe)
char *filename;
-@@ -486,7 +487,7 @@
+@@ -493,7 +494,7 @@
char *local_opened_filename, *local_compression_program;
int nread;
char data[4];
/* We let them pass NULL if they don't want this info, but it's easier
to always determine it. */
-@@ -494,23 +495,23 @@
+@@ -501,23 +502,23 @@
opened_filename = &local_opened_filename;
*opened_filename = filename;
}
#endif
if (!f)
-@@ -522,7 +523,7 @@
+@@ -529,7 +530,7 @@
/* And try opening it again. */
free (*opened_filename);
*opened_filename = filename;
if (!f)
pfatal_with_name (filename);
}
-@@ -531,54 +532,7 @@
+@@ -538,54 +539,7 @@
}
}
- if (nread != 1)
- {
- /* Empty files don't set errno, so we get something like
-- "install-info: No error for foo", which is confusing. */
+- "install-info: No error for foo", which is confusing. */
- if (nread == 0)
- fatal (_("%s: empty file"), *opened_filename);
- pfatal_with_name (*opened_filename);
- switch back to text mode. */
- f = freopen (*opened_filename, "r", f);
-#endif
-- *is_pipe = 0;
+ *is_pipe = 0;
- }
-+ *is_pipe = 0;
return f;
}
-@@ -601,7 +555,7 @@
+@@ -608,7 +562,7 @@
char **compression_program;
{
char *real_name;
int pipe_p;
int filled = 0;
int data_size = 8192;
-@@ -615,7 +569,7 @@
+@@ -622,7 +576,7 @@
for (;;)
{
if (nread < 0)
pfatal_with_name (real_name);
if (nread == 0)
-@@ -634,10 +588,7 @@
+@@ -641,10 +595,7 @@
/* We need to close the stream, since on some systems the pipe created
by popen is simulated by a temporary file which only gets removed
inside pclose. */
*sizep = filled;
return data;
-@@ -1245,7 +1196,7 @@
+@@ -1407,7 +1358,7 @@
warning (_("no entries found for `%s'; nothing deleted"), infile);
output_dirfile (opened_dirfilename, dir_nlines, dir_lines, n_entries_to_add,
xexit (0);
}
---- texinfo-3.12f/util/Makefile.in.zlib Wed Mar 17 18:36:17 1999
-+++ texinfo-3.12f/util/Makefile.in Wed Mar 17 18:36:25 1999
-@@ -102,7 +102,7 @@
+--- texinfo-3.12s/util/Makefile.in.wiget Thu Aug 19 23:30:56 1999
++++ texinfo-3.12s/util/Makefile.in Wed Sep 8 17:37:16 1999
+@@ -104,7 +104,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@