Merging upstream version 0.9~rc2.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
5a7d30d9fd
commit
634a6bfc0f
21 changed files with 133 additions and 71 deletions
4
zcat.cc
4
zcat.cc
|
@ -198,13 +198,13 @@ int cat( int infd, const std::string & input_filename,
|
|||
int retval = 0;
|
||||
if( !set_data_feeder( &infd, &pid ) ) retval = 1;
|
||||
else
|
||||
{
|
||||
retval = do_cat( infd, buffer_size, inbuf, outbuf,
|
||||
input_filename, cat_options );
|
||||
if( retval == 0 )
|
||||
if( pid && wait_for_child( pid, "data feeder" ) != 0 ) retval = 1;
|
||||
if( retval == 0 )
|
||||
if( close( infd ) != 0 )
|
||||
{ show_close_error( "data feeder" ); retval = 1; }
|
||||
}
|
||||
delete[] inbuf; delete[] outbuf;
|
||||
return retval;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue