1
0
Fork 0

Merging upstream version 1.24.

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

10
lzip.h
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
@ -309,7 +309,7 @@ struct Lzip_trailer
};
struct Cl_options // command line options
struct Cl_options // command-line options
{
bool ignore_empty;
bool ignore_errors;
@ -355,7 +355,6 @@ public:
bool overlaps( const long long pos, const long long size ) const
{ return pos_ < pos + size && pos < end(); }
void shift( Block & b ) { ++size_; ++b.pos_; --b.size_; }
Block split( const long long pos );
};
@ -479,12 +478,13 @@ int open_instream( const char * const name, struct stat * const in_statsp,
int open_truncable_stream( const char * const name,
struct stat * const in_statsp );
bool open_outstream( const bool force, const bool protect,
const bool rw = false, const bool skipping = true );
const bool rw = false, const bool skipping = true,
const bool to_file = false );
bool output_file_exists();
void cleanup_and_fail( const int retval );
bool check_tty_out();
void set_signal_handler();
int close_outstream( const struct stat * const in_statsp );
bool close_outstream( const struct stat * const in_statsp );
std::string insert_fixed( std::string name );
void show_2file_error( const char * const msg1, const char * const name1,
const char * const name2, const char * const msg2 );