Merging upstream version 1.6.

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

16 files changed, 60 insertions, 52 deletions

diff --git a/ChangeLog b/ChangeLog
index 336b217..76f0708 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18 +1,10 @@
-2014-06-30  Antonio Diaz Diaz  <antonio@gnu.org>
+2014-08-28  Antonio Diaz Diaz  <antonio@gnu.org>
 
-	* Version 1.6-rc1 released.
-	* License changed to GPL version 2 or later.
-
-2014-05-06  Antonio Diaz Diaz  <antonio@gnu.org>
-
-	* Version 1.6-pre2 released.
+	* Version 1.6 released.
 	* Compression ratio of option '-9' has been slightly increased.
-
-2014-01-30  Antonio Diaz Diaz  <antonio@gnu.org>
-
-	* Version 1.6-pre1 released.
 	* main.c (close_and_set_permissions): Behave like 'cp -p'.
 	* clzip.texinfo: Renamed to clzip.texi.
+	* License changed to GPL version 2 or later.
 
 2013-09-17  Antonio Diaz Diaz  <antonio@gnu.org>
 
@@ -81,7 +73,7 @@
 	* Translated to C from the C++ source of lzip 1.10.
 
 
-Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
+Copyright (C) 2010-2014 Antonio Diaz Diaz.
 
 This file is a collection of facts, and thus it is not copyrightable,
 but just in case, you have unlimited permission to copy, distribute and
diff --git a/INSTALL b/INSTALL
index 5a4ea21..9808bc8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 Requirements
 ------------
 You will need a C compiler.
-I use gcc 4.8.1 and 3.3.6, but the code should compile with any
+I use gcc 4.9.1 and 3.3.6, but the code should compile with any
 standards compliant compiler.
 Gcc is available at http://gcc.gnu.org.
 
@@ -32,7 +32,7 @@ the main archive.
 5. Type 'make install' to install the program and any data files and
    documentation.
 
-   You can install only the program, the info manual or the man page
+   You can install only the program, the info manual or the man page by
    typing 'make install-bin', 'make install-info' or 'make install-man'
    respectively.
 
@@ -58,7 +58,7 @@ After running 'configure', you can run 'make' and 'make install' as
 explained above.
 
 
-Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
+Copyright (C) 2010-2014 Antonio Diaz Diaz.
 
 This file is free documentation: you have unlimited permission to copy,
 distribute and modify it.
diff --git a/README b/README
index 765c73a..616f7e5 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ Clzip is a lossless data compressor with a user interface similar to the
 one of gzip or bzip2. Clzip decompresses almost as fast as gzip,
 compresses most files more than bzip2, and is better than both from a
 data recovery perspective. Clzip is a clean implementation of the LZMA
-algorithm.
+"algorithm".
 
 Clzip uses the lzip file format; the files produced by clzip are fully
 compatible with lzip-1.4 or newer, and can be rescued with lziprecover.
@@ -30,9 +30,15 @@ into account both data integrity and decoder availability:
    * Additionally lzip is copylefted, which guarantees that it will
      remain free forever.
 
+A nice feature of the lzip format is that a corrupt byte is easier to
+repair the nearer it is from the beginning of the file. Therefore, with
+the help of lziprecover, losing an entire archive just because of a
+corrupt byte near the beginning is a thing of the past.
+
 Clzip uses the same well-defined exit status values used by lzip and
 bzip2, which makes it safer than compressors returning ambiguous warning
-values (like gzip) when it is used as a back end for tar or zutils.
+values (like gzip) when it is used as a back end for other programs like
+tar or zutils.
 
 Clzip will automatically use the smallest possible dictionary size for
 each file without exceeding the given limit. Keep in mind that the
