Merging upstream version 1.13~rc1.

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

1 files changed, 57 insertions, 195 deletions

diff --git a/doc/lzip.info b/doc/lzip.info
index fa26348..2981447 100644
--- a/doc/lzip.info
+++ b/doc/lzip.info
@@ -11,7 +11,7 @@ File: lzip.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Lzip Manual
 ***********
 
-This manual is for Lzip (version 1.12, 30 April 2011).
+This manual is for Lzip (version 1.13-rc1, 12 November 2011).
 
 * Menu:
 
@@ -20,8 +20,6 @@ This manual is for Lzip (version 1.12, 30 April 2011).
 * Invoking Lzip::         Command line interface
 * File Format::           Detailed format of the compressed file
 * Examples::              A small tutorial with examples
-* Lziprecover::           Recovering data from damaged compressed files
-* Invoking Lziprecover::  Command line interface
 * Problems::              Reporting bugs
 * Concept Index::         Index of concepts
 
@@ -43,6 +41,9 @@ gzip or bzip2. Lzip decompresses almost as fast as gzip and compresses
 better than bzip2, which makes it well suited for software distribution
 and data archiving.
 
+   If you ever need to recover data from a damaged lzip file, try the
+lziprecover program.
+
    Lzip replaces every file given in the command line with a compressed
 version of itself, with the name "original_name.lz". Each compressed
 file has the same modification date, permissions, and, when possible,
@@ -182,12 +183,12 @@ The format for running lzip is:
 `--version'
      Print the version number of lzip on the standard output and exit.
 
-`-b SIZE'
-`--member-size=SIZE'
-     Produce a multimember file and set the member size limit to SIZE
-     bytes. Minimum member size limit is 100kB. Small member size may
-     degrade compression ratio, so use it only when needed. The default
-     is to produce single-member files.
+`-b BYTES'
+`--member-size=BYTES'
+     Produce a multimember file and set the member size limit to BYTES.
+     Minimum member size limit is 100kB. Small member size may degrade
+     compression ratio, so use it only when needed. The default is to
+     produce single-member files.
 
 `-c'
 `--stdout'
@@ -202,7 +203,7 @@ The format for running lzip is:
 
 `-f'
 `--force'
-     Force overwrite of output file.
+     Force overwrite of output files.
 
 `-F'
 `--recompress'
@@ -214,8 +215,8 @@ The format for running lzip is:
      Keep (don't delete) input files during compression or
      decompression.
 
-`-m LENGTH'
-`--match-length=LENGTH'
+`-m BYTES'
+`--match-length=BYTES'
      Set the match length limit in bytes. After a match this long is
      found, the search is finished. Valid values range from 5 to 273.
      Larger values usually give better compression ratios but longer
@@ -234,25 +235,25 @@ The format for running lzip is:
 `--quiet'
      Quiet operation. Suppress all messages.
 
-`-s SIZE'
-`--dictionary-size=SIZE'
+`-s BYTES'
+`--dictionary-size=BYTES'
      Set the dictionary size limit in bytes. Valid values range from
      4KiB to 512MiB. Lzip will use the smallest possible dictionary
      size for each member without exceeding this limit. Note that
      dictionary sizes are quantized. If the specified size does not
      match one of the valid sizes, it will be rounded upwards by adding
-     up to (SIZE / 16) to it.
+     up to (BYTES / 16) to it.
 
      For maximum compression you should use a dictionary size limit as
      large as possible, but keep in mind that the decompression memory
      requirement is affected at compression time by the choice of
      dictionary size limit.
 
-`-S SIZE'
-`--volume-size=SIZE'
+`-S BYTES'
+`--volume-size=BYTES'
      Split the compressed output into several volume files with names
      `original_name00001.lz', `original_name00002.lz', etc, and set the
-     volume size limit to SIZE bytes. Each volume is a complete, maybe
+     volume size limit to BYTES. Each volume is a complete, maybe
      multimember, lzip file. Minimum volume size limit is 100kB. Small
      volume size may degrade compression ratio, so use it only when
      needed.
@@ -266,11 +267,13 @@ The format for running lzip is:
 
 `-v'
 `--verbose'
-     Verbose mode.  When compressing, show the compression ratio for
-     each file processed.  When decompressing or testing, further -v's
-     (up to 4) increase the verbosity level, showing status, dictionary
-     size, compression ratio, trailer contents (CRC, data size, member
-     size), and up to 6 bytes of trailing garbage (if any).
+     Verbose mode.
+     When compressing, show the compression ratio for each file
+     processed.
+     When decompressing or testing, further -v's (up to 4) increase the
+     verbosity level, showing status, dictionary size, compression
+     ratio, trailer contents (CRC, data size, member size), and up to 6
+     bytes of trailing garbage (if any).
 
 `-0 .. -9'
      Set the compression parameters (dictionary size and match length
@@ -379,7 +382,7 @@ additional information before, between, or after them.
 
 
 
-File: lzip.info,  Node: Examples,  Next: Lziprecover,  Prev: File Format,  Up: Top
+File: lzip.info,  Node: Examples,  Next: Problems,  Prev: File Format,  Up: Top
 
 5 A small tutorial with examples
 ********************************
@@ -392,205 +395,69 @@ verify the compressed file with a command like
 `lzip -cd file.lz | cmp file -'.
 
 
