Merging upstream version 1.6~rc1.

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

10 files changed, 61 insertions, 49 deletions

diff --git a/ChangeLog b/ChangeLog
index e881401..435a8d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-06  Antonio Diaz Diaz  <antonio@gnu.org>
+
+	* Version 1.6-rc1 released.
+	* Compression ratio of option -9 has been slightly increased.
+
 2014-04-25  Antonio Diaz Diaz  <antonio@gnu.org>
 
 	* Version 1.6-pre4 released.
@@ -6,7 +11,7 @@
 2014-03-30  Antonio Diaz Diaz  <antonio@gnu.org>
 
 	* Version 1.6-pre3 released.
-	* Compression ratio has been slightly increased.
+	* Compression ratio of option -9 has been slightly increased.
 	* configure: Added new option '--disable-static'.
 
 2014-01-30  Antonio Diaz Diaz  <antonio@gnu.org>
diff --git a/NEWS b/NEWS
index 260e7ca..7207515 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 Changes in version 1.6:
 
-Compression ratio has been slightly increased.
+Compression ratio of option -9 has been slightly increased.
 
 The configure script now accepts the option "--disable-static".
 
diff --git a/README b/README
index dc98c4f..caa8c2f 100644
--- a/README
+++ b/README
@@ -52,7 +52,7 @@ data, so the library should never crash even in case of corrupted input.
 There is no such thing as a "LZMA algorithm"; it is more like a "LZMA
 coding scheme". For example, the option '-0' of lzip uses the scheme in
 almost the simplest way possible; issuing the longest match it can find,
-or a literal byte if it can't find a match. Conversely, a much more
+or a literal byte if it can't find a match. Inversely, a much more
 elaborated way of finding coding sequences of minimum price than the one
 currently used by lzip could be developed, and the resulting sequence
 could also be coded using the LZMA coding scheme.
diff --git a/configure b/configure
index ca643ce..8bbcd17 100755
--- a/configure
+++ b/configure
@@ -6,7 +6,7 @@
 # to copy, distribute and modify it.
 
 pkgname=lzlib
-pkgversion=1.6-pre4
+pkgversion=1.6-rc1
 soversion=1
 progname=minilzip
 progname_static=${progname}
diff --git a/doc/lzlib.info b/doc/lzlib.info
index fc7289d..f7d548c 100644
--- a/doc/lzlib.info
+++ b/doc/lzlib.info
@@ -11,7 +11,7 @@ File: lzlib.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Lzlib Manual
 ************
 
-This manual is for Lzlib (version 1.6-pre4, 25 April 2014).
+This manual is for Lzlib (version 1.6-rc1, 6 May 2014).
 
 * Menu:
 
@@ -93,7 +93,7 @@ corrupted input.
    There is no such thing as a "LZMA algorithm"; it is more like a "LZMA
 coding scheme". For example, the option '-0' of lzip uses the scheme in
 almost the simplest way possible; issuing the longest match it can find,
-or a literal byte if it can't find a match. Conversely, a much more
+or a literal byte if it can't find a match. Inversely, a much more
 elaborated way of finding coding sequences of minimum price than the one
 currently used by lzip could be developed, and the resulting sequence
 could also be coded using the LZMA coding scheme.
@@ -761,18 +761,18 @@ Concept index
 
 Tag Table:
 Node: Top220
-Node: Introduction1333
-Node: Library version5247
-Node: Buffering5892
-Node: Parameter limits7015
-Node: Compression functions7974
-Node: Decompression functions14187
-Node: Error codes20348
-Node: Error messages22287
-Node: Data format22866
-Node: Examples25515
-Node: Problems29598
-Node: Concept index30170
+Node: Introduction1329
+Node: Library version5242
+Node: Buffering5887
+Node: Parameter limits7010
+Node: Compression functions7969
+Node: Decompression functions14182
+Node: Error codes20343
+Node: Error messages22282
+Node: Data format22861
+Node: Examples25510
+Node: Problems29593
+Node: Concept index30165
 
 End Tag Table
 
diff --git a/doc/lzlib.texi b/doc/lzlib.texi
index 24fceab..648dc52 100644
--- a/doc/lzlib.texi
+++ b/doc/lzlib.texi
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 25 April 2014
-@set VERSION 1.6-pre4
+@set UPDATED 6 May 2014
+@set VERSION 1.6-rc1
 
 @dircategory Data Compression
 @direntry
@@ -118,7 +118,7 @@ data, so the library should never crash even in case of corrupted input.
 There is no such thing as a "LZMA algorithm"; it is more like a "LZMA
 coding scheme". For example, the option '-0' of lzip uses the scheme in
 almost the simplest way possible; issuing the longest match it can find,
-or a literal byte if it can't find a match. Conversely, a much more
+or a literal byte if it can't find a match. Inversely, a much more
 elaborated way of finding coding sequences of minimum price than the one
 currently used by lzip could be developed, and the resulting sequence
 could also be coded using the LZMA coding scheme.
