summaryrefslogtreecommitdiffstats
path: root/doc/zutils.texinfo
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 16:10:22 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 16:10:22 +0000
commitd0dfe799cbd65ce2e4d467f793ad1a0bf4cf4a16 (patch)
treef6ad8f3c9639fb3a8688d51239d0ccdabe33520a /doc/zutils.texinfo
parentAdding debian version 0.2-1. (diff)
downloadzutils-d0dfe799cbd65ce2e4d467f793ad1a0bf4cf4a16.tar.xz
zutils-d0dfe799cbd65ce2e4d467f793ad1a0bf4cf4a16.zip
Merging upstream version 0.3.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'doc/zutils.texinfo')
-rw-r--r--doc/zutils.texinfo59
1 files changed, 13 insertions, 46 deletions
diff --git a/doc/zutils.texinfo b/doc/zutils.texinfo
index 6367629..ce69ab1 100644
--- a/doc/zutils.texinfo
+++ b/doc/zutils.texinfo
@@ -65,9 +65,9 @@ The currently provided utilities are zcat, zcmp, zdiff and zgrep.
Zcat is a wrapper script around the cat command that allows transparent
concatenation of any combination of compressed and non-compressed files.
If any given file is compressed, its uncompressed content is used. If a
-given file does not exist, zcat tries the compressed file name
-corresponding to the default compressor selected. The supported
-compressors are gzip, bzip2, lzip and xz.
+given file does not exist, zcat tries the compressed file names
+corresponding to the supported compressors. The supported compressors
+are gzip, bzip2, lzip and xz.
The format for running zcat is:
@@ -90,18 +90,6 @@ Print an informative help message describing the options and exit.
@itemx -V
Print the version number of zcat on the standard output and exit.
-@item --gzip
-Use gzip as default decompressor.
-
-@item --bzip2
-Use bzip2 as default decompressor.
-
-@item --lzip
-Use lzip as default decompressor (default).
-
-@item --xz
-Use xz as default decompressor.
-
@end table
@@ -125,11 +113,14 @@ zdiff [@var{options}] [@var{diff_options}] @var{file1} [@var{file2}]
@end example
@noindent
-Compares @var{file1} to @var{file2}. If @var{file2} is omitted, compares
-@var{file1} to the uncompressed contents of @var{file1}.[gz|bz2|lz]
-(depending on the default compressor selected). @var{diff_options} are
-passed directly to diff or cmp. The exit status from diff or cmp is
-preserved.
+Compares @var{file1} to @var{file2}. If @var{file2} is omitted and
+@var{file1} is compressed, compares @var{file1} to the file with the
+corresponding decompressed file name (removes the extension from
+@var{file1}). If @var{file2} is omitted and @var{file1} is not
+compressed, compares @var{file1} to the uncompressed contents of
+@var{file1}.[gz|bz2|lz|xz] (the first one that is found).
+@var{diff_options} are passed directly to diff or cmp. The exit status
+from diff or cmp is preserved.
Zdiff supports the following options:
@@ -142,18 +133,6 @@ Print an informative help message describing the options and exit.
@itemx -V
Print the version number of zdiff on the standard output and exit.
-@item --gzip
-Use gzip as default decompressor.
-
-@item --bzip2
-Use bzip2 as default decompressor.
-
-@item --lzip
-Use lzip as default decompressor (default).
-
-@item --xz
-Use xz as default decompressor.
-
@item --diff
Use diff to compare files (default).
@@ -174,7 +153,7 @@ Zgrep is a wrapper script around the grep command that allows
transparent search on any combination of compressed and non-compressed
files. If any given file is compressed, its uncompressed content is
used. If a given file does not exist, zgrep tries the compressed file
-name corresponding to the default compressor selected. The supported
+names corresponding to the supported compressors. The supported
compressors are gzip, bzip2, lzip and xz.
The format for running zgrep is:
@@ -198,18 +177,6 @@ Print an informative help message describing the options and exit.
@itemx -V
Print the version number of zgrep on the standard output and exit.
-@item --gzip
-Use gzip as default decompressor.
-
-@item --bzip2
-Use bzip2 as default decompressor.
-
-@item --lzip
-Use lzip as default decompressor (default).
-
-@item --xz
-Use xz as default decompressor.
-
@end table
@@ -224,7 +191,7 @@ you don't, no one will ever know about them and they will remain unfixed
for all eternity, if not longer.
If you find a bug in zutils, please send electronic mail to
-@email{lzip-bug@@nongnu.org}. Include the version number, which you can
+@email{zutils-bug@@nongnu.org}. Include the version number, which you can
find by running @w{@samp{zdiff --version}}.