From 511feb57cfea29b1f6ba303cedd1456f5cecd69e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 8 Nov 2015 05:19:42 +0100 Subject: Merging upstream version 0.9~rc2. Signed-off-by: Daniel Baumann --- zutils.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'zutils.cc') diff --git a/zutils.cc b/zutils.cc index 01a0152..7b86c7d 100644 --- a/zutils.cc +++ b/zutils.cc @@ -305,7 +305,8 @@ bool test_format( const int infd, std::string & file_type, } -int wait_for_child( const pid_t pid, const char * const name ) +int wait_for_child( const pid_t pid, const char * const name, + const int eretval ) { int status; while( waitpid( pid, &status, 0 ) == -1 ) @@ -315,10 +316,10 @@ int wait_for_child( const pid_t pid, const char * const name ) if( verbosity >= 0 ) std::fprintf( stderr, "%s: Error waiting termination of `%s': %s.\n", util_name, name, std::strerror( errno ) ); - _exit( 1 ); + _exit( eretval ); } } if( WIFEXITED( status ) ) return WEXITSTATUS( status ); - else return 1; + return eretval; } -- cgit v1.2.3