From 1d1dc8b97e1cc23b97c1a8053020ce61a0cd1e84 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 17:11:40 +0100 Subject: Merging upstream version 0.5. Signed-off-by: Daniel Baumann --- doc/zcat.1 | 28 +++++++++++++++++++++------- doc/zdiff.1 | 4 ++-- doc/zgrep.1 | 20 +++++++++++++++++--- doc/zutils.1 | 4 ++-- doc/zutils.info | Bin 5792 -> 6266 bytes doc/zutils.texinfo | 40 +++++++++++++++++++++++++++++++++------- 6 files changed, 75 insertions(+), 21 deletions(-) (limited to 'doc') diff --git a/doc/zcat.1 b/doc/zcat.1 index a4d82db..10737a2 100644 --- a/doc/zcat.1 +++ b/doc/zcat.1 @@ -1,18 +1,20 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH ZCAT "1" "September 2009" "Zcat 0.4" "User Commands" +.TH ZCAT "1" "October 2009" "Zcat 0.5" "User Commands" .SH NAME -Zcat \- manual page for Zcat 0.4 +Zcat \- manual page for Zcat 0.5 .SH SYNOPSIS .B zcat [\fIOPTIONS\fR] [\fICAT_OPTIONS\fR] [\fIFILES\fR] .SH DESCRIPTION Zcat \- Cat wrapper for compressed files. .PP -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 names corresponding to the supported compressors. +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 names +corresponding to the supported compressors. If no files are specified, +the standard input is decompressed using the selected compressor and +sent to stdout. The supported compressors are gzip, bzip2, lzip and xz. .PP CAT_OPTIONS are passed directly to cat. @@ -24,6 +26,18 @@ display this help and exit .TP \fB\-V\fR, \fB\-\-version\fR output version information and exit +.TP +\fB\-\-gzip\fR +use gzip as decompressor for stdin (default) +.TP +\fB\-\-bzip2\fR +use bzip2 as decompressor for stdin +.TP +\fB\-\-lzip\fR +use lzip as decompressor for stdin +.TP +\fB\-\-xz\fR +use xz as decompressor for stdin .SH "REPORTING BUGS" Report bugs to zutils\-bug@nongnu.org Zutils home page: http://www.nongnu.org/zutils/zutils.html diff --git a/doc/zdiff.1 b/doc/zdiff.1 index cbada53..3509c21 100644 --- a/doc/zdiff.1 +++ b/doc/zdiff.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH ZDIFF "1" "September 2009" "Zdiff 0.4" "User Commands" +.TH ZDIFF "1" "October 2009" "Zdiff 0.5" "User Commands" .SH NAME -Zdiff \- manual page for Zdiff 0.4 +Zdiff \- manual page for Zdiff 0.5 .SH SYNOPSIS .B zdiff [\fIOPTIONS\fR] [\fIDIFF_OPTIONS\fR] \fIFILE1 \fR[\fIFILE2\fR] diff --git a/doc/zgrep.1 b/doc/zgrep.1 index fadbbc0..3db747b 100644 --- a/doc/zgrep.1 +++ b/doc/zgrep.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH ZGREP "1" "September 2009" "Zgrep 0.4" "User Commands" +.TH ZGREP "1" "October 2009" "Zgrep 0.5" "User Commands" .SH NAME -Zgrep \- manual page for Zgrep 0.4 +Zgrep \- manual page for Zgrep 0.5 .SH SYNOPSIS .B zgrep [\fIOPTIONS\fR] [\fIGREP_OPTIONS\fR] \fIPATTERN \fR[\fIFILES\fR] @@ -12,7 +12,9 @@ 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 -names corresponding to the supported compressors. +names corresponding to the supported compressors. If no files are +specified, the standard input is decompressed using the selected +compressor and fed to grep. The supported compressors are gzip, bzip2, lzip and xz. .PP Zegrep is a shortcut for "zgrep \fB\-E\fR" @@ -27,6 +29,18 @@ display this help and exit .TP \fB\-V\fR, \fB\-\-version\fR output version information and exit +.TP +\fB\-\-gzip\fR +use gzip as decompressor for stdin (default) +.TP +\fB\-\-bzip2\fR +use bzip2 as decompressor for stdin +.TP +\fB\-\-lzip\fR +use lzip as decompressor for stdin +.TP +\fB\-\-xz\fR +use xz as decompressor for stdin .SH "REPORTING BUGS" Report bugs to zutils\-bug@nongnu.org Zutils home page: http://www.nongnu.org/zutils/zutils.html diff --git a/doc/zutils.1 b/doc/zutils.1 index 14c33b7..4836ace 100644 --- a/doc/zutils.1 +++ b/doc/zutils.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH ZUTILS "1" "September 2009" "Zutils 0.4" "User Commands" +.TH ZUTILS "1" "October 2009" "Zutils 0.5" "User Commands" .SH NAME -Zutils \- manual page for Zutils 0.4 +Zutils \- manual page for Zutils 0.5 .SH SYNOPSIS .B zutils [\fIoptions\fR] [\fIfiles\fR] diff --git a/doc/zutils.info b/doc/zutils.info index caa2371..e2d3258 100644 Binary files a/doc/zutils.info and b/doc/zutils.info differ diff --git a/doc/zutils.texinfo b/doc/zutils.texinfo index ccadf05..76f771b 100644 --- a/doc/zutils.texinfo +++ b/doc/zutils.texinfo @@ -5,8 +5,8 @@ @finalout @c %**end of header -@set UPDATED 17 September 2009 -@set VERSION 0.4 +@set UPDATED 1 October 2009 +@set VERSION 0.5 @dircategory Data Compression @direntry @@ -67,8 +67,9 @@ 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 names -corresponding to the supported compressors. The supported compressors -are gzip, bzip2, lzip and xz. +corresponding to the supported compressors. If no files are specified, +the standard input is decompressed using the selected compressor and +sent to stdout. The format for running zcat is: @@ -91,6 +92,18 @@ 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 decompressor for stdin (default). + +@item --bzip2 +Use bzip2 as decompressor for stdin. + +@item --lzip +Use lzip as decompressor for stdin. + +@item --xz +Use xz as decompressor for stdin. + @end table @@ -102,7 +115,7 @@ Print the version number of zcat on the standard output and exit. Zdiff is a wrapper script around the diff and cmp commands that allows transparent comparison of any combination of compressed and non-compressed files. If any given file is compressed, its uncompressed -content is used. The supported compressors are gzip, bzip2, lzip and xz. +content is used. @noindent Zcmp is a shortcut for @samp{zdiff --cmp} @@ -156,8 +169,9 @@ 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 -names corresponding to the supported compressors. The supported -compressors are gzip, bzip2, lzip and xz. +names corresponding to the supported compressors. If no files are +specified, the standard input is decompressed using the selected +compressor and fed to grep. @noindent Zegrep is a shortcut for @samp{zgrep -E}@* @@ -185,6 +199,18 @@ 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 decompressor for stdin (default). + +@item --bzip2 +Use bzip2 as decompressor for stdin. + +@item --lzip +Use lzip as decompressor for stdin. + +@item --xz +Use xz as decompressor for stdin. + @end table -- cgit v1.2.3