lzip/zutils
1
0
Fork 0
Code Issues Activity

Merging upstream version 0.9~rc2.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-24 05:07:04 +01:00
parent 5a7d30d9fd
commit 634a6bfc0f
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
21 changed files with 133 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

18
zgrep.cc
View file

@ -84,9 +84,12 @@ int zgrep_stdin( int infd, const std::vector< const char * > & grep_args )
// parent
if( grep_pid < 0 )
{ show_fork_error( GREP ); return 2; }
int retval = 0;
if( pid && wait_for_child( pid, "data feeder" ) != 0 ) retval = 2;
if( wait_for_child( grep_pid, GREP ) != 0 ) retval = 2;
int retval = wait_for_child( grep_pid, GREP );
if( retval != 1 )
{ if( pid ) kill( pid, SIGTERM ); }
else
if( pid && wait_for_child( pid, "data feeder" ) != 0 ) retval = 2;
if( close( infd ) != 0 )
{ show_close_error( "data feeder" ); return 2; }
return retval;
@ -146,9 +149,12 @@ int zgrep_file( int infd, const std::string & input_filename,
}
if( size < buffer_size ) break;
}
int retval = 0;
if( pid && wait_for_child( pid, "data feeder" ) != 0 ) retval = 2;
if( wait_for_child( grep_pid, GREP ) != 0 ) retval = 2;
int retval = wait_for_child( grep_pid, GREP );
if( retval != 1 )
{ if( pid ) kill( pid, SIGTERM ); }
else
if( pid && wait_for_child( pid, "data feeder" ) != 0 ) retval = 2;
if( grep_list && retval == 0 )
std::printf( "%s\n", input_filename.c_str() );
if( close( infd ) != 0 )