Merging upstream version 1.0~rc3.

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

1 files changed, 45 insertions, 39 deletions

diff --git a/decoder.c b/decoder.c
index 20799a3..0d00219 100644
--- a/decoder.c
+++ b/decoder.c
@@ -28,15 +28,18 @@
 #include "decoder.h"
 
 
-bool Ib_read_block( struct Input_buffer * const ibuf )
+bool Rd_read_block( struct Range_decoder * const rdec )
   {
-  if( ibuf->at_stream_end ) return false;
-  ibuf->stream_pos = readblock( ibuf->infd_, ibuf->buffer, Ib_buffer_size );
-  if( ibuf->stream_pos != Ib_buffer_size && errno )
-    { show_error( "read error", errno, false ); cleanup_and_fail( 1 ); }
-  ibuf->pos = 0;
-  ibuf->at_stream_end = ( ibuf->stream_pos < Ib_buffer_size );
-  return !Ib_finished( ibuf );
+  if( !rdec->at_stream_end )
+    {
+    rdec->stream_pos = readblock( rdec->infd_, rdec->buffer, Rd_buffer_size );
+    if( rdec->stream_pos != Rd_buffer_size && errno )
+      { show_error( "read error", errno, false ); cleanup_and_fail( 1 ); }
+    rdec->at_stream_end = ( rdec->stream_pos < Rd_buffer_size );
+    rdec->partial_member_pos += rdec->pos;
+    rdec->pos = 0;
+    }
+  return !Rd_finished( rdec );
   }
 
 