-Example 1: Replace a regular file with its compressed version file.lz
+Example 1: Replace a regular file with its compressed version `file.lz'
 and show the compression ratio.
 
      lzip -v file
 
 
-Example 2: Like example 1 but the created file.lz is multimember with a
-member size of 1MiB. The compression ratio is not shown.
+Example 2: Like example 1 but the created `file.lz' is multimember with
+a member size of 1MiB. The compression ratio is not shown.
 
      lzip -b 1MiB file
 
 
-Example 3: Restore a regular file from its compressed version file.lz.
-If the operation is successful, file.lz is removed.
+Example 3: Restore a regular file from its compressed version
+`file.lz'. If the operation is successful, `file.lz' is removed.
 
      lzip -d file.lz
 
 
-Example 4: Verify the integrity of the compressed file file.lz and show
-status.
+Example 4: Verify the integrity of the compressed file `file.lz' and
+show status.
 
      lzip -tv file.lz
 
 
 Example 5: Compress a whole floppy in /dev/fd0 and send the output to
-file.lz.
+`file.lz'.
 
      lzip -c /dev/fd0 > file.lz
 
 
-Example 6: Decompress file.lz partially until 10KiB of decompressed data
-are produced.
+Example 6: Decompress `file.lz' partially until 10KiB of decompressed
+data are produced.
 
      lzip -cd file.lz | dd bs=1024 count=10
 
 
-Example 7: Create a multivolume compressed tar archive with a volume
+Example 7: Decompress `file.lz' partially from decompressed byte 10000
+to decompressed byte 15000 (5000 bytes are produced).
+
+     lzip -cd file.lz | dd bs=1000 skip=10 count=5
+
+
+Example 8: Create a multivolume compressed tar archive with a volume
 size of 1440KiB.
 
      tar -c some_directory | lzip -S 1440KiB -o volume_name
 
 
-Example 8: Extract a multivolume compressed tar archive.
+Example 9: Extract a multivolume compressed tar archive.
 
      lzip -cd volume_name*.lz | tar -xf -
 
 
-Example 9: Create a multivolume compressed backup of a big database file
-with a volume size of 650MB, where each volume is a multimember file
-with a member size of 32MiB.
+Example 10: Create a multivolume compressed backup of a big database
+file with a volume size of 650MB, where each volume is a multimember
+file with a member size of 32MiB.
 
      lzip -b 32MiB -S 650MB big_db
 
