From 511feb57cfea29b1f6ba303cedd1456f5cecd69e Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Sun, 8 Nov 2015 05:19:42 +0100
Subject: Merging upstream version 0.9~rc2.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
---
 zcat.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'zcat.cc')

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;
   }
-- 
cgit v1.2.3