Merging upstream version 1.13~rc2.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

3 files changed, 90 insertions, 10 deletions

diff --git a/doc/lziprecover.1 b/doc/lziprecover.1
index 495de0b..f8e6148 100644
--- a/doc/lziprecover.1
+++ b/doc/lziprecover.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH LZIPRECOVER "1" "November 2011" "Lziprecover 1.13-rc1" "User Commands"
+.TH LZIPRECOVER "1" "November 2011" "Lziprecover 1.13-rc2" "User Commands"
 .SH NAME
 Lziprecover \- recovers data from damaged lzip files
 .SH SYNOPSIS
@@ -21,12 +21,18 @@ send decompressed output to standard output
 \fB\-d\fR, \fB\-\-decompress\fR
 decompress
 .TP
+\fB\-D\fR, \fB\-\-range\-decompress=\fR<range>
+decompress only a range of bytes (N\-M)
+.TP
 \fB\-f\fR, \fB\-\-force\fR
 overwrite existing output files
 .TP
 \fB\-k\fR, \fB\-\-keep\fR
 keep (don't delete) input files
 .TP
+\fB\-l\fR, \fB\-\-list\fR
+print total file sizes and ratios
+.TP
 \fB\-m\fR, \fB\-\-merge\fR
 correct errors in file using several copies
 .TP
@@ -40,13 +46,16 @@ suppress all messages
 try to repair a small error in file
 .TP
 \fB\-s\fR, \fB\-\-split\fR
-split a multimember file in single\-member files
+split multimember file in single\-member files
 .TP
 \fB\-t\fR, \fB\-\-test\fR
 test compressed file integrity
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
 be verbose (a 2nd \fB\-v\fR gives more)
+.PP
+Numbers may be followed by a multiplier: k = kB = 10^3 = 1000,
+Ki = KiB = 2^10 = 1024, M = 10^6, Mi = 2^20, G = 10^9, Gi = 2^30, etc...
 .SH "REPORTING BUGS"
 Report bugs to lzip\-bug@nongnu.org
 .br
diff --git a/doc/lziprecover.info b/doc/lziprecover.info
index 4528103..621f5cf 100644
--- a/doc/lziprecover.info
+++ b/doc/lziprecover.info
@@ -12,7 +12,7 @@ File: lziprecover.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Lziprecover Manual
 ******************
 
-This manual is for Lziprecover (version 1.13-rc1, 12 November 2011).
+This manual is for Lziprecover (version 1.13-rc2, 20 November 2011).
 
 * Menu:
 
@@ -101,6 +101,19 @@ The format for running lziprecover is:
 `--decompress'
      Decompress.
 
+`-D RANGE'
+`--range-decompress=RANGE'
+     Decompress only a range of bytes starting at decompressed byte
+     position `BEGIN' and up to byte position `END - 1'.  Three formats
+     of RANGE are recognized, `BEGIN', `BEGIN-END', and `BEGIN,SIZE'.
+     If only BEGIN is specified, END is taken as the end of the file.
+     The produced bytes are sent to standard output unless the
+     `--output' option is used. In order to guarantee the correctness
+     of the data produced, all members containing any part of the
+     desired data are decompressed and their integrity is verified.
+     This operation is more efficient in multimember files because it
+     only decompresses the members containing the desired data.
+
 `-f'
 `--force'
      Force overwrite of output files.
@@ -109,6 +122,11 @@ The format for running lziprecover is:
 `--keep'
      Keep (don't delete) input files during decompression.
 
+`-l'
+`--list'
+     Print total file sizes and ratios. The values produced are correct
+     even for multimember files.
+
 `-m'
 `--merge'
      Try to produce a correct file merging the good parts of two or more
@@ -174,6 +192,22 @@ The format for running lziprecover is:
      bytes of trailing garbage (if any).
 
 
+
+   Numbers given as arguments to options may be followed by a multiplier
+and an optional `B' for "byte".
+
+   Table of SI and binary prefixes (unit multipliers):
+
+Prefix   Value                     |   Prefix   Value
+k        kilobyte  (10^3 = 1000)   |   Ki       kibibyte (2^10 = 1024)
+M        megabyte  (10^6)          |   Mi       mebibyte (2^20)
+G        gigabyte  (10^9)          |   Gi       gibibyte (2^30)
+T        terabyte  (10^12)         |   Ti       tebibyte (2^40)
+P        petabyte  (10^15)         |   Pi       pebibyte (2^50)
+E        exabyte   (10^18)         |   Ei       exbibyte (2^60)
+Z        zettabyte (10^21)         |   Zi       zebibyte (2^70)
+Y        yottabyte (10^24)         |   Yi       yobibyte (2^80)
+
 
 File: lziprecover.info,  Node: File Format,  Next: Examples,  Prev: Invoking Lziprecover,  Up: Top
 
@@ -359,10 +393,10 @@ Tag Table:
 Node: Top231
 Node: Introduction898
 Node: Invoking Lziprecover2684
-Node: File Format6150
-Node: Examples8156
-Ref: ddrescue-example9409
-Node: Problems11188
-Node: Concept Index11738
+Node: File Format7727
+Node: Examples9733
+Ref: ddrescue-example10986
+Node: Problems12765
+Node: Concept Index13315
 
 End Tag Table
diff --git a/doc/lziprecover.texinfo b/doc/lziprecover.texinfo
index 2447c14..9086787 100644
--- a/doc/lziprecover.texinfo
+++ b/doc/lziprecover.texinfo
@@ -5,8 +5,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 12 November 2011
-@set VERSION 1.13-rc1
+@set UPDATED 20 November 2011
+@set VERSION 1.13-rc2
 
 @dircategory Data Compression
 @direntry
@@ -122,6 +122,20 @@ data as possible when decompressing a corrupt file.
 @itemx --decompress
 Decompress.
 
+@item -D @var{range}
+@itemx --range-decompress=@var{range}
+Decompress only a range of bytes starting at decompressed byte position
+@samp{@var{begin}} and up to byte position @w{@samp{@var{end} - 1}}.
+Three formats of @var{range} are recognized, @samp{@var{begin}},
+@samp{@var{begin}-@var{end}}, and @samp{@var{begin},@var{size}}. If only
+@var{begin} is specified, @var{end} is taken as the end of the file. The
+produced bytes are sent to standard output unless the @samp{--output}
+option is used. In order to guarantee the correctness of the data
+produced, all members containing any part of the desired data are
+decompressed and their integrity is verified. This operation is more
+efficient in multimember files because it only decompresses the members
+containing the desired data.
+
 @item -f
 @itemx --force
 Force overwrite of output files.
@@ -130,6 +144,11 @@ Force overwrite of output files.
 @itemx --keep
 Keep (don't delete) input files during decompression.
 
+@item -l
+@itemx --list
+Print total file sizes and ratios. The values produced are correct even
+for multimember files.
+
 @item -m
 @itemx --merge
 Try to produce a correct file merging the good parts of two or more
@@ -195,6 +214,24 @@ trailing garbage (if any).
 
 @end table
 
+@sp 1
+Numbers given as arguments to options may be followed by a multiplier
+and an optional @samp{B} for "byte".
+
+Table of SI and binary prefixes (unit multipliers):
+
+@multitable {Prefix} {kilobyte  (10^3 = 1000)} {|} {Prefix} {kibibyte (2^10 = 1024)}
+@item Prefix @tab Value               @tab | @tab Prefix @tab Value
+@item k @tab kilobyte  (10^3 = 1000)  @tab | @tab Ki @tab kibibyte (2^10 = 1024)
+@item M @tab megabyte  (10^6)         @tab | @tab Mi @tab mebibyte (2^20)
+@item G @tab gigabyte  (10^9)         @tab | @tab Gi @tab gibibyte (2^30)
+@item T @tab terabyte  (10^12)        @tab | @tab Ti @tab tebibyte (2^40)
+@item P @tab petabyte  (10^15)        @tab | @tab Pi @tab pebibyte (2^50)
+@item E @tab exabyte   (10^18)        @tab | @tab Ei @tab exbibyte (2^60)
+@item Z @tab zettabyte (10^21)        @tab | @tab Zi @tab zebibyte (2^70)
+@item Y @tab yottabyte (10^24)        @tab | @tab Yi @tab yobibyte (2^80)
+@end multitable
+
 
 @node File Format
 @chapter File Format