-
-Example 10: Recover a compressed backup from two copies on CD-ROM (see
-the GNU ddrescue manual for details about ddrescue)
-
-     ddrescue -b2048 /dev/cdrom cdimage1 logfile1
-     mount -t iso9660 -o loop,ro cdimage1 /mnt/cdimage
-     cp /mnt/cdimage/backup.tar.lz rescued1.tar.lz
-     umount /mnt/cdimage
-       (insert second copy in the CD drive)
-     ddrescue -b2048 /dev/cdrom cdimage2 logfile2
-     mount -t iso9660 -o loop,ro cdimage2 /mnt/cdimage
-     cp /mnt/cdimage/backup.tar.lz rescued2.tar.lz
-     umount /mnt/cdimage
-     lziprecover -m -v -o rescued.tar.lz rescued1.tar.lz rescued2.tar.lz
-
-
-Example 11: Recover the first volume of those created in example 9 from
-two copies, `big_db1_00001.lz' and `big_db2_00001.lz', with member
-00007 damaged in the first copy, member 00018 damaged in the second
-copy, and member 00012 damaged in both copies. (Indented lines are
-abridged error messages from lzip/lziprecover). Two correct copies are
-produced and compared.
-
-     lziprecover -s big_db1_00001.lz
-     lziprecover -s big_db2_00001.lz
-     lzip -t rec*big_db1_00001.lz
-       rec00007big_db1_00001.lz: crc mismatch
-       rec00012big_db1_00001.lz: crc mismatch
-     lzip -t rec*big_db2_00001.lz
-       rec00012big_db2_00001.lz: crc mismatch
-       rec00018big_db2_00001.lz: crc mismatch
-     lziprecover -m -v rec00012big_db1_00001.lz rec00012big_db2_00001.lz
-       Input files merged successfully
-     cp rec00007big_db2_00001.lz rec00007big_db1_00001.lz
-     cp rec00012big_db1_00001_fixed.lz rec00012big_db1_00001.lz
-     cp rec00012big_db1_00001_fixed.lz rec00012big_db2_00001.lz
-     cp rec00018big_db1_00001.lz rec00018big_db2_00001.lz
-     cat rec*big_db1_00001.lz > big_db3_00001.lz
-     cat rec*big_db2_00001.lz > big_db4_00001.lz
-     zcmp big_db3_00001.lz big_db4_00001.lz
-
-
-File: lzip.info,  Node: Lziprecover,  Next: Invoking Lziprecover,  Prev: Examples,  Up: Top
-
-6 Lziprecover
-*************
-
-Lziprecover is a data recovery tool for lzip compressed files able to
-repair slightly damaged files, recover badly damaged files from two or
-more copies, and extract undamaged members from multi-member files.
-
-   Lziprecover takes as arguments the names of the damaged files and
-writes zero or more recovered files depending on the operation selected
-and whether the recovery succeeded or not. The damaged files themselves
-are never modified.
-
-   If the files are too damaged for lziprecover to repair them, data
-from damaged members can be partially recovered writing it to stdout as
-shown in the following example (the resulting file may contain garbage
-data at the end):
-
-     lzip -cd rec00001file.lz > rec00001file
-
-   If the cause of file corruption is damaged media, the combination GNU
-ddrescue + lziprecover is the best option for recovering data from
-multiple damaged copies. *Note ddrescue-example::, for an example.
-
-
-File: lzip.info,  Node: Invoking Lziprecover,  Next: Problems,  Prev: Lziprecover,  Up: Top
-
-7 Invoking Lziprecover
-**********************
-
-The format for running lziprecover is:
-
-     lziprecover [OPTIONS] [FILES]
-
-   Lziprecover supports the following options:
-
-`-h'
-`--help'
-     Print an informative help message describing the options and exit.
-
-`-V'
-`--version'
-     Print the version number of lziprecover on the standard output and
-     exit.
-
-`-f'
-`--force'
-     Force overwrite of output file.
-
-`-m'
-`--merge'
-     Try to produce a correct file merging the good parts of two or more
-     damaged copies. The copies must be single-member files. The merge
-     will fail if the copies have too many damaged areas or if the same
-     byte is damaged in all copies. If successful, a repaired copy is
-     written to the file `FILE_fixed.lz'.
-
-     To give you an idea of its possibilities, when merging two copies
-     each of them with one damaged area affecting 1 percent of the
-     copy, the probability of obtaining a correct file is about 98
-     percent. With three such copies the probability rises to 99.97
-     percent. For large files with small errors, the probability
-     approaches 100 percent even with only two copies.
-
-`-o FILE'
-`--output=FILE'
-     Place the output into `FILE' instead of into `FILE_fixed.lz'.
-
-     If splitting, the names of the files produced are in the form
-     `rec00001FILE', etc.
-
-`-q'
-`--quiet'
-     Quiet operation. Suppress all messages.
-
-`-R'
-`--repair'
-     Try to repair a small error, affecting only one byte, in a
-     single-member FILE. If successful, a repaired copy is written to
-     the file `FILE_fixed.lz'. `FILE' is not modified at all.
-
-`-s'
-`--split'
-     Search for members in `FILE' and write each member in its own
-     `.lz' file. You can then use `lzip -t' to test the integrity of
-     the resulting files, decompress those which are undamaged, and try
-     to repair or partially decompress those which are damaged.
-
-     The names of the files produced are in the form `rec00001FILE.lz',
-     `rec00002FILE.lz', etc, and are designed so that the use of
-     wildcards in subsequent processing, for example,
-     `lzip -cd rec*FILE.lz > recovered_data', processes the files in
-     the correct order.
-
-`-v'
-`--verbose'
-     Verbose mode. Further -v's increase the verbosity level.
-
-
 
-File: lzip.info,  Node: Problems,  Next: Concept Index,  Prev: Invoking Lziprecover,  Up: Top
+File: lzip.info,  Node: Problems,  Next: Concept Index,  Prev: Examples,  Up: Top
 
-8 Reporting Bugs
+6 Reporting Bugs
 ****************
 
 There are probably bugs in lzip. There are certainly errors and
@@ -618,8 +485,6 @@ Concept Index
 * getting help:                          Problems.              (line 6)
 * introduction:                          Introduction.          (line 6)
 * invoking lzip:                         Invoking Lzip.         (line 6)
-* invoking lziprecover:                  Invoking Lziprecover.  (line 6)
-* lziprecover:                           Lziprecover.           (line 6)
 * options:                               Invoking Lzip.         (line 6)
 * usage:                                 Invoking Lzip.         (line 6)
 * version:                               Invoking Lzip.         (line 6)
@@ -628,15 +493,12 @@ Concept Index
 
 Tag Table:
 Node: Top224
-Node: Introduction1031
-Node: Algorithm4439
-Node: Invoking Lzip6957
-Node: File Format12303
-Node: Examples14295
-Ref: ddrescue-example16049
-Node: Lziprecover17848
-Node: Invoking Lziprecover18901
-Node: Problems21262
-Node: Concept Index21796
+Node: Introduction917
+Node: Algorithm4417
+Node: Invoking Lzip6935
+Node: File Format12285
+Node: Examples14277
+Node: Problems16221
+Node: Concept Index16743
 
 End Tag Table