lzip/lziprecover
1
0
Fork 0
Code Issues Activity

Adding upstream version 1.13.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-21 10:13:11 +01:00
parent 7fe0f13dd3
commit f9853ec595
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
21 changed files with 720 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

13
merge.cc
View file

@ -1,5 +1,5 @@
/* Lziprecover - Data recovery tool for lzipped files
Copyright (C) 2009, 2010, 2011 Antonio Diaz Diaz.
Copyright (C) 2009, 2010, 2011, 2012 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
@ -102,7 +102,7 @@ bool copy_and_diff_file( const std::vector< int > & infd_vector,
}
int ipow( const unsigned int base, const unsigned int exponent ) throw()
int ipow( const unsigned int base, const unsigned int exponent )
{
int result = 1;
for( unsigned int i = 0; i < exponent; ++i )
@ -142,13 +142,14 @@ int open_input_files( const std::vector< std::string > & filenames,
if( tmp < 0 )
{
if( verbosity >= 0 )
std::fprintf( stderr, "File `%s' is not seekable.\n", filenames[i].c_str() );
std::fprintf( stderr, "File '%s' is not seekable.\n", filenames[i].c_str() );
return 1;
}
if( i == 0 )
{
isize = tmp;
if( isize < min_member_size ) { show_error( "Input file is too short." ); return 2; }
if( isize < min_member_size )
{ show_error( "Input file is too short." ); return 2; }
}
else if( isize != tmp )
{ show_error( "Sizes of input files are different." ); return 1; }
@ -165,7 +166,7 @@ int open_input_files( const std::vector< std::string > & filenames,
if( try_decompress( infd_vector[i], isize ) )
{
if( verbosity >= 1 )
std::printf( "File `%s' has no errors. Recovery is not needed.\n",
std::printf( "File '%s' has no errors. Recovery is not needed.\n",
filenames[i].c_str() );
return 0;
}
@ -179,7 +180,7 @@ int open_input_files( const std::vector< std::string > & filenames,
void cleanup_and_fail( const std::string & output_filename,
const int outfd, const int retval ) throw()
const int outfd, const int retval )
{
if( outfd >= 0 ) close( outfd );
if( std::remove( output_filename.c_str() ) != 0 && errno != ENOENT )