summaryrefslogtreecommitdiffstats
path: root/zcat.cc
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-08 04:19:42 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-08 04:19:42 +0000
commit511feb57cfea29b1f6ba303cedd1456f5cecd69e (patch)
treed2aaf1e03feec10c28a6e5d156213b3eb76613ea /zcat.cc
parentAdding debian version 0.9~rc1-1. (diff)
downloadzutils-511feb57cfea29b1f6ba303cedd1456f5cecd69e.tar.xz
zutils-511feb57cfea29b1f6ba303cedd1456f5cecd69e.zip
Merging upstream version 0.9~rc2.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to '')
-rw-r--r--zcat.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/zcat.cc b/zcat.cc
index 1ead9f4..cb29db9 100644
--- a/zcat.cc
+++ b/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;
}