diff --git a/doc/minilzip.1 b/doc/minilzip.1
index c5dc015..369aae0 100644
--- a/doc/minilzip.1
+++ b/doc/minilzip.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH MINILZIP "1" "April 2014" "minilzip 1.6-pre4" "User Commands"
+.TH MINILZIP "1" "May 2014" "minilzip 1.6-rc1" "User Commands"
 .SH NAME
 minilzip \- reduces the size of files
 .SH SYNOPSIS
@@ -83,7 +83,7 @@ Report bugs to lzip\-bug@nongnu.org
 Lzlib home page: http://www.nongnu.org/lzip/lzlib.html
 .SH COPYRIGHT
 Copyright \(co 2014 Antonio Diaz Diaz.
-Using lzlib 1.6\-pre4
+Using lzlib 1.6\-rc1
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/encoder.h b/encoder.h
index 2a92228..996f83b 100644
--- a/encoder.h
+++ b/encoder.h
@@ -25,7 +25,7 @@
     Public License.
 */
 
-enum { max_num_trials = 1 << 12,
+enum { max_num_trials = 1 << 13,
        price_shift_bits = 6,
        price_step_bits = 2 };
 
@@ -654,12 +654,8 @@ struct LZ_encoder
   bool member_finished;
   };
 
-
 static inline bool LZe_member_finished( const struct LZ_encoder * const e )
-  {
-  return ( e->member_finished && !Cb_used_bytes( &e->renc.cb ) );
-  }
-
+  { return ( e->member_finished && !Cb_used_bytes( &e->renc.cb ) ); }
 
 static inline void LZe_free( struct LZ_encoder * const e )
   { Re_free( &e->renc ); }
diff --git a/lzlib.h b/lzlib.h
index 724c8e1..35675c1 100644
--- a/lzlib.h
+++ b/lzlib.h
@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-static const char * const LZ_version_string = "1.6-pre4";
+static const char * const LZ_version_string = "1.6-rc1";
 
 enum LZ_Errno { LZ_ok = 0,         LZ_bad_argument, LZ_mem_error,
                 LZ_sequence_error, LZ_header_error, LZ_unexpected_eof,
diff --git a/testsuite/check.sh b/testsuite/check.sh
index 0244c58..c4a5c4a 100755
--- a/testsuite/check.sh
+++ b/testsuite/check.sh
@@ -67,6 +67,36 @@ printf .
 cmp in copy || fail=1
 printf .
 
+cat "${in_lz}" > copy.lz || framework_failure
+printf "to be overwritten" > copy || framework_failure
+"${LZIP}" -df copy.lz || fail=1
+cmp in copy || fail=1
+printf .
+
+printf "to be overwritten" > copy || framework_failure
+"${LZIP}" -df -o copy < "${in_lz}" || fail=1
+cmp in copy || fail=1
+printf .
+
+"${LZIP}" -s16 < in > anyothername || fail=1
+"${LZIP}" -d anyothername || fail=1
+cmp in anyothername.out || fail=1
+printf .
+
+cat in in > in2 || framework_failure
+"${LZIP}" -s16 -o copy2 < in2 || fail=1
+"${LZIP}" -t copy2.lz || fail=1
+printf .
+"${LZIP}" -cd copy2.lz > copy2 || fail=1
+cmp in2 copy2 || fail=1
+printf .
+
+printf "garbage" >> copy2.lz || framework_failure
+printf "to be overwritten" > copy2 || framework_failure
+"${LZIP}" -df copy2.lz || fail=1
+cmp in2 copy2 || fail=1
+printf .
+
 "${LZIP}" -cfq "${in_lz}" > out
 if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
 "${LZIP}" -cF -s16 "${in_lz}" > out || fail=1
@@ -105,25 +135,6 @@ for i in s4Ki 0 1 2 3 4 5 6 7 8 9 ; do
 done
 printf .
 
-"${LZIP}" -s16 < in > anyothername || fail=1
-"${LZIP}" -d anyothername || fail=1
-cmp in anyothername.out || fail=1
-printf .
-
-cat in in > in2 || framework_failure
-"${LZIP}" -s16 -o copy2 < in2 || fail=1
-"${LZIP}" -t copy2.lz || fail=1
-printf .
-"${LZIP}" -cd copy2.lz > copy2 || fail=1
-cmp in2 copy2 || fail=1
-printf .
-
-printf "garbage" >> copy2.lz || framework_failure
-printf "to be overwritten" > copy2 || framework_failure
-"${LZIP}" -df copy2.lz || fail=1
-cmp in2 copy2 || fail=1
-printf .
-
 "${BBEXAMPLE}" in || fail=1
 "${BBEXAMPLE}" out || fail=1
 printf .