lzip/lziprecover
1
0
Fork 0
Code Issues Activity

Merging upstream version 1.24.

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

35
range_dec.cc
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
@ -35,14 +35,13 @@
namespace {
bool decompress_member( const int infd, const Pretty_print & pp,
const unsigned long long mpos,
const unsigned long long outskip,
const unsigned long long outend )
bool decompress_member( const int infd, const Cl_options & cl_opts,
const Pretty_print & pp, const unsigned long long mpos,
const unsigned long long outskip, const unsigned long long outend )
{
Range_decoder rdec( infd );
Lzip_header header;
rdec.read_data( header.data, Lzip_header::size );
rdec.read_data( header.data, header.size );
if( rdec.finished() ) // End Of File
{ pp( "File ends unexpectedly at member header." ); return false; }
if( !header.check_magic() ) { pp( bad_magic_msg ); return false; }
@ -54,7 +53,7 @@ bool decompress_member( const int infd, const Pretty_print & pp,
if( verbosity >= 2 ) pp();
LZ_decoder decoder( rdec, dictionary_size, outfd, outskip, outend );
const int result = decoder.decode_member( pp );
const int result = decoder.decode_member( cl_opts, pp );
if( result != 0 )
{
if( verbosity >= 0 && result <= 2 )
@ -86,23 +85,23 @@ const char * format_num( unsigned long long num,
unsigned long long limit,
const int set_prefix )
{
const char * const si_prefix[8] =
{ "k", "M", "G", "T", "P", "E", "Z", "Y" };
const char * const binary_prefix[8] =
{ "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi", "Yi" };
enum { buffers = 8, bufsize = 32 };
enum { buffers = 8, bufsize = 32, n = 10 };
const char * const si_prefix[n] =
{ "k", "M", "G", "T", "P", "E", "Z", "Y", "R", "Q" };
const char * const binary_prefix[n] =
{ "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi", "Yi", "Ri", "Qi" };
static char buffer[buffers][bufsize]; // circle of static buffers for printf
static int current = 0;
static bool si = true;
if( set_prefix ) si = ( set_prefix > 0 );
unsigned long long den = 1;
const unsigned factor = ( si ? 1000 : 1024 );
const unsigned factor = si ? 1000 : 1024;
char * const buf = buffer[current++]; current %= buffers;
const char * const * prefix = ( si ? si_prefix : binary_prefix );
const char * const * prefix = si ? si_prefix : binary_prefix;
const char * p = "";
for( int i = 0; i < 8 && num / den >= factor && den * factor > den; ++i )
for( int i = 0; i < n && num / den >= factor && den * factor > den; ++i )
{ if( num / den <= limit && num % ( den * factor ) != 0 ) break;
den *= factor; p = prefix[i]; }
if( num % den == 0 )
@ -150,7 +149,7 @@ int range_decompress( const std::string & input_filename,
{
output_filename = default_output_filename;
set_signal_handler();
if( !open_outstream( force, true, false, false ) ) return 1;
if( !open_outstream( force, true, false, false, true ) ) return 1;
}
if( verbosity >= 1 )
@ -172,7 +171,7 @@ int range_decompress( const std::string & input_filename,
const long long outend = std::min( db.size(), range.end() - db.pos() );
const long long mpos = lzip_index.mblock( i ).pos();
if( !safe_seek( infd, mpos, filename ) ) cleanup_and_fail( 1 );
if( !decompress_member( infd, pp, mpos, outskip, outend ) )
if( !decompress_member( infd, cl_opts, pp, mpos, outskip, outend ) )
{ if( cl_opts.ignore_errors ) error = true; else cleanup_and_fail( 2 ); }
pp.reset();
}
@ -180,7 +179,7 @@ int range_decompress( const std::string & input_filename,
if( close( infd ) != 0 )
{ show_file_error( filename, "Error closing input file", errno );
cleanup_and_fail( 1 ); }
if( close_outstream( &in_stats ) != 0 ) cleanup_and_fail( 1 );
if( !close_outstream( &in_stats ) ) cleanup_and_fail( 1 );
if( verbosity >= 2 && !error )
std::fputs( "Byte range decompressed successfully.\n", stderr );
return 0; // either no error or ignored