Merging upstream version 0.3.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
bcca16d621
commit
7777e97ea4
11 changed files with 181 additions and 270 deletions
22
doc/zcat.1
22
doc/zcat.1
|
@ -1,7 +1,7 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
|
||||
.TH ZCAT "1" "August 2009" "Zcat 0.2" "User Commands"
|
||||
.TH ZCAT "1" "August 2009" "Zcat 0.3" "User Commands"
|
||||
.SH NAME
|
||||
Zcat \- manual page for Zcat 0.2
|
||||
Zcat \- manual page for Zcat 0.3
|
||||
.SH SYNOPSIS
|
||||
.B zcat
|
||||
[\fIOPTIONS\fR] [\fICAT_OPTIONS\fR] [\fIFILES\fR]
|
||||
|
@ -12,7 +12,7 @@ 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.
|
||||
compressed file names corresponding to the supported compressors.
|
||||
The supported compressors are gzip, bzip2, lzip and xz.
|
||||
.PP
|
||||
CAT_OPTIONS are passed directly to cat.
|
||||
|
@ -24,21 +24,9 @@ display this help and exit
|
|||
.TP
|
||||
\fB\-V\fR, \fB\-\-version\fR
|
||||
output version information and exit
|
||||
.TP
|
||||
\fB\-\-gzip\fR
|
||||
use gzip as default decompressor
|
||||
.TP
|
||||
\fB\-\-bzip2\fR
|
||||
use bzip2 as default decompressor
|
||||
.TP
|
||||
\fB\-\-lzip\fR
|
||||
use lzip as default decompressor (default)
|
||||
.TP
|
||||
\fB\-\-xz\fR
|
||||
use xz as default decompressor
|
||||
.SH "REPORTING BUGS"
|
||||
Report bugs to lzip\-bug@nongnu.org
|
||||
Lzip home page: http://www.nongnu.org/lzip/lzip.html
|
||||
Report bugs to zutils\-bug@nongnu.org
|
||||
Zutils home page: http://www.nongnu.org/zutils/zutils.html
|
||||
.SH COPYRIGHT
|
||||
Copyright \(co 2009 Antonio Diaz Diaz.
|
||||
This script is free software: you have unlimited permission
|
||||
|
|
29
doc/zdiff.1
29
doc/zdiff.1
|
@ -1,7 +1,7 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
|
||||
.TH ZDIFF "1" "August 2009" "Zdiff 0.2" "User Commands"
|
||||
.TH ZDIFF "1" "August 2009" "Zdiff 0.3" "User Commands"
|
||||
.SH NAME
|
||||
Zdiff \- manual page for Zdiff 0.2
|
||||
Zdiff \- manual page for Zdiff 0.3
|
||||
.SH SYNOPSIS
|
||||
.B zdiff
|
||||
[\fIOPTIONS\fR] [\fIDIFF_OPTIONS\fR] \fIFILE1 \fR[\fIFILE2\fR]
|
||||
|
@ -15,9 +15,12 @@ content is used. The supported compressors are gzip, bzip2, lzip and xz.
|
|||
.PP
|
||||
Zcmp is a shortcut for "zdiff \fB\-\-cmp\fR"
|
||||
.PP
|
||||
Compares FILE1 to FILE2. If FILE2 is omitted, compares FILE1 to the
|
||||
uncompressed contents of FILE1.[gz|bz2|lz] (depending on the default
|
||||
compressor selected). DIFF_OPTIONS are passed directly to diff or cmp.
|
||||
Compares FILE1 to FILE2. If FILE2 is omitted and FILE1 is compressed,
|
||||
compares FILE1 to the file with the corresponding decompressed file
|
||||
name (removes the extension from FILE1). If FILE2 is omitted and FILE1
|
||||
is not compressed, compares FILE1 to the uncompressed contents of
|
||||
FILE1.[gz|bz2|lz|xz] (the first one that is found).
|
||||
DIFF_OPTIONS are passed directly to diff or cmp.
|
||||
The exit status from diff or cmp is preserved.
|
||||
.SH OPTIONS
|
||||
.TP
|
||||
|
@ -27,26 +30,14 @@ display this help and exit
|
|||
\fB\-V\fR, \fB\-\-version\fR
|
||||
output version information and exit
|
||||
.TP
|
||||
\fB\-\-gzip\fR
|
||||
use gzip as default decompressor
|
||||
.TP
|
||||
\fB\-\-bzip2\fR
|
||||
use bzip2 as default decompressor
|
||||
.TP
|
||||
\fB\-\-lzip\fR
|
||||
use lzip as default decompressor (default)
|
||||
.TP
|
||||
\fB\-\-xz\fR
|
||||
use xz as default decompressor
|
||||
.TP
|
||||
\fB\-\-diff\fR
|
||||
use diff to compare files (default)
|
||||
.TP
|
||||
\fB\-\-cmp\fR
|
||||
use cmp to compare files
|
||||
.SH "REPORTING BUGS"
|
||||
Report bugs to lzip\-bug@nongnu.org
|
||||
Lzip home page: http://www.nongnu.org/lzip/lzip.html
|
||||
Report bugs to zutils\-bug@nongnu.org
|
||||
Zutils home page: http://www.nongnu.org/zutils/zutils.html
|
||||
.SH COPYRIGHT
|
||||
Copyright \(co 2009 Antonio Diaz Diaz.
|
||||
This script is free software: you have unlimited permission
|
||||
|
|
24
doc/zgrep.1
24
doc/zgrep.1
|
@ -1,7 +1,7 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
|
||||
.TH ZGREP "1" "August 2009" "Zgrep 0.2" "User Commands"
|
||||
.TH ZGREP "1" "August 2009" "Zgrep 0.3" "User Commands"
|
||||
.SH NAME
|
||||
Zgrep \- manual page for Zgrep 0.2
|
||||
Zgrep \- manual page for Zgrep 0.3
|
||||
.SH SYNOPSIS
|
||||
.B zgrep
|
||||
[\fIOPTIONS\fR] [\fIGREP_OPTIONS\fR] \fIPATTERN \fR[\fIFILES\fR]
|
||||
|
@ -12,8 +12,8 @@ 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
|
||||
compressors are gzip, bzip2, lzip and xz.
|
||||
names corresponding to the supported compressors.
|
||||
The supported compressors are gzip, bzip2, lzip and xz.
|
||||
.PP
|
||||
GREP_OPTIONS are passed directly to grep.
|
||||
The exit status from grep is preserved.
|
||||
|
@ -24,21 +24,9 @@ display this help and exit
|
|||
.TP
|
||||
\fB\-V\fR, \fB\-\-version\fR
|
||||
output version information and exit
|
||||
.TP
|
||||
\fB\-\-gzip\fR
|
||||
use gzip as default decompressor
|
||||
.TP
|
||||
\fB\-\-bzip2\fR
|
||||
use bzip2 as default decompressor
|
||||
.TP
|
||||
\fB\-\-lzip\fR
|
||||
use lzip as default decompressor (default)
|
||||
.TP
|
||||
\fB\-\-xz\fR
|
||||
use xz as default decompressor
|
||||
.SH "REPORTING BUGS"
|
||||
Report bugs to lzip\-bug@nongnu.org
|
||||
Lzip home page: http://www.nongnu.org/lzip/lzip.html
|
||||
Report bugs to zutils\-bug@nongnu.org
|
||||
Zutils home page: http://www.nongnu.org/zutils/zutils.html
|
||||
.SH COPYRIGHT
|
||||
Copyright \(co 2009 Antonio Diaz Diaz.
|
||||
This script is free software: you have unlimited permission
|
||||
|
|
BIN
doc/zutils.info
BIN
doc/zutils.info
Binary file not shown.
|
@ -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}}.
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue