--- config.h.in +++ config.h.in 2012-10-02 09:06:48.591006953 +0000 @@ -674,6 +674,9 @@ /* Define to 1 if you have the `z' library (-lz). */ #undef HAVE_LIBZ +/* Define to 1 if you have libzio for opening compressed manuals */ +#undef HAVE_ZIO + /* Define to 1 if you have the header file. */ #undef HAVE_LINEWRAP_H --- configure.ac +++ configure.ac 2012-10-02 09:55:06.783914808 +0000 @@ -98,6 +98,18 @@ AC_ARG_WITH([sections], sections="$withval" fi], [: ${sections=1 n l 8 3 2 5 4 9 6 7}]) +AC_ARG_WITH([zio], +[AS_HELP_STRING([--with-zio=LIBRARY], [use zlib/libbz2 wrapper library LIBRARY (libzio)])], + [if test -z "$withval" -o "$withval" = "yes" + then + zio=libzio + elif test "$withval" = "no" + then + AC_MSG_ERROR(--with-zio requires an argument) + else + zio=$withval + fi], + [: ${zio=no}]) AC_ARG_ENABLE([automatic-create], [AS_HELP_STRING([--enable-automatic-create], [allow man to create user databases on the fly])], [if test "$enableval" = "yes" @@ -375,6 +387,40 @@ AC_SUBST([unlzma]) AC_SUBST([unxz]) AC_SUBST([unlzip]) MAN_COMPRESS_LIB([z], [gzopen]) +dnl Check for zlib and libbz2 libraries to use this together +dnl with SuSE's libzio to open compressed info files. +dnl +if test "$zio" = "no" || test -n "$zio" +then + AC_CHECK_HEADER(zio.h,[ + for lib in ${zio#lib} zio + do + AC_CHECK_LIB($lib, fzopen, [LIBS="-l$lib $LIBS"; am_cv_libzio=yes]) + done + ]) + if test "$am_cv_libzio" = yes; then + AC_DEFINE([COMP_SRC],[],[Define if you have compressors and want to support compressed cat files.]) + AC_DEFINE([HAVE_ZIO],[],[Define to 1 if you have libzio for opening compressed manuals]) + AC_CHECK_HEADER(zlib.h,[ + for lib in z gz + do + AC_CHECK_LIB($lib, gzopen, [LIBS="$LIBS -Wl,--no-as-needed -l$lib"; break]) + done + ]) + AC_CHECK_HEADER(bzlib.h,[ + for lib in bz2 bzip2 + do + AC_CHECK_LIB($lib, BZ2_bzopen, [LIBS="$LIBS -Wl,--no-as-needed -l$lib"; break]) + done + ]) + AC_CHECK_HEADER(lzma.h, [ + for lib in lzma lzmadec + do + AC_CHECK_LIB($lib, lzmadec_open, [LIBS="$LIBS -Wl,--no-as-needed -l$lib"; break]) + done + ]) + fi +fi dnl To add more decompressors just follow the scheme above. # Work out which manual page hierarchy scheme might be in use. --- lib/decompress.c +++ lib/decompress.c 2012-10-02 09:05:43.787007258 +0000 @@ -36,6 +36,10 @@ # include "zlib.h" #endif /* HAVE_LIBZ */ +#ifdef HAVE_ZIO +# include "zio.h" +#endif /* HAVE_ZIO */ + #include "manconfig.h" #include "comp_src.h" #include "pipeline.h" @@ -66,6 +70,32 @@ static void decompress_zlib (void *data #endif /* HAVE_LIBZ */ +#ifdef HAVE_ZIO + +static void decompress_zio (void *data) +{ + const char *what = (const char*)data; + FILE *file; + + file = fdzopen(dup (fileno (stdin)), "r", what); + if (!file) + return; + + for (;;) { + char buffer[4096]; + int r = fread(buffer, sizeof(char), sizeof(buffer), file); + if (r <= 0) + break; + if (fwrite (buffer, 1, (size_t) r, stdout) < (size_t) r) + break; + } + + fclose(file); + return; +} + +#endif /* HAVE_ZIO */ + pipeline *decompress_open (const char *filename) { pipecmd *cmd; @@ -80,6 +110,37 @@ pipeline *decompress_open (const char *f if (stat (filename, &st) < 0 || S_ISDIR (st.st_mode)) return NULL; +#ifdef HAVE_ZIO + ext = strrchr (filename, '.'); + if (ext) { + char opt[2] = {'\0', '\0'}; + char *name; + + if (STREQ (ext, ".gz")) + *opt = 'g'; + else if (STREQ (ext, ".z")) + *opt = 'z'; + else if (STREQ (ext, ".bz2")) + *opt = 'b'; + else if (STREQ (ext, ".xz")) + *opt = 'x'; + else if (STREQ (ext, ".lzma")) + *opt = 'l'; + else if (STREQ (ext, ".Z")) + *opt = 'Z'; + else + goto nozio; + + /* informational only; no shell quoting concerns */ + name = appendstr (NULL, "libzio < ", filename, NULL); + cmd = pipecmd_new_function (name, &decompress_zio, NULL, + opt); + free (name); + p = pipeline_new_commands (cmd, NULL); + goto got_pipeline; + } +#endif /* HAVE_ZIO */ + #ifdef HAVE_LIBZ filename_len = strlen (filename); if (filename_len > 3 && STREQ (filename + filename_len - 3, ".gz")) { @@ -93,7 +154,11 @@ pipeline *decompress_open (const char *f } #endif /* HAVE_LIBZ */ +#ifdef HAVE_ZIO +nozio: +#else ext = strrchr (filename, '.'); +#endif /* HAVE_LIBZ */ if (ext) { ++ext;