Репозитории ALT
Группа :: Издательство
Пакет: texinfo
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: texinfo-4.8-alt-zio.patch
Скачать
Скачать
--- texinfo-4.8.orig/util/Makefile.am
+++ texinfo-4.8/util/Makefile.am
@@ -24,7 +24,7 @@ transform = s/ginstall-info/install-info
localedir = $(datadir)/locale
INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
-LDADD = ../lib/libtxi.a $(LIBINTL)
+LDADD = ../lib/libtxi.a $(LIBINTL) -lzio
dist_pkgdata_DATA = texinfo.dtd texinfo.xsl
pkgdata_DATA = texinfo.cat
--- texinfo-4.8.orig/util/Makefile.in
+++ texinfo-4.8/util/Makefile.in
@@ -243,7 +243,7 @@ # bug, IMHO, but this is easier than pat
ginstall_info_SOURCES = install-info.c
localedir = $(datadir)/locale
INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
-LDADD = ../lib/libtxi.a $(LIBINTL)
+LDADD = ../lib/libtxi.a $(LIBINTL) -lzio
dist_pkgdata_DATA = texinfo.dtd texinfo.xsl
pkgdata_DATA = texinfo.cat
--- texinfo-4.8.orig/util/install-info.c
+++ texinfo-4.8/util/install-info.c
@@ -20,6 +20,7 @@
#include "system.h"
#include <getopt.h>
+#include <zio.h>
static char *progname = "install-info";
@@ -545,11 +546,11 @@ open_possibly_compressed_file (char *fil
opened_filename = &local_opened_filename;
*opened_filename = filename;
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = fzopen (*opened_filename, FOPEN_RBIN);
if (!f)
{
*opened_filename = concat (filename, ".gz", "");
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = fzopen (*opened_filename, FOPEN_RBIN);
if (!f)
{
free (*opened_filename);
@@ -562,13 +563,13 @@ open_possibly_compressed_file (char *fil
{
free (*opened_filename);
*opened_filename = concat (filename, ".igz", "");
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = fzopen (*opened_filename, FOPEN_RBIN);
}
if (!f)
{
free (*opened_filename);
*opened_filename = concat (filename, ".inz", "");
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = fzopen (*opened_filename, FOPEN_RBIN);
}
#endif
if (!f)
@@ -580,7 +581,7 @@ open_possibly_compressed_file (char *fil
/* And try opening it again. */
free (*opened_filename);
*opened_filename = filename;
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = fzopen (*opened_filename, FOPEN_RBIN);
if (!f)
pfatal_with_name (filename);
}
@@ -589,6 +590,7 @@ open_possibly_compressed_file (char *fil
}
}
+#if 0
/* Read first few bytes of file rather than relying on the filename.
If the file is shorter than this it can't be usable anyway. */
nread = fread (data, sizeof (data), 1, f);
@@ -649,6 +651,8 @@ open_possibly_compressed_file (char *fil
#endif
*is_pipe = 0;
}
+#endif
+ *is_pipe = 0;
return f;
}
@@ -700,10 +704,7 @@ readfile (char *filename, int *sizep,
/* 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. */
- if (pipe_p)
- pclose (f);
- else
- fclose (f);
+ fclose(f);
*sizep = filled;
return data;
@@ -1449,7 +1450,7 @@ For more information about these matters
warning (_("no entries found for `%s'; nothing deleted"), infile, 0);
output_dirfile (opened_dirfilename, dir_nlines, dir_lines, n_entries_to_add,
- entries_to_add, input_sections, compression_program);
+ entries_to_add, input_sections, NULL);
xexit (0);
return 0; /* Avoid bogus warnings. */