@@ -59,13 +62,15 @@ void LZd_flush_data( struct LZ_decoder * const decoder )
 bool LZd_verify_trailer( struct LZ_decoder * const decoder,
                          struct Pretty_print * const pp )
   {
-  bool error = false;
   File_trailer trailer;
-  const int trailer_size = Ft_size( decoder->format_version );
+  const int trailer_size = Ft_versioned_size( decoder->format_version );
+  const long long member_size = LZd_member_position( decoder ) + trailer_size;
+  bool error = false;
+
   for( int i = 0; i < trailer_size && !error; ++i )
     {
-    if( !Rd_finished( &decoder->range_decoder ) )
-      trailer[i] = Rd_get_byte( &decoder->range_decoder );
+    if( !Rd_finished( decoder->range_decoder ) )
+      trailer[i] = Rd_get_byte( decoder->range_decoder );
     else
       {
       error = true;
@@ -73,13 +78,13 @@ bool LZd_verify_trailer( struct LZ_decoder * const decoder,
         {
         Pp_show_msg( pp, 0 );
         fprintf( stderr, "trailer truncated at trailer position %d;"
-                 " some checks may fail.\n", i );
+                         " some checks may fail.\n", i );
         }
+      for( ; i < trailer_size; ++i ) trailer[i] = 0;
       }
     }
-  if( decoder->format_version == 0 )
-    Ft_set_member_size( trailer, LZd_member_position( decoder ) );
-  if( !Rd_code_is_zero( &decoder->range_decoder ) )
+  if( decoder->format_version == 0 ) Ft_set_member_size( trailer, member_size );
+  if( !Rd_code_is_zero( decoder->range_decoder ) )
     {
     error = true;
     if( verbosity >= 0 )
@@ -105,18 +110,18 @@ bool LZd_verify_trailer( struct LZ_decoder * const decoder,
     if( verbosity >= 0 )
       {
       Pp_show_msg( pp, 0 );
-      fprintf( stderr, "data size mismatch; trailer says %lld, data size is %lld.\n",
-               Ft_get_data_size( trailer ), LZd_data_position( decoder ) );
+      fprintf( stderr, "data size mismatch; trailer says %lld, data size is %lld (0x%llX).\n",
+               Ft_get_data_size( trailer ), LZd_data_position( decoder ), LZd_data_position( decoder ) );
       }
     }
-  if( Ft_get_member_size( trailer ) != LZd_member_position( decoder ) )
+  if( Ft_get_member_size( trailer ) != member_size )
     {
     error = true;
     if( verbosity >= 0 )
       {
       Pp_show_msg( pp, 0 );
-      fprintf( stderr, "member size mismatch; trailer says %lld, member size is %lld.\n",
-               Ft_get_member_size( trailer ), LZd_member_position( decoder ) );
+      fprintf( stderr, "member size mismatch; trailer says %lld, member size is %lld (0x%llX).\n",
+               Ft_get_member_size( trailer ), member_size, member_size );
       }
     }
   if( !error && verbosity >= 3 )
@@ -137,41 +142,42 @@ int LZd_decode_member( struct LZ_decoder * const decoder,
   unsigned int rep2 = 0;	// repeated distances
   unsigned int rep3 = 0;
   State state = 0;
+  Rd_load( decoder->range_decoder );
 
   while( true )
     {
-    if( Rd_finished( &decoder->range_decoder ) )
+    if( Rd_finished( decoder->range_decoder ) )
       { LZd_flush_data( decoder ); return 2; }
     const int pos_state = LZd_data_position( decoder ) & pos_state_mask;
-    if( Rd_decode_bit( &decoder->range_decoder, &decoder->bm_match[state][pos_state] ) == 0 )
+    if( Rd_decode_bit( decoder->range_decoder, &decoder->bm_match[state][pos_state] ) == 0 )
       {
       const uint8_t prev_byte = LZd_get_byte( decoder, 0 );
       if( St_is_char( state ) )
-        LZd_put_byte( decoder, Lid_decode( &decoder->literal_decoder, &decoder->range_decoder, prev_byte ) );
+        LZd_put_byte( decoder, Lid_decode( &decoder->literal_decoder, decoder->range_decoder, prev_byte ) );
       else
-        LZd_put_byte( decoder, Lid_decode_matched( &decoder->literal_decoder, &decoder->range_decoder, prev_byte,
+        LZd_put_byte( decoder, Lid_decode_matched( &decoder->literal_decoder, decoder->range_decoder, prev_byte,
                              LZd_get_byte( decoder, rep0 ) ) );
       St_set_char( &state );
       }
     else
       {
       int len;
-      if( Rd_decode_bit( &decoder->range_decoder, &decoder->bm_rep[state] ) == 1 )
+      if( Rd_decode_bit( decoder->range_decoder, &decoder->bm_rep[state] ) == 1 )
         {
         len = 0;
-        if( Rd_decode_bit( &decoder->range_decoder, &decoder->bm_rep0[state] ) == 0 )
+        if( Rd_decode_bit( decoder->range_decoder, &decoder->bm_rep0[state] ) == 0 )
           {
-          if( Rd_decode_bit( &decoder->range_decoder, &decoder->bm_len[state][pos_state] ) == 0 )
+          if( Rd_decode_bit( decoder->range_decoder, &decoder->bm_len[state][pos_state] ) == 0 )
             { len = 1; St_set_short_rep( &state ); }
           }
         else
           {
           unsigned int distance;
-          if( Rd_decode_bit( &decoder->range_decoder, &decoder->bm_rep1[state] ) == 0 )
+          if( Rd_decode_bit( decoder->range_decoder, &decoder->bm_rep1[state] ) == 0 )
             distance = rep1;
           else
             {
-            if( Rd_decode_bit( &decoder->range_decoder, &decoder->bm_rep2[state] ) == 0 )
+            if( Rd_decode_bit( decoder->range_decoder, &decoder->bm_rep2[state] ) == 0 )
               distance = rep2;
             else { distance = rep3; rep3 = rep2; }
             rep2 = rep1;
@@ -181,30 +187,30 @@ int LZd_decode_member( struct LZ_decoder * const decoder,
           }
         if( len == 0 )
           {
-          len = min_match_len + Led_decode( &decoder->rep_match_len_decoder, &decoder->range_decoder, pos_state );
+          len = min_match_len + Led_decode( &decoder->rep_match_len_decoder, decoder->range_decoder, pos_state );
           St_set_rep( &state );
           }
         }
       else
         {
         unsigned int rep0_saved = rep0;
-        len = min_match_len + Led_decode( &decoder->len_decoder, &decoder->range_decoder, pos_state );
-        const int dis_slot = Rd_decode_tree( &decoder->range_decoder, decoder->bm_dis_slot[get_dis_state(len)], dis_slot_bits );
+        len = min_match_len + Led_decode( &decoder->len_decoder, decoder->range_decoder, pos_state );
+        const int dis_slot = Rd_decode_tree( decoder->range_decoder, decoder->bm_dis_slot[get_dis_state(len)], dis_slot_bits );
         if( dis_slot < start_dis_model ) rep0 = dis_slot;
         else
           {
           const int direct_bits = ( dis_slot >> 1 ) - 1;
           rep0 = ( 2 | ( dis_slot & 1 ) ) << direct_bits;
           if( dis_slot < end_dis_model )
-            rep0 += Rd_decode_tree_reversed( &decoder->range_decoder, decoder->bm_dis + rep0 - dis_slot, direct_bits );
+            rep0 += Rd_decode_tree_reversed( decoder->range_decoder, decoder->bm_dis + rep0 - dis_slot, direct_bits );
           else
             {
-            rep0 += Rd_decode( &decoder->range_decoder, direct_bits - dis_align_bits ) << dis_align_bits;
-            rep0 += Rd_decode_tree_reversed( &decoder->range_decoder, decoder->bm_align, dis_align_bits );
-            if( rep0 == 0xFFFFFFFF )		// Marker found
+            rep0 += Rd_decode( decoder->range_decoder, direct_bits - dis_align_bits ) << dis_align_bits;
+            rep0 += Rd_decode_tree_reversed( decoder->range_decoder, decoder->bm_align, dis_align_bits );
+            if( rep0 == 0xFFFFFFFFU )		// Marker found
               {
               rep0 = rep0_saved;
-              Rd_normalize( &decoder->range_decoder );
+              Rd_normalize( decoder->range_decoder );
               LZd_flush_data( decoder );
               if( len == min_match_len )	// End Of Stream marker
                 {
@@ -212,7 +218,7 @@ int LZd_decode_member( struct LZ_decoder * const decoder,
                 }
               if( len == min_match_len + 1 )	// Sync Flush marker
                 {
-                Rd_reload( &decoder->range_decoder ); continue;
+                Rd_load( decoder->range_decoder ); continue;
                 }
               if( verbosity >= 0 )
                 {