Merging upstream version 1.10.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 67 insertions, 59 deletions

diff --git a/doc/zcat.1 b/doc/zcat.1
index 29966ad..fbaf821 100644
--- a/doc/zcat.1
+++ b/doc/zcat.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
-.TH ZCAT "1" "June 2020" "zcat (zutils) 1.9" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
+.TH ZCAT "1" "January 2021" "zutils 1.10" "User Commands"
 .SH NAME
 zcat \- decompress and concatenate files to standard output
 .SH SYNOPSIS
@@ -96,7 +96,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2020 Antonio Diaz Diaz.
+Copyright \(co 2021 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 b11d79b..5ae5231 100644
--- a/doc/zcmp.1
+++ b/doc/zcmp.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
-.TH ZCMP "1" "June 2020" "zcmp (zutils) 1.9" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
+.TH ZCMP "1" "January 2021" "zutils 1.10" "User Commands"
 .SH NAME
 zcmp \- decompress and compare two files byte by byte
 .SH SYNOPSIS
@@ -83,7 +83,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2020 Antonio Diaz Diaz.
+Copyright \(co 2021 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 7d8d387..65a34b7 100644
--- a/doc/zdiff.1
+++ b/doc/zdiff.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
-.TH ZDIFF "1" "June 2020" "zdiff (zutils) 1.9" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
+.TH ZDIFF "1" "January 2021" "zutils 1.10" "User Commands"
 .SH NAME
 zdiff \- decompress and compare two files line by line
 .SH SYNOPSIS
@@ -114,7 +114,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2020 Antonio Diaz Diaz.
+Copyright \(co 2021 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 545aea2..69ed0cd 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" "June 2020" "zgrep (zutils) 1.9" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
+.TH ZGREP "1" "January 2021" "zutils 1.10" "User Commands"
 .SH NAME
 zgrep \- search compressed files for a regular expression
 .SH SYNOPSIS
@@ -146,7 +146,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2020 Antonio Diaz Diaz.
+Copyright \(co 2021 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 431e40c..45cda27 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" "June 2020" "ztest (zutils) 1.9" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
+.TH ZTEST "1" "January 2021" "zutils 1.10" "User Commands"
 .SH NAME
 ztest \- verify the integrity of compressed files
 .SH SYNOPSIS
@@ -75,7 +75,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2020 Antonio Diaz Diaz.
+Copyright \(co 2021 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 afa65d3..dcd3d24 100644
--- a/doc/zupdate.1
+++ b/doc/zupdate.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
-.TH ZUPDATE "1" "June 2020" "zupdate (zutils) 1.9" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
+.TH ZUPDATE "1" "January 2021" "zutils 1.10" "User Commands"
 .SH NAME
 zupdate \- recompress bzip2, gzip, xz files to lzip format
 .SH SYNOPSIS
@@ -25,8 +25,8 @@ to be safe and not cause any data loss. Therefore, existing lzip
 compressed files are never overwritten nor deleted.
 .PP
 The names of the original files must have one of the following extensions:
-\&'.bz2', '.gz', and '.xz' are recompressed to '.lz'.
-\&'.tbz', '.tbz2', '.tgz', and '.txz' are recompressed to '.tlz'.
+\&'.bz2', '.gz', or '.xz', which are recompressed to '.lz';
+\&'.tbz', '.tbz2', '.tgz', or '.txz', which are recompressed to '.tlz'.
 .PP
 Exit status is 0 if all the compressed files were successfully recompressed
 (if needed), compared, and deleted (if requested). Non\-zero otherwise.
@@ -84,7 +84,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2020 Antonio Diaz Diaz.
+Copyright \(co 2021 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 2de6d3b..854100f 100644
--- a/doc/zutils.info
+++ b/doc/zutils.info
@@ -11,7 +11,7 @@ File: zutils.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Zutils Manual
 *************
 
-This manual is for Zutils (version 1.9, 27 June 2020).
+This manual is for Zutils (version 1.10, 5 January 2021).
 
 * Menu:
 
@@ -28,7 +28,7 @@ This manual is for Zutils (version 1.9, 27 June 2020).
 * Concept index::       Index of concepts
 
 
-   Copyright (C) 2009-2020 Antonio Diaz Diaz.
+   Copyright (C) 2009-2021 Antonio Diaz Diaz.
 
    This manual is free documentation: you have unlimited permission to copy,
 distribute, and modify it.
@@ -162,16 +162,15 @@ here. *Note Argument syntax: (arg_parser)Argument syntax.
 
 File: zutils.info,  Node: The zutilsrc file,  Next: Zcat,  Prev: Common options,  Up: Top
 
-3 The zutilsrc file
-*******************
+3 The zutils configuration file 'zutilsrc'
+******************************************
 
 '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 don't need to install it in order to run
-zutils.
+define the compressor name and options to be used for each format.
+'zutilsrc' is optional; you don't need to install it in order to run zutils.
 
    The compressors specified in the command line override those specified
-in the 'zutilsrc' file.
+in 'zutilsrc'.
 
    You may copy the system 'zutilsrc' file '${sysconfdir}/zutilsrc' to
 '$HOME/.zutilsrc' and customize these options as you like. The file syntax
@@ -557,6 +556,10 @@ program used supports them):
 '-L'
 '--files-without-match'
      Only print names of files not containing any matches.
+     Note: option -L fails (prints wrong results, returns wrong status, and
+     even hangs) when using GNU grep versions 3.2 to 3.4 inclusive because
+     of a wrong change in the exit status of grep, which was reverted in
+     GNU grep 3.5.
 
 '-m N'
 '--max-count=N'
@@ -709,8 +712,8 @@ pair of files in a multiformat set of files.
 
    The names of the original files must have one of the following
 extensions:
-'.bz2', '.gz', and '.xz' are recompressed to '.lz'.
-'.tbz', '.tbz2', '.tgz', and '.txz' are recompressed to '.tlz'.
+'.bz2', '.gz', or '.xz', which are recompressed to '.lz';
+'.tbz', '.tbz2', '.tgz', or '.txz', which are recompressed to '.tlz'.
 Keeping the combined extensions ('.tgz' -> '.tlz') may be useful when
 recompressing Slackware packages, for example.
 
@@ -802,30 +805,30 @@ Concept index
 * common options:                        Common options.            (line 6)
 * getting help:                          Problems.                  (line 6)
 * introduction:                          Introduction.              (line 6)
-* the zutilsrc file:                     The zutilsrc file.         (line 6)
 * zcat:                                  Zcat.                      (line 6)
 * zcmp:                                  Zcmp.                      (line 6)
 * zdiff:                                 Zdiff.                     (line 6)
 * zgrep:                                 Zgrep.                     (line 6)
 * ztest:                                 Ztest.                     (line 6)
 * zupdate:                               Zupdate.                   (line 6)
+* zutilsrc:                              The zutilsrc file.         (line 6)
 
 
 
 Tag Table:
 Node: Top222
-Node: Introduction1148
-Node: Common options3773
-Ref: compressor-requirements5844
-Node: The zutilsrc file6216
-Node: Zcat7149
-Node: Zcmp9712
-Node: Zdiff12202
-Node: Zgrep14942
-Node: Ztest18944
-Node: Zupdate21451
-Node: Problems25123
-Node: Concept index25657
+Node: Introduction1151
+Node: Common options3776
+Ref: compressor-requirements5847
+Node: The zutilsrc file6219
+Node: Zcat7180
+Node: Zcmp9743
+Node: Zdiff12233
+Node: Zgrep14973
+Node: Ztest19218
+Node: Zupdate21725
+Node: Problems25409
+Node: Concept index25943
 
 End Tag Table
 
diff --git a/doc/zutils.texi b/doc/zutils.texi
index bb1c3b1..c494185 100644
--- a/doc/zutils.texi
+++ b/doc/zutils.texi
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 27 June 2020
-@set VERSION 1.9
+@set UPDATED 5 January 2021
+@set VERSION 1.10
 
 @dircategory Data Compression
 @direntry
@@ -29,6 +29,7 @@
 @contents
 @end ifnothtml
 
+@ifnottex
 @node Top
 @top
 
@@ -49,10 +50,11 @@ This manual is for Zutils (version @value{VERSION}, @value{UPDATED}).
 @end menu
 
 @sp 1
-Copyright @copyright{} 2009-2020 Antonio Diaz Diaz.
+Copyright @copyright{} 2009-2021 Antonio Diaz Diaz.
 
 This manual is free documentation: you have unlimited permission to copy,
 distribute, and modify it.
+@end ifnottex
 
 
 @node Introduction
@@ -194,21 +196,20 @@ It must return 0 if no errors occurred, and a non-zero value otherwise.
 
 
 @node The zutilsrc file
-@chapter The zutilsrc file
-@cindex the zutilsrc file
+@chapter The zutils configuration file 'zutilsrc'
+@cindex zutilsrc
 
 @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 don't need to install it in
-order to run zutils.
+@file{zutilsrc} is optional; you don't need to install it in order to run
+zutils.
 
 The compressors specified in the command line override those specified
-in the @file{zutilsrc} file.
+in @file{zutilsrc}.
 
-You may copy the system @file{zutilsrc} file
-@file{$@{sysconfdir@}/zutilsrc} to @file{$HOME/.zutilsrc} and customize
-these options as you like. The file syntax is fairly obvious (and there
-are further instructions in it):
+You may copy the system @file{zutilsrc} file @file{$@{sysconfdir@}/zutilsrc}
+to @file{$HOME/.zutilsrc} and customize these options as you like. The file
+syntax is fairly obvious (and there are further instructions in it):
 
 @enumerate
 @item
@@ -623,7 +624,10 @@ Only print names of files containing at least one match.
 
 @item -L
 @itemx --files-without-match
-Only print names of files not containing any matches.
+Only print names of files not containing any matches.@*
+Note: option -L fails (prints wrong results, returns wrong status, and even
+hangs) when using GNU grep versions 3.2 to 3.4 inclusive because of a wrong
+change in the exit status of grep, which was reverted in GNU grep 3.5.
 
 @item -m @var{n}
 @itemx --max-count=@var{n}
@@ -783,9 +787,10 @@ Combining the options @samp{--force} and @samp{--keep}, as in
 between each pair of files in a multiformat set of files.
 
 The names of the original files must have one of the following extensions:@*
-@samp{.bz2}, @samp{.gz}, and @samp{.xz} are recompressed to @samp{.lz}.@*
-@samp{.tbz}, @samp{.tbz2}, @samp{.tgz}, and @samp{.txz} are recompressed to
-@samp{.tlz}.@*
+@samp{.bz2}, @samp{.gz}, or @samp{.xz}, which are recompressed to
+@samp{.lz};@*
+@samp{.tbz}, @samp{.tbz2}, @samp{.tgz}, or @samp{.txz}, which are
+recompressed to @samp{.tlz}.@*
 Keeping the combined extensions (@samp{.tgz} --> @samp{.tlz}) may be useful
 when recompressing Slackware packages, for example.