From 67258f475f17f3824c5715eaa4ebdfee86f20142 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 8 Nov 2015 05:19:00 +0100 Subject: Merging upstream version 0.9~rc1. Signed-off-by: Daniel Baumann --- ztest.cc | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) (limited to 'ztest.cc') diff --git a/ztest.cc b/ztest.cc index 6a9b910..3672aa8 100644 --- a/ztest.cc +++ b/ztest.cc @@ -60,23 +60,16 @@ int ztest_stdin( const int infd, argv[ztest_args.size()+2] = 0; execvp( argv[0], (char **)argv ); } - if( verbosity >= 0 ) - std::fprintf( stderr, "%s: Can't exec `%s': %s.\n", - util_name, file_type.c_str(), std::strerror( errno ) ); + show_exec_error( file_type.c_str() ); _exit( 1 ); } // parent if( pid < 0 ) - { - if( verbosity >= 0 ) - std::fprintf( stderr, "%s: Can't fork `%s': %s.\n", - util_name, file_type.c_str(), std::strerror( errno ) ); - return 1; - } + { show_fork_error( file_type.c_str() ); return 1; } close( fda[0] ); if( !feed_data( infd, fda[1], magic_data, magic_size ) ) return 1; if( close( fda[1] ) != 0 ) - { show_error( "Can't close output of data feeder", errno ); return 1; } + { show_close_error( "data feeder" ); return 1; } return wait_for_child( pid, file_type.c_str() ); } @@ -102,18 +95,11 @@ int ztest_file( const int infd, const std::string & input_filename, argv[ztest_args.size()+3] = input_filename.c_str(); argv[ztest_args.size()+4] = 0; execvp( argv[0], (char **)argv ); - if( verbosity >= 0 ) - std::fprintf( stderr, "%s: Can't exec `%s': %s.\n", - util_name, argv[0], std::strerror( errno ) ); + show_exec_error( file_type.c_str() ); _exit( 1 ); } // parent if( pid < 0 ) - { - if( verbosity >= 0 ) - std::fprintf( stderr, "%s: Can't fork `%s': %s.\n", - util_name, file_type.c_str(), std::strerror( errno ) ); - return 1; - } + { show_fork_error( file_type.c_str() ); return 1; } return wait_for_child( pid, file_type.c_str() ); } -- cgit v1.2.3