Merging upstream version 1.5.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

8 files changed, 109 insertions, 96 deletions

diff --git a/doc/zcat.1 b/doc/zcat.1
index 5b3ba2e..b67aa40 100644
--- a/doc/zcat.1
+++ b/doc/zcat.1
@@ -1,19 +1,20 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
-.TH ZCAT "1" "May 2015" "zcat (zutils) 1.4" "User Commands"
+.TH ZCAT "1" "May 2016" "zcat (zutils) 1.5" "User Commands"
 .SH NAME
 zcat \- decompress and concatenate files to standard output
 .SH SYNOPSIS
 .B zcat
 [\fI\,options\/\fR] [\fI\,files\/\fR]
 .SH DESCRIPTION
-Zcat copies each given file ("\-" means standard input), to standard
-output. If any given file is compressed, its decompressed content is
-used. If a given file does not exist, and its name does not end with one
-of the known extensions, zcat tries the compressed file names
-corresponding to the supported formats. If no files are specified,
-data is read from standard input, decompressed if needed, and sent to
-standard output. Data read from standard input must be of the same type;
-all uncompressed or all in the same compression format.
+Zcat copies each given file to standard output. If any given file is
+compressed, its decompressed content is used. If a given file does not
+exist, and its name does not end with one of the known extensions, zcat
+tries the compressed file names corresponding to the supported formats.
+.PP
+If no files are specified, or if a file is specified as '\-', data is
+read from standard input, decompressed if needed, and sent to standard
+output. Data read from standard input must be of the same type; all
+uncompressed or all in the same compression format.
 .PP
 The supported formats are bzip2, gzip, lzip and xz.
 .PP
