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

36
range_dec.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
@ -44,15 +44,15 @@ public:
const long long mp, const long long ms )
: dblock_( dp, ds ), mblock_( mp, ms ) {}
const Block & dblock() const throw() { return dblock_; }
Block & dblock() throw() { return dblock_; }
const Block & mblock() const throw() { return mblock_; }
Block & mblock() throw() { return mblock_; }
const Block & dblock() const { return dblock_; }
Block & dblock() { return dblock_; }
const Block & mblock() const { return mblock_; }
Block & mblock() { return mblock_; }
};
int seek_read( const int fd, uint8_t * const buf, const int size,
const long long pos ) throw()
const long long pos )
{
if( lseek( fd, pos, SEEK_SET ) == pos )
return readblock( fd, buf, size );
@ -95,30 +95,28 @@ public:
member_vector[i+1].dblock().pos( member_vector[i].dblock().end() );
}
long long data_end() const throw()
long long data_end() const
{ if( member_vector.size() ) return member_vector.back().dblock().end();
else return 0; }
const Member & member( const int i ) const throw()
{ return member_vector[i]; }
const Block & dblock( const int i ) const throw()
const Member & member( const int i ) const { return member_vector[i]; }
const Block & dblock( const int i ) const
{ return member_vector[i].dblock(); }
const Block & mblock( const int i ) const throw()
const Block & mblock( const int i ) const
{ return member_vector[i].mblock(); }
int members() const throw() { return (int)member_vector.size(); }
int members() const { return (int)member_vector.size(); }
};
// Returns the number of chars read, or 0 if error.
//
int parse_long_long( const char * const ptr, long long & value ) throw()
int parse_long_long( const char * const ptr, long long & value )
{
char * tail;
int c = 0;
errno = 0;
value = strtoll( ptr, &tail, 0 );
if( tail == ptr || errno ) return 0;
c = tail - ptr;
int c = tail - ptr;
if( ptr[c] )
{
@ -133,8 +131,8 @@ int parse_long_long( const char * const ptr, long long & value ) throw()
case 'T': exponent = 4; break;
case 'G': exponent = 3; break;
case 'M': exponent = 2; break;
case 'K': if( factor == 1024 ) exponent = 1; break;
case 'k': if( factor == 1000 ) exponent = 1; break;
case 'K': if( factor == 1024 ) exponent = 1; else return 0; break;
case 'k': if( factor == 1000 ) exponent = 1; else return 0; break;
}
if( exponent > 0 )
{
@ -154,7 +152,7 @@ int parse_long_long( const char * const ptr, long long & value ) throw()
// Recognized formats: <begin> <begin>-<end> <begin>,<size>
//
void parse_range( const char * const ptr, Block & range ) throw()
void parse_range( const char * const ptr, Block & range )
{
long long value = 0;
int c = parse_long_long( ptr, value ); // pos
@ -176,7 +174,7 @@ void parse_range( const char * const ptr, Block & range ) throw()
}
bool safe_seek( const int fd, const long long pos ) throw()
bool safe_seek( const int fd, const long long pos )
{
if( lseek( fd, pos, SEEK_SET ) == pos ) return true;
show_error( "Seek error", errno ); return false;