lzip/lziprecover
1
0
Fork 0
Code Issues Activity

Merging upstream version 1.25~rc1.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-21 11:33:25 +01:00
parent 1d67e88e3c
commit b8e73cb85f
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
39 changed files with 978 additions and 742 deletions
Download patch file Download diff file Expand all files Collapse all files

42
lunzcrash.cc
View file

@ -56,7 +56,7 @@ bool compare_member( const uint8_t * const mbuffer, const long msize,
{
MD5SUM md5sum;
LZ_mtester mtester( mbuffer, msize, dictionary_size, -1, &md5sum );
bool error = ( mtester.test_member() != 0 || !mtester.finished() );
bool error = mtester.test_member() != 0 || !mtester.finished();
if( !error )
{
md5_type new_digest;
@ -103,22 +103,23 @@ long next_pct_pos( const Lzip_index & lzip_index, const long i, const int pct,
/* Test 1-bit errors in LZMA streams in file.
Unless verbosity >= 1, print only the bytes with interesting results. */
int lunzcrash_bit( const char * const input_filename,
int lunzcrash_bit( const std::string & input_filename,
const Cl_options & cl_opts )
{
const char * const filename = input_filename.c_str();
struct stat in_stats; // not used
const int infd = open_instream( input_filename, &in_stats, false, true );
const int infd = open_instream( filename, &in_stats, false, true );
if( infd < 0 ) return 1;
const Lzip_index lzip_index( infd, cl_opts );
if( lzip_index.retval() != 0 )
{ show_file_error( input_filename, lzip_index.error().c_str() );
{ show_file_error( filename, lzip_index.error().c_str() );
return lzip_index.retval(); }
if( verbosity >= 2 ) printf( "Testing file '%s'\n", input_filename );
if( verbosity >= 2 ) printf( "Testing file '%s'\n", filename );
const long long cdata_size = lzip_index.cdata_size();
long positions = 0, decompressions = 0, successes = 0, failed_comparisons = 0;
int pct = ( cdata_size >= 1000 && isatty( STDERR_FILENO ) ) ? 0 : 100;
int pct = (cdata_size >= 1000 && isatty( STDERR_FILENO )) ? 0 : 100;
for( long i = 0; i < lzip_index.members(); ++i )
{
const long long mpos = lzip_index.mblock( i ).pos();
@ -127,8 +128,8 @@ int lunzcrash_bit( const char * const input_filename,
if( !mbuffer ) return 1;
const unsigned dictionary_size = lzip_index.dictionary_size( i );
md5_type md5_orig;
if( !check_member( mbuffer, msize, dictionary_size, input_filename,
md5_orig ) ) return 2;
if( !check_member( mbuffer, msize, dictionary_size, filename, md5_orig ) )
return 2;
long pct_pos = next_pct_pos( lzip_index, i, pct );
long pos = Lzip_header::size + 1, printed = 0; // last pos printed
const long end = msize - 20;
@ -224,22 +225,23 @@ int lunzcrash_bit( const char * const input_filename,
/* Test zeroed blocks of given size in LZMA streams in file.
Unless verbosity >= 1, print only the bytes with interesting results. */
int lunzcrash_block( const char * const input_filename,
int lunzcrash_block( const std::string & input_filename,
const Cl_options & cl_opts, const int sector_size )
{
const char * const filename = input_filename.c_str();
struct stat in_stats; // not used
const int infd = open_instream( input_filename, &in_stats, false, true );
const int infd = open_instream( filename, &in_stats, false, true );
if( infd < 0 ) return 1;
const Lzip_index lzip_index( infd, cl_opts );
if( lzip_index.retval() != 0 )
{ show_file_error( input_filename, lzip_index.error().c_str() );
{ show_file_error( filename, lzip_index.error().c_str() );
return lzip_index.retval(); }
if( verbosity >= 2 ) printf( "Testing file '%s'\n", input_filename );
if( verbosity >= 2 ) printf( "Testing file '%s'\n", filename );
const long long cdata_size = lzip_index.cdata_size();
long decompressions = 0, successes = 0, failed_comparisons = 0;
int pct = ( cdata_size >= 1000 && isatty( STDERR_FILENO ) ) ? 0 : 100;
int pct = (cdata_size >= 1000 && isatty( STDERR_FILENO )) ? 0 : 100;
uint8_t * const block = new uint8_t[sector_size];
for( long i = 0; i < lzip_index.members(); ++i )
{
@ -251,8 +253,8 @@ int lunzcrash_block( const char * const input_filename,
if( !mbuffer ) return 1;
const unsigned dictionary_size = lzip_index.dictionary_size( i );
md5_type md5_orig;
if( !check_member( mbuffer, msize, dictionary_size, input_filename,
md5_orig ) ) return 2;
if( !check_member( mbuffer, msize, dictionary_size, filename, md5_orig ) )
return 2;
long pct_pos = next_pct_pos( lzip_index, i, pct, sector_size );
long pos = Lzip_header::size + 1;
const long end = msize - sector_size - 20;
@ -344,7 +346,7 @@ int md5sum_files( const std::vector< std::string > & filenames )
for( unsigned i = 0; i < filenames.size(); ++i )
{
const bool from_stdin = ( filenames[i] == "-" );
const bool from_stdin = filenames[i] == "-";
if( from_stdin ) { if( stdin_used ) continue; else stdin_used = true; }
const char * const input_filename = filenames[i].c_str();
struct stat in_stats; // not used
@ -359,7 +361,8 @@ int md5sum_files( const std::vector< std::string > & filenames )
while( true )
{
const int len = readblock( infd, buffer, buffer_size );
if( len != buffer_size && errno ) throw Error( read_error_msg );
if( len != buffer_size && errno )
{ show_file_error( input_filename, read_error_msg, errno ); return 1; }
if( len > 0 ) md5sum.md5_update( buffer, len );
if( len < buffer_size ) break;
}
@ -367,10 +370,15 @@ int md5sum_files( const std::vector< std::string > & filenames )
if( close( infd ) != 0 )
{ show_file_error( input_filename, "Error closing input file", errno );
return 1; }
if( verbosity < 0 ) continue;
for( int i = 0; i < 16; ++i ) std::printf( "%02x", md5_digest[i] );
std::printf( " %s\n", input_filename );
std::fflush( stdout );
if( std::ferror( stdout ) ) break;
}
if( verbosity >= 0 && ( std::ferror( stdout ) || std::fclose( stdout ) != 0 ) )
{ show_file_error( "(stdout)", write_error_msg, errno );
set_retval( retval, 1 ); }
return retval;
}