1
0
Fork 0

Merging upstream version 1.24.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-21 11:32:42 +01:00
parent cefe4620fe
commit bbed90a132
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
35 changed files with 910 additions and 848 deletions

View file

@ -1,5 +1,5 @@
/* Lziprecover - Data recovery tool for the lzip format
Copyright (C) 2009-2023 Antonio Diaz Diaz.
Copyright (C) 2009-2024 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
@ -81,7 +81,7 @@ public:
int read_header_carefully( Lzip_header & header, const bool ignore_errors )
{
int sz = 0;
while( sz < Lzip_header::size && !finished() )
while( sz < header.size && !finished() )
{
header.data[sz] = buffer[pos];
if( ignore_errors &&
@ -100,7 +100,7 @@ public:
if( buffer[pos] != lzip_magic[0] ) { ++pos; continue; }
reset_member_position();
Lzip_header h;
if( read_header_carefully( h, true ) == Lzip_header::size )
if( read_header_carefully( h, true ) == header.size )
{ header = h; return true; }
}
return false;
@ -381,6 +381,7 @@ public:
unsigned crc() const { return crc_ ^ 0xFFFFFFFFU; }
unsigned long long data_position() const { return partial_data_pos + pos; }
int decode_member( const Pretty_print & pp, const bool ignore_empty = true,
const bool ignore_marking = true );
int decode_member( const Cl_options & cl_opts, const Pretty_print & pp );
int decode_member()
{ return decode_member( Cl_options(), Pretty_print( "" ) ); }
};