1
0
Fork 0

Merging upstream version 1.11.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-24 04:19:26 +01:00
parent 2b58741015
commit 648618884e
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
21 changed files with 727 additions and 631 deletions

View file

@ -1,5 +1,5 @@
/* Plzip - Massively parallel implementation of lzip
Copyright (C) 2009-2022 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
@ -16,13 +16,13 @@
*/
#ifndef INT64_MAX
#define INT64_MAX 0x7FFFFFFFFFFFFFFFLL
#define INT64_MAX 0x7FFFFFFFFFFFFFFFLL
#endif
class Block
{
long long pos_, size_; // pos + size <= INT64_MAX
long long pos_, size_; // pos >= 0, size >= 0, pos + size <= INT64_MAX
public:
Block( const long long p, const long long s ) : pos_( p ), size_( s ) {}
@ -43,9 +43,11 @@ class Lzip_index
Block dblock, mblock; // data block, member block
unsigned dictionary_size;
Member( const long long dp, const long long ds,
const long long mp, const long long ms, const unsigned dict_size )
: dblock( dp, ds ), mblock( mp, ms ), dictionary_size( dict_size ) {}
Member( const long long dpos, const long long dsize,
const long long mpos, const long long msize,
const unsigned dict_size )
: dblock( dpos, dsize ), mblock( mpos, msize ),
dictionary_size( dict_size ) {}
};
std::vector< Member > member_vector;
@ -55,16 +57,15 @@ class Lzip_index
unsigned dictionary_size_; // largest dictionary size in the file
bool bad_magic_; // bad magic in first header
bool check_header_error( const Lzip_header & header, const bool first );
bool check_header( const Lzip_header & header, const bool first );
void set_errno_error( const char * const msg );
void set_num_error( const char * const msg, unsigned long long num );
bool read_header( const int fd, Lzip_header & header, const long long pos );
bool skip_trailing_data( const int fd, unsigned long long & pos,
const bool ignore_trailing, const bool loose_trailing );
const Cl_options & cl_opts );
public:
Lzip_index( const int infd, const bool ignore_trailing,
const bool loose_trailing );
Lzip_index( const int infd, const Cl_options & cl_opts );
long members() const { return member_vector.size(); }
const std::string & error() const { return error_; }