@@ -87,7 +88,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2015 Antonio Diaz Diaz.
+Copyright \(co 2016 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zcmp.1 b/doc/zcmp.1
index d1a4ee4..33f725e 100644
--- a/doc/zcmp.1
+++ b/doc/zcmp.1
@@ -1,16 +1,16 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
-.TH ZCMP "1" "May 2015" "zcmp (zutils) 1.4" "User Commands"
+.TH ZCMP "1" "May 2016" "zcmp (zutils) 1.5" "User Commands"
 .SH NAME
 zcmp \- decompress and compare two files byte by byte
 .SH SYNOPSIS
 .B zcmp
 [\fI\,options\/\fR] \fI\,file1 \/\fR[\fI\,file2\/\fR]
 .SH DESCRIPTION
-Zcmp compares two files ("\-" means standard input), and if they
-differ, tells the first byte and line number where they differ. Bytes
-and lines are numbered starting with 1. If any given file is compressed,
-its decompressed content is used. Compressed files are decompressed on
-the fly; no temporary files are created.
+Zcmp compares two files ('\-' means standard input), and if they differ,
+tells the first byte and line number where they differ. Bytes and lines
+are numbered starting with 1. If any given file is compressed, its
+decompressed content is used. Compressed files are decompressed on the
+fly; no temporary files are created.
 .PP
 The supported formats are bzip2, gzip, lzip and xz.
 .PP
@@ -85,7 +85,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2015 Antonio Diaz Diaz.
+Copyright \(co 2016 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zdiff.1 b/doc/zdiff.1
index 6a58cc3..3e1d607 100644
--- a/doc/zdiff.1
+++ b/doc/zdiff.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
-.TH ZDIFF "1" "May 2015" "zdiff (zutils) 1.4" "User Commands"
+.TH ZDIFF "1" "May 2016" "zdiff (zutils) 1.5" "User Commands"
 .SH NAME
 zdiff \- decompress and compare two files line by line
 .SH SYNOPSIS
 .B zdiff
 [\fI\,options\/\fR] \fI\,file1 \/\fR[\fI\,file2\/\fR]
 .SH DESCRIPTION
-Zdiff compares two files ("\-" means standard input), and if they
+Zdiff compares two files ('\-' means standard input), and if they
 differ, shows the differences line by line. If any given file is
 compressed, its decompressed content is used. Zdiff is a front end to
 the diff program and has the limitation that messages from diff refer to
@@ -109,7 +109,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2015 Antonio Diaz Diaz.
+Copyright \(co 2016 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zgrep.1 b/doc/zgrep.1
index 864a6a5..67d8277 100644
--- a/doc/zgrep.1
+++ b/doc/zgrep.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
-.TH ZGREP "1" "May 2015" "zgrep (zutils) 1.4" "User Commands"
+.TH ZGREP "1" "May 2016" "zgrep (zutils) 1.5" "User Commands"
 .SH NAME
 zgrep \- search compressed files for a regular expression
 .SH SYNOPSIS
@@ -11,10 +11,12 @@ on any combination of compressed and uncompressed files. If any given
 file is compressed, its decompressed content is used. If a given file
 does not exist, and its name does not end with one of the known
 extensions, zgrep tries the compressed file names corresponding to the
-supported formats. If no files are specified, data is read from
-standard input, decompressed if needed, and fed to grep. Data read from
-standard input must be of the same type; all uncompressed or all
-in the same compression format.
+supported formats.
+.PP
+If no files are specified, or if a file is specified as '\-', data is
+read from standard input, decompressed if needed, and fed to grep. Data
+read from standard input must be of the same type; all uncompressed or
+all in the same compression format.
 .PP
 The supported formats are bzip2, gzip, lzip and xz.
 .PP
@@ -133,7 +135,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2015 Antonio Diaz Diaz.
+Copyright \(co 2016 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/ztest.1 b/doc/ztest.1
index 793e94d..3311667 100644
--- a/doc/ztest.1
+++ b/doc/ztest.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
-.TH ZTEST "1" "May 2015" "ztest (zutils) 1.4" "User Commands"
+.TH ZTEST "1" "May 2016" "ztest (zutils) 1.5" "User Commands"
 .SH NAME
 ztest \- verify integrity of compressed files
 .SH SYNOPSIS
@@ -7,9 +7,10 @@ ztest \- verify integrity of compressed files
 [\fI\,options\/\fR] [\fI\,files\/\fR]
 .SH DESCRIPTION
 Ztest verifies the integrity of the specified compressed files.
-Uncompressed files are ignored. If no files are specified, the integrity
-of compressed data read from standard input is verified. Data read from
-standard input must be all in the same compression format.
+Uncompressed files are ignored. If no files are specified, or if a file
+is specified as '\-', the integrity of compressed data read from standard
+input is verified. Data read from standard input must be all in the same
+compression format.
 .PP
 The supported formats are bzip2, gzip, lzip and xz.
 .PP
@@ -61,7 +62,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2015 Antonio Diaz Diaz.
+Copyright \(co 2016 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zupdate.1 b/doc/zupdate.1
index a14914c..059867e 100644
--- a/doc/zupdate.1
+++ b/doc/zupdate.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
-.TH ZUPDATE "1" "May 2015" "zupdate (zutils) 1.4" "User Commands"
+.TH ZUPDATE "1" "May 2016" "zupdate (zutils) 1.5" "User Commands"
 .SH NAME
-zupdate \- recompress bzip2, gzip, xz files to lzip files
+zupdate \- recompress bzip2, gzip, xz files to lzip format
 .SH SYNOPSIS
 .B zupdate
 [\fI\,options\/\fR] [\fI\,files\/\fR]
@@ -34,7 +34,7 @@ display this help and exit
 output version information and exit
 .TP
 \fB\-f\fR, \fB\-\-force\fR
-do not skip a file even if the .lz exists
+don't skip a file even if the .lz exists
 .TP
 \fB\-k\fR, \fB\-\-keep\fR
 keep (don't delete) input files
@@ -76,7 +76,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2015 Antonio Diaz Diaz.
+Copyright \(co 2016 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zutils.info b/doc/zutils.info
index 090ec48..b753ec0 100644
--- a/doc/zutils.info
+++ b/doc/zutils.info
@@ -12,7 +12,7 @@ File: zutils.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Zutils Manual
 *************
 
-This manual is for Zutils (version 1.4, 29 May 2015).
+This manual is for Zutils (version 1.5, 15 May 2016).
 
 * Menu:
 
@@ -29,7 +29,7 @@ This manual is for Zutils (version 1.4, 29 May 2015).
 * Concept index::       Index of concepts
 
 
-   Copyright (C) 2009-2015 Antonio Diaz Diaz.
+   Copyright (C) 2009-2016 Antonio Diaz Diaz.
 
    This manual is free documentation: you have unlimited permission to
 copy, distribute and modify it.
@@ -52,7 +52,8 @@ in those utilities supporting it.
 
 The provided utilities are zcat, zcmp, zdiff, zgrep, ztest and zupdate.
 The supported formats are bzip2, gzip, lzip and xz.
-The compressor to be used for each format is configurable at runtime.
+Zutils uses external compressors. The compressor to be used for each
+format is configurable at runtime.
 
    zcat, zcmp, zdiff, and zgrep are improved replacements for the shell
 scripts provided by GNU gzip. ztest is unique to zutils. zupdate is
@@ -140,7 +141,7 @@ described here.
 '--lz=COMMAND'
 '--xz=COMMAND'
      Set program (may include arguments) to be used as (de)compressor
-     for the given format. The mane of the program can't begin with
+     for the given format. The name of the program can't begin with
      '-'. These options override the values set in 'zutilsrc'. The
      compression program used must meet three requirements:
 
@@ -163,7 +164,7 @@ File: zutils.info,  Node: The zutilsrc file,  Next: Zcat,  Prev: Common options,
 
 'zutilsrc' is the runtime configuration file for zutils. In it you may
 define the compressor name and options to be used for each format.  The
-'zutilsrc' file is optional; you do not need to install it in order to
+'zutilsrc' file is optional; you don't need to install it in order to
 run zutils.
 
    The compressors specified in the command line override those
@@ -186,16 +187,15 @@ File: zutils.info,  Node: Zcat,  Next: Zcmp,  Prev: The zutilsrc file,  Up: Top
 4 Zcat
 ******
 
-zcat copies each given file ('-' means standard input), to standard
-output. If any given file is compressed, its decompressed content is
-used. If a given file does not exist, and its name does not end with one
-of the known extensions, zcat tries the compressed file names
-corresponding to the supported formats.
+zcat copies each given file to standard output. If any given file is
+compressed, its decompressed content is used. If a given file does not
+exist, and its name does not end with one of the known extensions, zcat
+tries the compressed file names corresponding to the supported formats.
 
-   If no files are specified, data is read from standard input,
-decompressed if needed, and sent to standard output. Data read from
-standard input must be of the same type; all uncompressed or all in the
-same compression format.
+   If no files are specified, or if a file is specified as '-', data is
+read from standard input, decompressed if needed, and sent to standard
+output. Data read from standard input must be of the same type; all
+uncompressed or all in the same compression format.
 
    The format for running zcat is:
 
@@ -336,7 +336,7 @@ differences were found, and 2 means trouble.
 '-s'
 '--quiet'
 '--silent'
-     Do not print anything; only return an exit status indicating
+     Don't print anything; only return an exit status indicating
      whether the files differ.
 
 
@@ -460,10 +460,10 @@ does not exist, and its name does not end with one of the known
 extensions, zgrep tries the compressed file names corresponding to the
 supported formats.
 
-   If no files are specified, data is read from standard input,
-decompressed if needed, and fed to grep. Data read from standard input
-must be of the same type; all uncompressed or all in the same
-compression format.
+   If no files are specified, or if a file is specified as '-', data is
+read from standard input, decompressed if needed, and fed to grep.
+Data read from standard input must be of the same type; all uncompressed
+or all in the same compression format.
 
    The format for running zgrep is:
 
@@ -509,6 +509,9 @@ matches were found, and 2 means trouble.
 '-f FILE'
 '--file=FILE'
      Obtain patterns from FILE, one per line.
+     When searching in several files at once, command substitution can
+     be used with '-e' to read FILE only once, for example if FILE is
+     not a regular file: 'zgrep -e "$(cat FILE)" file1.lz file2.gz'
 
 '-F'
 '--fixed-strings'
@@ -594,9 +597,10 @@ File: zutils.info,  Node: Ztest,  Next: Zupdate,  Prev: Zgrep,  Up: Top
 *******
 
 ztest verifies the integrity of the specified compressed files.
-Uncompressed files are ignored. If no files are specified, the integrity
-of compressed data read from standard input is verified. Data read from
-standard input must be all in the same compression format.
+Uncompressed files are ignored. If no files are specified, or if a file
+is specified as '-', the integrity of compressed data read from
+standard input is verified. Data read from standard input must be all in
+the same compression format.
 
    Note that some xz files lack integrity information, and therefore
 can't be verified as reliably as the other formats can.
@@ -642,7 +646,7 @@ File: zutils.info,  Node: Zupdate,  Next: Problems,  Prev: Ztest,  Up: Top
 *********
 
 zupdate recompresses files from bzip2, gzip, and xz formats to lzip
-format. The originals are compared with the new files and then deleted.
+format. Each original is compared with the new file and then deleted.
 Only regular files with standard file name extensions are recompressed,
 other files are ignored. Compressed files are decompressed and then
 recompressed on the fly; no temporary files are created. The lzip format
@@ -682,7 +686,7 @@ otherwise.
 
 '-f'
 '--force'
-     Do not skip a file for which a lzip compressed version already
+     Don't skip a file for which a lzip compressed version already
      exists.  '--force' compares the content of the input file with the
      content of the existing lzip file and deletes the input file if
      both contents are identical.
@@ -758,17 +762,17 @@ Concept index
 Tag Table:
 Node: Top222
 Node: Introduction1142
-Node: Common options3692
-Ref: compressor-requirements5450
-Node: The zutilsrc file5822
-Node: Zcat6748
-Node: Zcmp8795
-Node: Zdiff11255
-Node: Zgrep13895
-Node: Ztest16990
-Node: Zupdate18494
-Node: Problems21369
-Node: Concept index21903
+Node: Common options3726
+Ref: compressor-requirements5484
+Node: The zutilsrc file5856
+Node: Zcat6781
+Node: Zcmp8834
+Node: Zdiff11293
+Node: Zgrep13933
+Node: Ztest17271
+Node: Zupdate18809
+Node: Problems21681
+Node: Concept index22215
 
 End Tag Table
 
diff --git a/doc/zutils.texi b/doc/zutils.texi
index 236265c..34c15b4 100644
--- a/doc/zutils.texi
+++ b/doc/zutils.texi
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 29 May 2015
-@set VERSION 1.4
+@set UPDATED 15 May 2016
+@set VERSION 1.5
 
 @dircategory Data Compression
 @direntry
@@ -49,7 +49,7 @@ This manual is for Zutils (version @value{VERSION}, @value{UPDATED}).
 @end menu
 
 @sp 1
-Copyright @copyright{} 2009-2015 Antonio Diaz Diaz.
+Copyright @copyright{} 2009-2016 Antonio Diaz Diaz.
 
 This manual is free documentation: you have unlimited permission
 to copy, distribute and modify it.
@@ -72,7 +72,8 @@ in those utilities supporting it.
 @noindent
 The provided utilities are zcat, zcmp, zdiff, zgrep, ztest and zupdate.@*
 The supported formats are bzip2, gzip, lzip and xz.@*
-The compressor to be used for each format is configurable at runtime.
+Zutils uses external compressors. The compressor to be used for each
+format is configurable at runtime.
 
 zcat, zcmp, zdiff, and zgrep are improved replacements for the shell
 scripts provided by GNU gzip. ztest is unique to zutils. zupdate is
@@ -164,7 +165,7 @@ Don't read the runtime configuration file @samp{zutilsrc}.
 @itemx --lz=@var{command}
 @itemx --xz=@var{command}
 Set program (may include arguments) to be used as (de)compressor for the
-given format. The mane of the program can't begin with @samp{-}. These
+given format. The name of the program can't begin with @samp{-}. These
 options override the values set in @file{zutilsrc}. The compression
 program used must meet three requirements:
 
@@ -189,7 +190,7 @@ It must return 0 if no errors occurred, and a non-zero value otherwise.
 
 @file{zutilsrc} is the runtime configuration file for zutils. In it you
 may define the compressor name and options to be used for each format.
-The @file{zutilsrc} file is optional; you do not need to install it in
+The @file{zutilsrc} file is optional; you don't need to install it in
 order to run zutils.
 
 The compressors specified in the command line override those specified
@@ -217,16 +218,15 @@ where <format> is one of @samp{bz2}, @samp{gz}, @samp{lz} or @samp{xz}.
 @chapter Zcat
 @cindex zcat
 
-zcat copies each given file (@samp{-} means standard input), to standard
-output. If any given file is compressed, its decompressed content is
-used. If a given file does not exist, and its name does not end with one
-of the known extensions, zcat tries the compressed file names
-corresponding to the supported formats.
+zcat copies each given file to standard output. If any given file is
+compressed, its decompressed content is used. If a given file does not
+exist, and its name does not end with one of the known extensions, zcat
+tries the compressed file names corresponding to the supported formats.
 
-If no files are specified, data is read from standard input,
-decompressed if needed, and sent to standard output. Data read from
-standard input must be of the same type; all uncompressed or all in the
-same compression format.
+If no files are specified, or if a file is specified as @samp{-}, data
+is read from standard input, decompressed if needed, and sent to
+standard output. Data read from standard input must be of the same type;
+all uncompressed or all in the same compression format.
 
 The format for running zcat is:
 
@@ -378,7 +378,7 @@ without verifying its format, and the exact file names of both
 @itemx -s
 @itemx --quiet
 @itemx --silent
-Do not print anything; only return an exit status indicating whether the
+Don't print anything; only return an exit status indicating whether the
 files differ.
 
 @end table
@@ -510,10 +510,10 @@ does not exist, and its name does not end with one of the known
 extensions, zgrep tries the compressed file names corresponding to the
 supported formats.
 
-If no files are specified, data is read from standard input,
-decompressed if needed, and fed to grep. Data read from standard input
-must be of the same type; all uncompressed or all in the same
-compression format.
+If no files are specified, or if a file is specified as @samp{-}, data
+is read from standard input, decompressed if needed, and fed to grep.
+Data read from standard input must be of the same type; all uncompressed
+or all in the same compression format.
 
 The format for running zgrep is:
 
@@ -562,7 +562,11 @@ Treat @var{pattern} as an extended regular expression.
 
 @item -f @var{file}
 @itemx --file=@var{file}
-Obtain patterns from @var{file}, one per line.
+Obtain patterns from @var{file}, one per line.@*
+When searching in several files at once, command substitution can be
+used with @code{-e} to read @var{file} only once, for example if
+@var{file} is not a regular file:
+@w{@code{zgrep -e "$(cat @var{file})" file1.lz file2.gz}}
 
 @item -F
 @itemx --fixed-strings
@@ -648,9 +652,10 @@ Match only whole lines.
 @cindex ztest
 
 ztest verifies the integrity of the specified compressed files.
-Uncompressed files are ignored. If no files are specified, the integrity
-of compressed data read from standard input is verified. Data read from
-standard input must be all in the same compression format.
+Uncompressed files are ignored. If no files are specified, or if a file
+is specified as @samp{-}, the integrity of compressed data read from
+standard input is verified. Data read from standard input must be all in
+the same compression format.
 
 Note that some xz files lack integrity information, and therefore can't
 be verified as reliably as the other formats can.
@@ -700,7 +705,7 @@ Further -v's increase the verbosity level.
 @cindex zupdate
 
 zupdate recompresses files from bzip2, gzip, and xz formats to lzip
-format. The originals are compared with the new files and then deleted.
+format. Each original is compared with the new file and then deleted.
 Only regular files with standard file name extensions are recompressed,
 other files are ignored. Compressed files are decompressed and then
 recompressed on the fly; no temporary files are created. The lzip format
@@ -745,7 +750,7 @@ zupdate supports the following options:
 @table @code
 @item -f
 @itemx --force
-Do not skip a file for which a lzip compressed version already exists.
+Don't skip a file for which a lzip compressed version already exists.
 @samp{--force} compares the content of the input file with the content
 of the existing lzip file and deletes the input file if both contents
 are identical.