summaryrefslogtreecommitdiffstats
path: root/repair.cc
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2016-05-20 06:54:39 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2016-05-20 06:55:18 +0000
commit07c2a71a11edd637f0ec9b42b5c5621980c96562 (patch)
treeffe015da89db655e2f4edbabd6924e41b3971f02 /repair.cc
parentAdding debian version 1.18~pre2-1. (diff)
downloadlziprecover-07c2a71a11edd637f0ec9b42b5c5621980c96562.tar.xz
lziprecover-07c2a71a11edd637f0ec9b42b5c5621980c96562.zip
Merging upstream version 1.18.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'repair.cc')
-rw-r--r--repair.cc182
1 files changed, 117 insertions, 65 deletions
diff --git a/repair.cc b/repair.cc
index e8588e3..98a43a4 100644
--- a/repair.cc
+++ b/repair.cc
@@ -1,5 +1,5 @@
/* Lziprecover - Data recovery tool for the lzip format
- Copyright (C) 2009-2015 Antonio Diaz Diaz.
+ Copyright (C) 2009-2016 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
@@ -17,6 +17,7 @@
#define _FILE_OFFSET_BITS 64
+#include <algorithm>
#include <cerrno>
#include <climits>
#include <cstdio>
@@ -45,8 +46,7 @@ bool gross_damage( const long long msize, const uint8_t * const mbuffer )
{
const uint8_t byte = mbuffer[i];
int len = 0; // does not count the first byte
- while( mbuffer[++i] == byte && ++len < maxlen ) {}
- if( len >= maxlen ) return true;
+ while( mbuffer[++i] == byte ) if( ++len >= maxlen ) return true;
}
return false;
}
@@ -60,15 +60,55 @@ int seek_write( const int fd, const uint8_t * const buf, const int size,
return 0;
}
+
+// Return value: 0 = no change, 5 = repaired pos
+int repair_dictionary_size( const long long msize, uint8_t * const mbuffer )
+ {
+ enum { dictionary_size_9 = 1 << 25 }; // dictionary size of option -9
+ File_header & header = *(File_header *)mbuffer;
+ unsigned dictionary_size = header.dictionary_size();
+ File_trailer & trailer =
+ *(File_trailer *)( mbuffer + msize - File_trailer::size );
+ const unsigned long long data_size = trailer.data_size();
+ const bool valid_ds = isvalid_ds( dictionary_size );
+ if( valid_ds && dictionary_size >= data_size ) return 0; // can't be bad
+
+ if( !valid_ds || dictionary_size < dictionary_size_9 )
+ {
+ dictionary_size =
+ std::min( data_size, (unsigned long long)dictionary_size_9 );
+ if( dictionary_size < min_dictionary_size )
+ dictionary_size = min_dictionary_size;
+ LZ_mtester mtester( mbuffer, msize, dictionary_size );
+ const int result = mtester.test_member();
+ if( result == 0 )
+ { header.dictionary_size( dictionary_size ); return 5; } // fix DS
+ if( result != 1 || mtester.max_distance() <= dictionary_size ||
+ mtester.max_distance() > max_dictionary_size ) return 0;
+ }
+ if( data_size > dictionary_size_9 )
+ {
+ dictionary_size =
+ std::min( data_size, (unsigned long long)max_dictionary_size );
+ LZ_mtester mtester( mbuffer, msize, dictionary_size );
+ if( mtester.test_member() == 0 )
+ { header.dictionary_size( dictionary_size ); return 5; } // fix DS
+ }
+ return 0;
+ }
+
+
// Return value: -1 = master failed, 0 = begin reached, >0 = repaired pos
long repair_member( const long long mpos, const long long msize,
uint8_t * const mbuffer, const long begin, const long end,
- const int verbosity )
+ const unsigned dictionary_size, const int verbosity )
{
for( long pos = end; pos >= begin && pos > end - 50000; )
{
const long min_pos = std::max( begin, pos - 100 );
- const LZ_mtester * master = prepare_master( mbuffer, msize, min_pos - 16 );
+ const unsigned long pos_limit = std::max( min_pos - 16, 0L );
+ const LZ_mtester * master =
+ prepare_master( mbuffer, msize, pos_limit, dictionary_size );
if( !master ) return -1;
for( ; pos >= min_pos; --pos )
{
@@ -93,10 +133,10 @@ long repair_member( const long long mpos, const long long msize,
int repair_file( const std::string & input_filename,
- const std::string & output_filename, const int verbosity,
- const bool force )
+ const std::string & default_output_filename,
+ const int verbosity, const bool force )
{
- struct stat in_stats; // not used
+ struct stat in_stats;
const int infd = open_instream( input_filename.c_str(), &in_stats, true, true );
if( infd < 0 ) return 1;
@@ -105,19 +145,21 @@ int repair_file( const std::string & input_filename,
if( file_index.retval() != 0 )
{ pp( file_index.error().c_str() ); return file_index.retval(); }
+ output_filename = default_output_filename.empty() ?
+ insert_fixed( input_filename ) : default_output_filename;
if( !force && file_exists( output_filename ) ) return 1;
- int outfd = -1;
+ outfd = -1;
for( long i = 0; i < file_index.members(); ++i )
{
const long long mpos = file_index.mblock( i ).pos();
const long long msize = file_index.mblock( i ).size();
if( !safe_seek( infd, mpos ) )
- cleanup_and_fail( output_filename, outfd, 1 );
+ cleanup_and_fail( 1 );
long long failure_pos = 0;
- if( try_decompress_member( infd, msize, &failure_pos ) ) continue;
- if( failure_pos < File_header::size )
+ if( test_member_from_file( infd, msize, &failure_pos ) ) continue;
+ if( failure_pos < File_header::size ) // End Of File
{ show_error( "Can't repair error in input file." );
- cleanup_and_fail( output_filename, outfd, 2 ); }
+ cleanup_and_fail( 2 ); }
if( verbosity >= 1 ) // damaged member found
{
@@ -128,38 +170,41 @@ int repair_file( const std::string & input_filename,
if( failure_pos >= msize - 8 ) failure_pos = msize - 8 - 1;
uint8_t * const mbuffer = read_member( infd, mpos, msize );
if( !mbuffer )
- cleanup_and_fail( output_filename, outfd, 1 );
+ cleanup_and_fail( 1 );
+ const File_header & header = *(File_header *)mbuffer;
+ const unsigned dictionary_size = header.dictionary_size();
long pos = 0;
if( !gross_damage( msize, mbuffer ) )
{
- pos = repair_member( mpos, msize, mbuffer, File_header::size + 1,
- File_header::size + 2, verbosity );
+ pos = repair_dictionary_size( msize, mbuffer );
+ if( pos == 0 )
+ pos = repair_member( mpos, msize, mbuffer, File_header::size + 1,
+ File_header::size + 5, dictionary_size, verbosity );
if( pos == 0 )
- pos = repair_member( mpos, msize, mbuffer, File_header::size + 3,
- failure_pos, verbosity );
+ pos = repair_member( mpos, msize, mbuffer, File_header::size + 6,
+ failure_pos, dictionary_size, verbosity );
}
if( pos < 0 )
- cleanup_and_fail( output_filename, outfd, 1 );
+ cleanup_and_fail( 1 );
if( pos > 0 )
{
if( outfd < 0 ) // first damaged member repaired
{
if( !safe_seek( infd, 0 ) ) return 1;
- outfd = open_outstream_rw( output_filename, true );
- if( outfd < 0 ) { close( infd ); return 1; }
+ if( !open_outstream( true, false ) ) { close( infd ); return 1; }
if( !copy_file( infd, outfd ) ) // copy whole file
- cleanup_and_fail( output_filename, outfd, 1 );
+ cleanup_and_fail( 1 );
}
if( seek_write( outfd, mbuffer + pos, 1, mpos + pos ) != 1 )
{ show_error( "Error writing output file", errno );
- cleanup_and_fail( output_filename, outfd, 1 ); }
+ cleanup_and_fail( 1 ); }
}
delete[] mbuffer;
if( verbosity >= 1 ) std::fputc( '\n', stdout );
if( pos == 0 )
{
show_error( "Can't repair input file. Error is probably larger than 1 byte." );
- cleanup_and_fail( output_filename, outfd, 2 );
+ cleanup_and_fail( 2 );
}
}
@@ -169,11 +214,7 @@ int repair_file( const std::string & input_filename,
std::fputs( "Input file has no errors. Recovery is not needed.\n", stdout );
return 0;
}
- if( close( outfd ) != 0 )
- {
- show_error( "Error closing output file", errno );
- cleanup_and_fail( output_filename, -1, 1 );
- }
+ if( close_outstream( &in_stats ) != 0 ) return 1;
if( verbosity >= 1 )
std::fputs( "Copy of input file repaired successfully.\n", stdout );
return 0;
@@ -203,6 +244,7 @@ int debug_delay( const std::string & input_filename, Block range,
if( !range.overlaps( mb ) ) continue;
const long long mpos = file_index.mblock( i ).pos();
const long long msize = file_index.mblock( i ).size();
+ const unsigned dictionary_size = file_index.dictionary_size( i );
if( verbosity >= 1 )
{
std::printf( "Finding max delay in member %ld of %ld (mpos = %llu, msize = %llu)\n",
@@ -216,7 +258,9 @@ int debug_delay( const std::string & input_filename, Block range,
long max_delay = 0;
while( pos < end )
{
- const LZ_mtester * master = prepare_master( mbuffer, msize, pos - 16 );
+ const unsigned long pos_limit = std::max( pos - 16, 0L );
+ const LZ_mtester * master =
+ prepare_master( mbuffer, msize, pos_limit, dictionary_size );
if( !master )
{ show_error( "Can't prepare master." ); return 1; }
const long partial_end = std::min( pos + 100, end );
@@ -232,7 +276,7 @@ int debug_delay( const std::string & input_filename, Block range,
{
++mbuffer[pos];
if( j == 255 ) break;
- long failure_pos;
+ long failure_pos = 0;
if( test_member_rest( *master, &failure_pos ) ) continue;
const long delay = failure_pos - pos;
if( delay > max_delay ) { max_delay = delay; value = mbuffer[pos]; }
@@ -279,7 +323,7 @@ int debug_repair( const std::string & input_filename, const long long bad_pos,
{
long long failure_pos = 0;
if( !safe_seek( infd, mpos ) ) return 1;
- if( !try_decompress_member( infd, msize, &failure_pos ) )
+ if( !test_member_from_file( infd, msize, &failure_pos ) )
{
if( verbosity >= 0 )
std::printf( "Member %ld of %ld already damaged (failure pos = %llu)\n",
@@ -289,22 +333,27 @@ int debug_repair( const std::string & input_filename, const long long bad_pos,
}
uint8_t * const mbuffer = read_member( infd, mpos, msize );
if( !mbuffer ) return 1;
+ const File_header & header = *(File_header *)mbuffer;
+ const unsigned dictionary_size = header.dictionary_size();
const uint8_t good_value = mbuffer[bad_pos-mpos];
mbuffer[bad_pos-mpos] = bad_value;
long failure_pos = 0;
- {
- const LZ_mtester * master = prepare_master( mbuffer, msize, 0 );
- if( !master )
- { show_error( "Can't prepare master." ); delete[] mbuffer; return 1; }
- if( test_member_rest( *master, &failure_pos ) )
+ if( bad_pos != 5 || isvalid_ds( header.dictionary_size() ) )
{
- if( verbosity >= 1 )
- std::fputs( "Member decompressed with no errors.\n", stdout );
+ const LZ_mtester * master =
+ prepare_master( mbuffer, msize, 0, header.dictionary_size() );
+ if( !master )
+ { show_error( "Can't prepare master." ); delete[] mbuffer; return 1; }
+ if( test_member_rest( *master, &failure_pos ) )
+ {
+ if( verbosity >= 1 )
+ std::fputs( "Member decompressed with no errors.\n", stdout );
+ delete master;
+ delete[] mbuffer;
+ return 0;
+ }
delete master;
- delete[] mbuffer;
- return 0;
}
- delete master;
if( verbosity >= 1 )
{
std::printf( "Test repairing member %ld of %ld (mpos = %llu, msize = %llu)\n"
@@ -313,13 +362,14 @@ int debug_repair( const std::string & input_filename, const long long bad_pos,
bad_pos, good_value, bad_value, mpos + failure_pos );
std::fflush( stdout );
}
- }
if( failure_pos >= msize ) failure_pos = msize - 1;
- long pos = repair_member( mpos, msize, mbuffer, File_header::size + 1,
- File_header::size + 2, verbosity );
+ long pos = repair_dictionary_size( msize, mbuffer );
if( pos == 0 )
- pos = repair_member( mpos, msize, mbuffer, File_header::size + 3,
- failure_pos, verbosity );
+ pos = repair_member( mpos, msize, mbuffer, File_header::size + 1,
+ File_header::size + 5, dictionary_size, verbosity );
+ if( pos == 0 )
+ pos = repair_member( mpos, msize, mbuffer, File_header::size + 6,
+ failure_pos, dictionary_size, verbosity );
delete[] mbuffer;
if( pos < 0 )
{ show_error( "Can't prepare master." ); return 1; }
@@ -331,11 +381,11 @@ int debug_repair( const std::string & input_filename, const long long bad_pos,
}
-int debug_show_packets( const std::string & input_filename,
- const long long bad_pos, const int verbosity,
- const uint8_t bad_value )
+int debug_decompress( const std::string & input_filename,
+ const long long bad_pos, const int verbosity,
+ const uint8_t bad_value, const bool show_packets )
{
- struct stat in_stats; // not used
+ struct stat in_stats;
const int infd = open_instream( input_filename.c_str(), &in_stats, true, true );
if( infd < 0 ) return 1;
@@ -344,45 +394,47 @@ int debug_show_packets( const std::string & input_filename,
if( file_index.retval() != 0 )
{ pp( file_index.error().c_str() ); return file_index.retval(); }
+ outfd = show_packets ? -1 : STDOUT_FILENO;
int retval = 0;
for( long i = 0; i < file_index.members(); ++i )
{
const long long dpos = file_index.dblock( i ).pos();
const long long mpos = file_index.mblock( i ).pos();
const long long msize = file_index.mblock( i ).size();
- if( verbosity >= 1 )
+ const unsigned dictionary_size = file_index.dictionary_size( i );
+ if( verbosity >= 1 && show_packets )
std::printf( "Decoding LZMA packets in member %ld of %ld (mpos = %llu, msize = %llu)\n"
" mpos dpos\n",
i + 1, file_index.members(), mpos, msize );
+ if( !isvalid_ds( dictionary_size ) )
+ { show_error( "Invalid dictionary size in member header." );
+ retval = 2; break; }
uint8_t * const mbuffer = read_member( infd, mpos, msize );
- if( !mbuffer ) return 1;
- const File_header & header = *(File_header *)mbuffer;
- const unsigned dictionary_size = header.dictionary_size();
- if( !header.verify_magic() || !header.verify_version() ||
- dictionary_size < min_dictionary_size ||
- dictionary_size > max_dictionary_size )
- { show_error( "Header error." ); return 2; }
+ if( !mbuffer ) { retval = 1; break; }
if( bad_pos >= 0 && file_index.mblock( i ).includes( bad_pos ) )
{
- if( verbosity >= 1 )
+ if( verbosity >= 1 && show_packets )
std::printf( "Byte at pos %llu changed from 0x%02X to 0x%02X\n",
bad_pos, mbuffer[bad_pos-mpos], bad_value );
mbuffer[bad_pos-mpos] = bad_value;
}
- LZ_mtester mtester( mbuffer, msize, dictionary_size );
- const int result = mtester.debug_decode_member( dpos, mpos, true );
+ LZ_mtester mtester( mbuffer, msize, dictionary_size, outfd );
+ const int result = mtester.debug_decode_member( dpos, mpos, show_packets );
delete[] mbuffer;
if( result != 0 )
{
- if( verbosity >= 0 && result <= 2 )
+ if( verbosity >= 0 && result <= 2 && show_packets )
std::printf( "%s at pos %llu\n", ( result == 2 ) ?
"File ends unexpectedly" : "Decoder error",
mpos + mtester.member_position() );
retval = 2; break;
}
- if( i + 1 < file_index.members() ) std::fputc( '\n', stdout );
+ if( i + 1 < file_index.members() && show_packets )
+ std::fputc( '\n', stdout );
}
- if( verbosity >= 1 ) std::fputs( "Done.\n", stdout );
+ retval = std::max( retval, close_outstream( &in_stats ) );
+ if( verbosity >= 1 && show_packets && retval == 0 )
+ std::fputs( "Done.\n", stdout );
return retval;
}