lzip/tarlz
1
0
Fork 0
Code Issues Activity

Merging upstream version 0.27.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-03-04 07:39:30 +01:00
parent 619358407d
commit 5e422e043e
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
83 changed files with 980 additions and 726 deletions
Download patch file Download diff file Expand all files Collapse all files

28
create_lz.cc
View file

@ -1,5 +1,5 @@
/* Tarlz - Archiver with multimember lzip compression
Copyright (C) 2013-2024 Antonio Diaz Diaz.
Copyright (C) 2013-2025 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
@ -250,7 +250,7 @@ public:
};
// send one ipacket with tar member metadata to courier
// send one ipacket with tar member metadata to courier and print filename
int add_member_lz( const char * const filename, const struct stat *,
const int flag, struct FTW * )
{
@ -300,26 +300,10 @@ extern "C" void * grouper( void * arg )
for( int i = 0; i < cl_opts.parser.arguments(); ++i ) // parse command line
{
const int code = cl_opts.parser.code( i );
const std::string & arg = cl_opts.parser.argument( i );
const char * filename = arg.c_str();
if( code == 'C' && chdir( filename ) != 0 )
{ show_file_error( filename, chdir_msg, errno ); exit_fail_mt(); }
if( code ) continue; // skip options
if( cl_opts.parser.argument( i ).empty() ) continue; // skip empty names
std::string deslashed; // arg without trailing slashes
unsigned len = arg.size();
while( len > 1 && arg[len-1] == '/' ) --len;
if( len < arg.size() )
{ deslashed.assign( arg, 0, len ); filename = deslashed.c_str(); }
if( Exclude::excluded( filename ) ) continue; // skip excluded files
struct stat st;
if( lstat( filename, &st ) != 0 ) // filename from command line
{ show_file_error( filename, cant_stat, errno ); set_error_status( 1 ); }
else if( nftw( filename, add_member_lz, 16,
cl_opts.dereference ? 0 : FTW_PHYS ) != 0 )
exit_fail_mt(); // write error or OOM
else if( cl_opts.solidity == dsolid ) // end of group
const int ret = parse_cl_arg( cl_opts, i, add_member_lz );
if( ret == 0 ) continue; // skip arg
if( ret == 1 ) exit_fail_mt(); // error
if( cl_opts.solidity == dsolid ) // end of group
courier.receive_packet( new Ipacket );
}