lzip/zutils
1
0
Fork 0
Code Issues Activity

Merging upstream version 0.9~rc1.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-24 05:04:40 +01:00
parent 4f4c7c8781
commit 6503461316
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
19 changed files with 126 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ztest.cc
View file

@ -60,23 +60,16 @@ int ztest_stdin( const int infd,
argv[ztest_args.size()+2] = 0;
execvp( argv[0], (char **)argv );
}
if( verbosity >= 0 )
std::fprintf( stderr, "%s: Can't exec `%s': %s.\n",
util_name, file_type.c_str(), std::strerror( errno ) );
show_exec_error( file_type.c_str() );
_exit( 1 );
}
// parent
if( pid < 0 )
{
if( verbosity >= 0 )
std::fprintf( stderr, "%s: Can't fork `%s': %s.\n",
util_name, file_type.c_str(), std::strerror( errno ) );
return 1;
}
{ show_fork_error( file_type.c_str() ); return 1; }
close( fda[0] );
if( !feed_data( infd, fda[1], magic_data, magic_size ) ) return 1;
if( close( fda[1] ) != 0 )
{ show_error( "Can't close output of data feeder", errno ); return 1; }
{ show_close_error( "data feeder" ); return 1; }
return wait_for_child( pid, file_type.c_str() );
}
@ -102,18 +95,11 @@ int ztest_file( const int infd, const std::string & input_filename,
argv[ztest_args.size()+3] = input_filename.c_str();
argv[ztest_args.size()+4] = 0;
execvp( argv[0], (char **)argv );
if( verbosity >= 0 )
std::fprintf( stderr, "%s: Can't exec `%s': %s.\n",
util_name, argv[0], std::strerror( errno ) );
show_exec_error( file_type.c_str() );
_exit( 1 );
}
// parent
if( pid < 0 )
{
if( verbosity >= 0 )
std::fprintf( stderr, "%s: Can't fork `%s': %s.\n",
util_name, file_type.c_str(), std::strerror( errno ) );
return 1;
}
{ show_fork_error( file_type.c_str() ); return 1; }
return wait_for_child( pid, file_type.c_str() );
}