Merging upstream version 1.12~pre2.

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

1 files changed, 86 insertions, 32 deletions

diff --git a/doc/zutils.info b/doc/zutils.info
index a75b183..9a9ca05 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.11, 25 January 2022).
+This manual is for Zutils (version 1.12-pre2, 12 April 2022).
 
 * Menu:
 
@@ -69,10 +69,9 @@ of formats in recursive mode and when trying compressed file names. For
 example, use the following command to search for the string 'foo' in gzip
 and lzip files only: 'zgrep foo -r --format=gz,lz somedir somefile.tar'.
 
-   FORMAT NOTE 2: If the option '--force-format' is given, the files are
-passed to the corresponding decompressor without verifying their format,
-allowing for example the processing of compress'd (.Z) files with gzip:
-'zcmp --force-format=gz file.Z file.lz'.
+   FORMAT NOTE 2: The standard POSIX compress format (.Z) is obsolete and is
+only supported through gzip. For this to work, the gzip program used (for
+example GNU gzip) must be able to decompress .Z files.
 
    LANGUAGE NOTE: Uncompressed = not compressed = plain data; it may never
 have been compressed. Decompressed is used to refer to data which have
@@ -131,7 +130,7 @@ here. *Note Argument syntax: (arg_parser)Argument syntax.
      extensions:
 
      bz2   enables   .bz2 .tbz .tbz2
-     gz    enables   .gz .tgz
+     gz    enables   .gz .tgz .Z
      lz    enables   .lz .tlz
      xz    enables   .xz .txz
      zst   enables   .zst .tzst
@@ -468,6 +467,15 @@ program used supports them):
 '--ignore-all-space'
      Ignore all white space.
 
+'-W COLUMNS'
+'--width=COLUMNS'
+     Output at most the specified number of print columns per line in side
+     by side format.
+
+'-y'
+'--side-by-side'
+     Use the side by side output format.
+
 
 
 File: zutils.info,  Node: Zgrep,  Next: Ztest,  Prev: Zdiff,  Up: Top
@@ -496,8 +504,9 @@ directory, and nonrecursive searches read standard input.
 An exit status of 0 means at least one match was found, 1 means no matches
 were found, and 2 means trouble.
 
-   zgrep supports the following options (some options only work if the grep
-program used supports them):
+   zgrep supports the following options (Some options only work if the grep
+program used supports them. Options -h, -H, -r, -R, and -Z are managed by
+zgrep and not passed to grep):
 
 '-a'
 '--text'
@@ -532,7 +541,7 @@ program used supports them):
 
 '-E'
 '--extended-regexp'
-     Treat PATTERN as an extended regular expression.
+     Interpret PATTERN as an extended regular expression (ERE).
 
 '-f FILE'
 '--file=FILE'
@@ -543,7 +552,12 @@ program used supports them):
 
 '-F'
 '--fixed-strings'
-     Treat PATTERN as a set of newline-separated strings.
+     Interpret PATTERN as a set of newline-separated strings.
+
+'-G'
+'--basic-regexp'
+     Interpret PATTERN as a basic regular expression (BRE). This is the
+     default.
 
 '-h'
 '--no-filename'
@@ -573,6 +587,13 @@ program used supports them):
      of a wrong change in the exit status of grep, which was reverted in
      GNU grep 3.5.
 
+'--label=LABEL'
+     Display input actually coming from standard input as input coming from
+     file LABEL.
+
+'--line-buffered'
+     Use line buffering on output. This may cause a performance penalty.
+
 '-m N'
 '--max-count=N'
      Stop after N matches.
@@ -593,8 +614,13 @@ program used supports them):
      format, and the exact file name must be given. Other names won't be
      tried.
 
+'-P'
+'--perl-regexp'
+     Interpret PATTERN as a Perl-compatible regular expression (PCRE).
+
 '-q'
 '--quiet'
+'--silent'
      Suppress all messages. Exit immediately with zero status if any match
      is found, even if an error was detected.
 
@@ -613,6 +639,16 @@ program used supports them):
 '--no-messages'
      Suppress error messages about nonexistent or unreadable files.
 
+'-T'
+'--initial-tab'
+     Make sure that the first character of actual line content lies on a tab
+     stop, so that the alignment of tabs looks normal.
+
+'-U'
+'--binary'
+     Use binary I/O on platforms affected by the bug known as "text mode
+     I/O". (MS-DOS, MS-Windows, OS/2).
+
 '-v'
 '--invert-match'
      Select non-matching lines.
