From 5682f60e459bbb6a0d6174377db327fa5b63710b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 08:48:04 +0100 Subject: Merging upstream version 1.8. Signed-off-by: Daniel Baumann --- doc/lzdiff.1 | 48 --------------------- doc/lzgrep.1 | 42 ------------------ doc/lzip.1 | 4 +- doc/lzip.info | 127 +++++++----------------------------------------------- doc/lzip.texinfo | 110 +++------------------------------------------- doc/lziprecover.1 | 4 +- 6 files changed, 25 insertions(+), 310 deletions(-) delete mode 100644 doc/lzdiff.1 delete mode 100644 doc/lzgrep.1 (limited to 'doc') diff --git a/doc/lzdiff.1 b/doc/lzdiff.1 deleted file mode 100644 index b531605..0000000 --- a/doc/lzdiff.1 +++ /dev/null @@ -1,48 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH LZDIFF "1" "May 2009" "Lzdiff 0.5" "User Commands" -.SH NAME -Lzdiff \- manual page for Lzdiff 0.5 -.SH SYNOPSIS -.B lzdiff -[\fIOPTIONS\fR] [\fIDIFF_OPTIONS\fR] \fIFILE1 \fR[\fIFILE2\fR] -.SH DESCRIPTION -Lzdiff \- Diff/cmp wrapper for compressed files. -.PP -Lzdiff 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 and lzip. -.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. -The exit status from diff or cmp is preserved. -.SH OPTIONS -.TP -\fB\-h\fR, \fB\-\-help\fR -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\-\-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 -.SH COPYRIGHT -Copyright \(co 2009 Antonio Diaz Diaz. -This script is free software: you have unlimited permission -to copy, distribute and modify it. diff --git a/doc/lzgrep.1 b/doc/lzgrep.1 deleted file mode 100644 index b4d7183..0000000 --- a/doc/lzgrep.1 +++ /dev/null @@ -1,42 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH LZGREP "1" "May 2009" "Lzgrep 0.5" "User Commands" -.SH NAME -Lzgrep \- manual page for Lzgrep 0.5 -.SH SYNOPSIS -.B lzgrep -[\fIOPTIONS\fR] [\fIGREP_OPTIONS\fR] \fIPATTERN \fR[\fIFILES\fR] -.SH DESCRIPTION -Lzgrep \- Grep wrapper for compressed files. -.PP -Lzgrep 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, lzgrep tries the compressed file -name corresponding to the default compressor selected. The supported -compressors are gzip, bzip2 and lzip. -.PP -GREP_OPTIONS are passed directly to grep. -The exit status from grep is preserved. -.SH OPTIONS -.TP -\fB\-h\fR, \fB\-\-help\fR -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) -.SH "REPORTING BUGS" -Report bugs to lzip\-bug@nongnu.org -Lzip home page: http://www.nongnu.org/lzip/lzip.html -.SH COPYRIGHT -Copyright \(co 2009 Antonio Diaz Diaz. -This script is free software: you have unlimited permission -to copy, distribute and modify it. diff --git a/doc/lzip.1 b/doc/lzip.1 index 41c6381..73e5a48 100644 --- a/doc/lzip.1 +++ b/doc/lzip.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH LZIP "1" "June 2009" "Lzip 1.7" "User Commands" +.TH LZIP "1" "September 2009" "Lzip 1.8" "User Commands" .SH NAME -Lzip \- manual page for Lzip 1.7 +Lzip \- manual page for Lzip 1.8 .SH SYNOPSIS .B lzip [\fIoptions\fR] [\fIfiles\fR] diff --git a/doc/lzip.info b/doc/lzip.info index 31080a8..282cc03 100644 --- a/doc/lzip.info +++ b/doc/lzip.info @@ -11,7 +11,7 @@ File: lzip.info, Node: Top, Next: Introduction, Up: (dir) Lzip **** -This manual is for Lzip (version 1.7, 25 June 2009). +This manual is for Lzip (version 1.8, 2 September 2009). * Menu: @@ -20,8 +20,6 @@ This manual is for Lzip (version 1.7, 25 June 2009). * Invoking Lzip:: Command line interface * File Format:: Detailed format of the compressed file * Examples:: A small tutorial with examples -* Lzdiff:: Comparing compressed files -* Lzgrep:: Searching inside compressed files * Lziprecover:: Recovering data from damaged compressed files * Problems:: Reporting bugs * Concept Index:: Index of concepts @@ -72,9 +70,9 @@ or 2 times the dictionary size limit (1 if input file size is less than dictionary size limit, else 2) plus 8 times the dictionary size really used. For decompression is a little more than the dictionary size really used. Lzip will automatically use the smallest possible dictionary size -for each member without exceeding the given limit. It is important to -appreciate that the decompression memory requirement is affected at -compression time by the choice of dictionary size limit. +without exceeding the given limit. It is important to appreciate that +the decompression memory requirement is affected at compression time by +the choice of dictionary size limit. When decompressing, lzip attempts to guess the name for the decompressed file from that of the compressed file as follows: @@ -350,7 +348,7 @@ additional information before, between, or after them.  -File: lzip.info, Node: Examples, Next: Lzdiff, Prev: File Format, Up: Top +File: lzip.info, Node: Examples, Next: Lziprecover, Prev: File Format, Up: Top 5 A small tutorial with examples ******************************** @@ -411,98 +409,9 @@ second copy. (Indented lines are lzip error messages). cat rec*big_database1_00001.lz > big_database3_00001.lz  -File: lzip.info, Node: Lzdiff, Next: Lzgrep, Prev: Examples, Up: Top +File: lzip.info, Node: Lziprecover, Next: Problems, Prev: Examples, Up: Top -6 Lzdiff -******** - -Lzdiff 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 and lzip. - - The format for running lzdiff is: - - lzdiff [OPTIONS] [DIFF_OPTIONS] FILE1 [FILE2] - -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. -The exit status from diff or cmp is preserved. - - Lzdiff supports the following options: - -`--help' -`-h' - Print an informative help message describing the options and exit. - -`--version' -`-V' - Print the version number of lzdiff on the standard output and exit. - -`--gzip' - Use gzip as default decompressor. - -`--bzip2' - Use bzip2 as default decompressor. - -`--lzip' - Use lzip as default decompressor (default). - -`--diff' - Use diff to compare files (default). - -`--cmp' - Use cmp to compare files. - - - Lzdiff has the limitation that messages from the diff or cmp programs -refer to temporary filenames instead of those specified. - - -File: lzip.info, Node: Lzgrep, Next: Lziprecover, Prev: Lzdiff, Up: Top - -7 Lzgrep -******** - -Lzgrep 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, lzgrep tries the compressed file -name corresponding to the default compressor selected. The supported -compressors are gzip, bzip2 and lzip. - - The format for running lzgrep is: - - lzgrep [OPTIONS] [GREP_OPTIONS] PATTERN [FILES] - -GREP_OPTIONS are passed directly to grep. The exit status from grep is -preserved. - - Lzgrep supports the following options: - -`--help' -`-h' - Print an informative help message describing the options and exit. - -`--version' -`-V' - Print the version number of lzgrep on the standard output and exit. - -`--gzip' - Use gzip as default decompressor. - -`--bzip2' - Use bzip2 as default decompressor. - -`--lzip' - Use lzip as default decompressor (default). - - - -File: lzip.info, Node: Lziprecover, Next: Problems, Prev: Lzgrep, Up: Top - -8 Lziprecover +6 Lziprecover ************* Lziprecover is a program that searches for members in .lz files, and @@ -520,7 +429,7 @@ correct order.  File: lzip.info, Node: Problems, Next: Concept Index, Prev: Lziprecover, Up: Top -9 Reporting Bugs +7 Reporting Bugs **************** There are probably bugs in lzip. There are certainly errors and @@ -548,8 +457,6 @@ Concept Index * getting help: Problems. (line 6) * introduction: Introduction. (line 6) * invoking: Invoking Lzip. (line 6) -* lzdiff: Lzdiff. (line 6) -* lzgrep: Lzgrep. (line 6) * lziprecover: Lziprecover. (line 6) * options: Invoking Lzip. (line 6) * usage: Invoking Lzip. (line 6) @@ -559,15 +466,13 @@ Concept Index  Tag Table: Node: Top224 -Node: Introduction961 -Node: Algorithm4284 -Node: Invoking Lzip6510 -Node: File Format10857 -Node: Examples12811 -Node: Lzdiff14644 -Node: Lzgrep15963 -Node: Lziprecover16998 -Node: Problems17695 -Node: Concept Index18220 +Node: Introduction880 +Node: Algorithm4187 +Node: Invoking Lzip6413 +Node: File Format10760 +Node: Examples12714 +Node: Lziprecover14552 +Node: Problems15251 +Node: Concept Index15776  End Tag Table diff --git a/doc/lzip.texinfo b/doc/lzip.texinfo index a17cded..adb5eb6 100644 --- a/doc/lzip.texinfo +++ b/doc/lzip.texinfo @@ -5,8 +5,8 @@ @finalout @c %**end of header -@set UPDATED 25 June 2009 -@set VERSION 1.7 +@set UPDATED 2 September 2009 +@set VERSION 1.8 @dircategory Data Compression @direntry @@ -37,8 +37,6 @@ This manual is for Lzip (version @value{VERSION}, @value{UPDATED}). * Invoking Lzip:: Command line interface * File Format:: Detailed format of the compressed file * Examples:: A small tutorial with examples -* Lzdiff:: Comparing compressed files -* Lzgrep:: Searching inside compressed files * Lziprecover:: Recovering data from damaged compressed files * Problems:: Reporting bugs * Concept Index:: Index of concepts @@ -89,9 +87,9 @@ times the dictionary size limit (1 if input file size is less than dictionary size limit, else 2) plus 8 times the dictionary size really used. For decompression is a little more than the dictionary size really used. Lzip will automatically use the smallest possible dictionary size -for each member without exceeding the given limit. It is important to -appreciate that the decompression memory requirement is affected at -compression time by the choice of dictionary size limit. +without exceeding the given limit. It is important to appreciate that +the decompression memory requirement is affected at compression time by +the choice of dictionary size limit. When decompressing, lzip attempts to guess the name for the decompressed file from that of the compressed file as follows: @@ -461,104 +459,6 @@ cat rec*big_database1_00001.lz > big_database3_00001.lz @end example -@node Lzdiff -@chapter Lzdiff -@cindex lzdiff - -Lzdiff 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 and lzip. - -The format for running lzdiff is: - -@example -lzdiff [@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. - -Lzdiff supports the following options: - -@table @samp -@item --help -@itemx -h -Print an informative help message describing the options and exit. - -@item --version -@itemx -V -Print the version number of lzdiff 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 --diff -Use diff to compare files (default). - -@item --cmp -Use cmp to compare files. - -@end table - -Lzdiff has the limitation that messages from the diff or cmp programs -refer to temporary filenames instead of those specified. - - -@node Lzgrep -@chapter Lzgrep -@cindex lzgrep - -Lzgrep 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, lzgrep tries the compressed file -name corresponding to the default compressor selected. The supported -compressors are gzip, bzip2 and lzip. - -The format for running lzgrep is: - -@example -lzgrep [@var{options}] [@var{grep_options}] @var{pattern} [@var{files}] -@end example - -@noindent -@var{grep_options} are passed directly to grep. The exit status from -grep is preserved. - -Lzgrep supports the following options: - -@table @samp -@item --help -@itemx -h -Print an informative help message describing the options and exit. - -@item --version -@itemx -V -Print the version number of lzgrep 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). - -@end table - - @node Lziprecover @chapter Lziprecover @cindex lziprecover diff --git a/doc/lziprecover.1 b/doc/lziprecover.1 index 37c2ac2..80dc3b3 100644 --- a/doc/lziprecover.1 +++ b/doc/lziprecover.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH LZIPRECOVER "1" "June 2009" "Lziprecover 1.7" "User Commands" +.TH LZIPRECOVER "1" "September 2009" "Lziprecover 1.8" "User Commands" .SH NAME -Lziprecover \- manual page for Lziprecover 1.7 +Lziprecover \- manual page for Lziprecover 1.8 .SH SYNOPSIS .B lziprecover [\fIoptions\fR] \fIfile\fR -- cgit v1.2.3