diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-08 04:29:58 +0000 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-08 04:29:58 +0000 |
| commit | 4646c2987eba0ba70050daf3c9fb450510a30237 (patch) | |
| tree | b1312f8c64fd61a3097b553507d00cac44b3c4bd /zutils.cc | |
| parent | Adding debian version 1.1-1. (diff) | |
| download | zutils-4646c2987eba0ba70050daf3c9fb450510a30237.tar.xz zutils-4646c2987eba0ba70050daf3c9fb450510a30237.zip | |
Merging upstream version 1.2~pre2.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'zutils.cc')
| -rw-r--r-- | zutils.cc | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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; |