Merging upstream version 1.25~rc1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 9 insertions, 2 deletions

diff --git a/lzip_index.h b/lzip_index.h
index 928a7c7..8d2ed1a 100644
--- a/lzip_index.h
+++ b/lzip_index.h
@@ -59,8 +59,7 @@ class Lzip_index
   bool check_header( const Lzip_header & header );
   void set_errno_error( const char * const msg );
   void set_num_error( const char * const msg, unsigned long long num );
-  bool read_header( const int fd, Lzip_header & header, const long long pos,
-                    const bool ignore_marking );
+  bool read_header( const int fd, Lzip_header & header, const long long pos );
   bool skip_trailing_data( const int fd, unsigned long long & pos,
                            const Cl_options & cl_opts );
 
@@ -72,6 +71,14 @@ public:
   int retval() const { return retval_; }
   unsigned dictionary_size() const { return dictionary_size_; }
 
+  bool multi_empty() const	// multimember file with empty member(s)
+    {
+    if( member_vector.size() > 1 )
+      for( unsigned long i = 0; i < member_vector.size(); ++i )
+        if( member_vector[i].dblock.size() == 0 ) return true;
+    return false;
+    }
+
   long long udata_size() const
     { if( member_vector.empty() ) return 0;
       return member_vector.back().dblock.end(); }