1
0
Fork 0

Merging upstream version 0.26.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-17 21:27:57 +01:00
parent 7185f44b62
commit 180f99b04d
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
44 changed files with 610 additions and 505 deletions

View file

@ -20,7 +20,7 @@
#include <cctype>
#include <cerrno>
#include <cstdio>
#include <stdint.h> // for lzlib.h
#include <stdint.h> // for lzlib.h
#include <unistd.h>
#include <lzlib.h>
@ -35,8 +35,7 @@
*/
int delete_members_lz( const Cl_options & cl_opts,
const Archive_descriptor & ad,
std::vector< char > & name_pending,
const int outfd )
std::vector< char > & name_pending, const int outfd )
{
Archive_reader_i ar( ad ); // indexed reader
Resizable_buffer rbuf;
@ -124,7 +123,8 @@ int delete_members_lz( const Cl_options & cl_opts,
if( istream_pos == 0 )
{ if( !safe_seek( outfd, size ) ) { retval = 1; goto done; } }
else if( !safe_seek( ad.infd, istream_pos ) ||
!copy_file( ad.infd, outfd, size ) ) { retval = 1; goto done; }
!copy_file( ad.infd, outfd, ad.namep, size ) )
{ retval = 1; goto done; }
}
istream_pos = ad.lzip_index.mblock( i ).end(); // member end
}