@@ -102,7 +108,7 @@ range encoding), Igor Pavlov (for putting all the above together in
 LZMA), and Julian Seward (for bzip2's CLI).
 
 
-Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
+Copyright (C) 2010-2014 Antonio Diaz Diaz.
 
 This file is free documentation: you have unlimited permission to copy,
 distribute and modify it.
diff --git a/carg_parser.c b/carg_parser.c
index c4f88a3..f9c0f08 100644
--- a/carg_parser.c
+++ b/carg_parser.c
@@ -1,6 +1,5 @@
 /*  Arg_parser - POSIX/GNU command line argument parser. (C version)
-    Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
-    Antonio Diaz Diaz.
+    Copyright (C) 2006-2014 Antonio Diaz Diaz.
 
     This library is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/carg_parser.h b/carg_parser.h
index 4215828..b6ba67d 100644
--- a/carg_parser.h
+++ b/carg_parser.h
@@ -1,6 +1,5 @@
 /*  Arg_parser - POSIX/GNU command line argument parser. (C version)
-    Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
-    Antonio Diaz Diaz.
+    Copyright (C) 2006-2014 Antonio Diaz Diaz.
 
     This library is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/configure b/configure
index bca84b6..e03eb80 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,12 @@
 #! /bin/sh
 # configure script for Clzip - LZMA lossless data compressor
-# Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
+# Copyright (C) 2010-2014 Antonio Diaz Diaz.
 #
 # This configure script is free software: you have unlimited permission
 # to copy, distribute and modify it.
 
 pkgname=clzip
-pkgversion=1.6-rc1
+pkgversion=1.6
 progname=clzip
 srctrigger=doc/${pkgname}.texi
 
@@ -165,7 +165,7 @@ echo "LDFLAGS = ${LDFLAGS}"
 rm -f Makefile
 cat > Makefile << EOF
 # Makefile for Clzip - LZMA lossless data compressor
-# Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
+# Copyright (C) 2010-2014 Antonio Diaz Diaz.
 # This file was generated automatically by configure. Do not edit.
 #
 # This Makefile is free software: you have unlimited permission
diff --git a/decoder.c b/decoder.c
index 31e226b..c1f58ff 100644
--- a/decoder.c
+++ b/decoder.c
@@ -1,5 +1,5 @@
 /*  Clzip - LZMA lossless data compressor
-    Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
+    Copyright (C) 2010-2014 Antonio Diaz Diaz.
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -272,7 +272,7 @@ int LZd_decode_member( struct LZ_decoder * const d,
             {
             rep0 += Rd_decode( rdec, direct_bits - dis_align_bits ) << dis_align_bits;
             rep0 += Rd_decode_tree_reversed4( rdec, d->bm_align );
-            if( rep0 == 0xFFFFFFFFU )		/* Marker found */
+            if( rep0 == 0xFFFFFFFFU )		/* marker found */
               {
               rep0 = rep0_saved;
               Rd_normalize( rdec );
diff --git a/decoder.h b/decoder.h
index e7477bb..24847dd 100644
--- a/decoder.h
+++ b/decoder.h
@@ -1,5 +1,5 @@
 /*  Clzip - LZMA lossless data compressor
-    Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
+    Copyright (C) 2010-2014 Antonio Diaz Diaz.
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/doc/clzip.1 b/doc/clzip.1
index 040900d..2c64982 100644
--- a/doc/clzip.1
+++ b/doc/clzip.1
@@ -1,10 +1,10 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH CLZIP "1" "June 2014" "clzip 1.6-rc1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
+.TH CLZIP "1" "August 2014" "clzip 1.6" "User Commands"
 .SH NAME
 clzip \- reduces the size of files
 .SH SYNOPSIS
 .B clzip
-[\fIoptions\fR] [\fIfiles\fR]
+[\fI\,options\/\fR] [\fI\,files\/\fR]
 .SH DESCRIPTION
 Clzip \- LZMA lossless data compressor.
 .SH OPTIONS
diff --git a/doc/clzip.info b/doc/clzip.info
index d349d80..0942986 100644
--- a/doc/clzip.info
+++ b/doc/clzip.info
@@ -11,7 +11,7 @@ File: clzip.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Clzip Manual
 ************
 
-This manual is for Clzip (version 1.6-rc1, 30 June 2014).
+This manual is for Clzip (version 1.6, 28 August 2014).
 
 * Menu:
 
@@ -24,7 +24,7 @@ This manual is for Clzip (version 1.6-rc1, 30 June 2014).
 * Concept index::          Index of concepts
 
 
-   Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
+   Copyright (C) 2010-2014 Antonio Diaz Diaz.
 
    This manual is free documentation: you have unlimited permission to
 copy, distribute and modify it.
@@ -39,7 +39,7 @@ Clzip is a lossless data compressor with a user interface similar to the
 one of gzip or bzip2. Clzip decompresses almost as fast as gzip,
 compresses most files more than bzip2, and is better than both from a
 data recovery perspective. Clzip is a clean implementation of the LZMA
-(Lempel-Ziv-Markov chain-Algorithm) algorithm.
+(Lempel-Ziv-Markov chain-Algorithm) "algorithm".
 
    Clzip uses the lzip file format; the files produced by clzip are
 fully compatible with lzip-1.4 or newer, and can be rescued with
@@ -65,6 +65,11 @@ into account both data integrity and decoder availability:
    * Additionally lzip is copylefted, which guarantees that it will
      remain free forever.
 
+   A nice feature of the lzip format is that a corrupt byte is easier to
+repair the nearer it is from the beginning of the file. Therefore, with
+the help of lziprecover, losing an entire archive just because of a
+corrupt byte near the beginning is a thing of the past.
+
    The member trailer stores the 32-bit CRC of the original data, the
 size of the original data and the size of the member. These values,
 together with the value remaining in the range decoder and the
@@ -79,7 +84,8 @@ uncompressed data.
 
    Clzip uses the same well-defined exit status values used by lzip and
 bzip2, which makes it safer than compressors returning ambiguous warning
-values (like gzip) when it is used as a back end for tar or zutils.
+values (like gzip) when it is used as a back end for other programs like
+tar or zutils.
 
    The amount of memory required for compression is about 1 or 2 times
 the dictionary size limit (1 if input file size is less than dictionary
@@ -540,13 +546,13 @@ Concept index
 
 Tag Table:
 Node: Top210
-Node: Introduction917
-Node: Algorithm5824
-Node: Invoking clzip8630
-Node: File format14227
-Node: Examples16732
-Node: Problems18701
-Node: Concept index19227
+Node: Introduction896
+Node: Algorithm6095
+Node: Invoking clzip8901
+Node: File format14498
+Node: Examples17003
+Node: Problems18972
+Node: Concept index19498
 
 End Tag Table
 
diff --git a/doc/clzip.texi b/doc/clzip.texi
index 5f4e8ca..1640d18 100644
--- a/doc/clzip.texi
+++ b/doc/clzip.texi
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 30 June 2014
-@set VERSION 1.6-rc1
+@set UPDATED 28 August 2014
+@set VERSION 1.6
 
 @dircategory Data Compression
 @direntry
@@ -45,7 +45,7 @@ This manual is for Clzip (version @value{VERSION}, @value{UPDATED}).
 @end menu
 
 @sp 1
-Copyright @copyright{} 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
+Copyright @copyright{} 2010-2014 Antonio Diaz Diaz.
 
 This manual is free documentation: you have unlimited permission
 to copy, distribute and modify it.
@@ -59,7 +59,7 @@ Clzip is a lossless data compressor with a user interface similar to the
 one of gzip or bzip2. Clzip decompresses almost as fast as gzip,
 compresses most files more than bzip2, and is better than both from a
 data recovery perspective. Clzip is a clean implementation of the LZMA
-(Lempel-Ziv-Markov chain-Algorithm) algorithm.
+(Lempel-Ziv-Markov chain-Algorithm) "algorithm".
 
 Clzip uses the lzip file format; the files produced by clzip are fully
 compatible with lzip-1.4 or newer, and can be rescued with lziprecover.
@@ -90,6 +90,11 @@ Additionally lzip is copylefted, which guarantees that it will remain
 free forever.
 @end itemize
 
+A nice feature of the lzip format is that a corrupt byte is easier to
+repair the nearer it is from the beginning of the file. Therefore, with
+the help of lziprecover, losing an entire archive just because of a
+corrupt byte near the beginning is a thing of the past.
+
 The member trailer stores the 32-bit CRC of the original data, the size
 of the original data and the size of the member. These values, together
 with the value remaining in the range decoder and the end-of-stream
@@ -103,7 +108,8 @@ wrong. It can't help you recover the original uncompressed data.
 
 Clzip uses the same well-defined exit status values used by lzip and
 bzip2, which makes it safer than compressors returning ambiguous warning
-values (like gzip) when it is used as a back end for tar or zutils.
+values (like gzip) when it is used as a back end for other programs like
+tar or zutils.
 
 The amount of memory required for compression is about 1 or 2 times the
 dictionary size limit (1 if input file size is less than dictionary size
diff --git a/encoder.c b/encoder.c
index 41c18ae..e98b71d 100644
--- a/encoder.c
+++ b/encoder.c
@@ -1,5 +1,5 @@
 /*  Clzip - LZMA lossless data compressor
-    Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
+    Copyright (C) 2010-2014 Antonio Diaz Diaz.
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/encoder.h b/encoder.h
index 65c4403..75b6988 100644
--- a/encoder.h
+++ b/encoder.h
@@ -1,5 +1,5 @@
 /*  Clzip - LZMA lossless data compressor
-    Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
+    Copyright (C) 2010-2014 Antonio Diaz Diaz.
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/lzip.h b/lzip.h
index a10f43e..c4c7525 100644
--- a/lzip.h
+++ b/lzip.h
@@ -1,5 +1,5 @@
 /*  Clzip - LZMA lossless data compressor
-    Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
+    Copyright (C) 2010-2014 Antonio Diaz Diaz.
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/main.c b/main.c
index c8c5ab3..fdecac2 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,5 @@
 /*  Clzip - LZMA lossless data compressor
-    Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
+    Copyright (C) 2010-2014 Antonio Diaz Diaz.
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/testsuite/check.sh b/testsuite/check.sh
index 8215129..574022c 100755
--- a/testsuite/check.sh
+++ b/testsuite/check.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # check script for Clzip - LZMA lossless data compressor
-# Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
+# Copyright (C) 2010-2014 Antonio Diaz Diaz.
 #
 # This script is free software: you have unlimited permission
 # to copy, distribute and modify it.