@@ -629,6 +665,14 @@ program used supports them):
 '--line-regexp'
      Match only whole lines.
 
+'-Z'
+'--null'
+     Output a zero byte (the ASCII NUL character) instead of the character
+     that normally follows a file name. For example, 'zgrep -lZ' outputs a
+     zero byte after each file name instead of the usual newline. This
+     option makes the output unambiguous, even in the presence of file
+     names containing unusual characters like newlines.
+
 
 
 File: zutils.info,  Node: Ztest,  Next: Zupdate,  Prev: Zgrep,  Up: Top
@@ -675,9 +719,7 @@ compressed file is corrupt or invalid.
      'gz', 'lz', 'xz', and 'zst'. If this option is used, the files are
      passed to the corresponding decompressor without verifying their
      format, and any files in a format that the decompressor can't
-     understand will fail. For example, '--force-format=gz' can test
-     gzipped (.gz) and compress'd (.Z) files if the compressor used is GNU
-     gzip.
+     understand will fail.
 
 '-q'
 '--quiet'
@@ -735,7 +777,7 @@ pair of files in a multiformat set of files.
 
    The names of the original files must have one of the following
 extensions:
-'.bz2', '.gz', '.xz', or '.zst', which are recompressed to '.lz';
+'.bz2', '.gz', '.xz', '.zst', or '.Z', which are recompressed to '.lz';
 '.tbz', '.tbz2', '.tgz', '.txz', or '.tzst', which are recompressed to
 '.tlz'.
 Keeping the combined extensions ('.tgz' -> '.tlz') may be useful when
@@ -745,21 +787,29 @@ recompressing Slackware packages, for example.
 If the decompressor for the xz or zstd formats is not found, the
 corresponding files are ignored.
 
-   Recompressing a file is much like copying or moving it; therefore zupdate
-preserves the access and modification dates, permissions, and, when
-possible, ownership of the file just as 'cp -p' does. (If the user ID or
-the group ID can't be duplicated, the file permission bits S_ISUID and
-S_ISGID are cleared).
+   Recompressing a file is much like copying or moving it. Therefore zupdate
+preserves the access and modification dates, permissions, and, if you have
+appropriate privileges, ownership of the file just as 'cp -p' does. (If the
+user ID or the group ID can't be duplicated, the file permission bits
+S_ISUID and S_ISGID are cleared).
 
    The format for running zupdate is:
 
      zupdate [OPTIONS] [FILES]
 
 Exit status is 0 if all the compressed files were successfully recompressed
-(if needed), compared, and deleted (if requested). Non-zero otherwise.
+(if needed), compared, and deleted (if requested). 1 if a non-fatal error
+occurred (file not found or not regular, or has invalid format, or can't be
+deleted). 2 if a fatal error occurred (compressor can't be run, or
+comparison fails).
 
    zupdate supports the following options:
 
+'-e'
+'--expand-extensions'
+     Expand combined file name extensions; recompress '.tbz', '.tbz2',
+     '.tgz', '.txz', and '.tzst' to 'tar.lz'.
+
 '-f'
 '--force'
      Don't skip a file for which a lzip compressed version already exists.
@@ -767,6 +817,10 @@ Exit status is 0 if all the compressed files were successfully recompressed
      the existing lzip file and deletes the input file if both contents are
      identical.
 
+'-i'
+'--ignore-errors'
+     Ignore non-fatal errors. (See exit status above).
+
 '-k'
 '--keep'
      Keep (don't delete) the input file after comparing it with the lzip
@@ -845,18 +899,18 @@ Concept index
 
 Tag Table:
 Node: Top217
-Node: Introduction1147
-Node: Common options3947
-Ref: compressor-requirements6181
-Node: The zutilsrc file6576
-Node: Zcat7544
-Node: Zcmp10119
-Node: Zdiff12620
-Node: Zgrep15478
-Node: Ztest19819
-Node: Zupdate22513
-Node: Problems26607
-Node: Concept index27141
+Node: Introduction1150
+Node: Common options3897
+Ref: compressor-requirements6134
+Node: The zutilsrc file6529
+Node: Zcat7497
+Node: Zcmp10072
+Node: Zdiff12573
+Node: Zgrep15623
+Node: Ztest21115
+Node: Zupdate23681
+Node: Problems28191
+Node: Concept index28725
 
 End Tag Table