Adding upstream version 1.2~pre2.upstream/1.2_pre2

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 2 insertions, 2 deletions

diff --git a/zutils.cc b/zutils.cc
index bf6fe9a..8961376 100644
--- a/zutils.cc
+++ b/zutils.cc
@@ -338,7 +338,7 @@ int test_format( const int infd, const uint8_t ** const magic_datap,
 
 
 int wait_for_child( const pid_t pid, const char * const name,
-                    const int eretval )
+                    const int eretval, const bool isgzxz )
   {
   int status;
   while( waitpid( pid, &status, 0 ) == -1 )
@@ -355,7 +355,7 @@ int wait_for_child( const pid_t pid, const char * const name,
   if( WIFEXITED( status ) )
     {
     const int tmp = WEXITSTATUS( status );
-    if( eretval == 1 && tmp == 1 ) return 2;		// for ztest
+    if( isgzxz && eretval == 1 && tmp == 1 ) return 2;		// for ztest
     return tmp;
     }
   return eretval;