summaryrefslogtreecommitdiffstats
path: root/main.cc
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-08 04:19:00 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-08 04:19:00 +0000
commit67258f475f17f3824c5715eaa4ebdfee86f20142 (patch)
tree5281744f82f74ad6c3f79007052bb99bbf209b05 /main.cc
parentAdding debian version 0.8-1. (diff)
downloadzutils-67258f475f17f3824c5715eaa4ebdfee86f20142.tar.xz
zutils-67258f475f17f3824c5715eaa4ebdfee86f20142.zip
Merging upstream version 0.9~rc1.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'main.cc')
-rw-r--r--main.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/main.cc b/main.cc
index bc7c5fb..56cbf06 100644
--- a/main.cc
+++ b/main.cc
@@ -19,7 +19,6 @@
#include <cerrno>
#include <climits>
-#include <csignal>
#include <cstdio>
#include <cstdlib>
#include <cstring>
@@ -100,9 +99,8 @@ int open_instream( std::string & input_filename, const Mode program_mode ) throw
if( infd >= 0 ) { input_filename = name; break; }
}
}
- if( infd < 0 && verbosity >= 0 )
- std::fprintf( stderr, "%s: Can't open input file `%s': %s.\n",
- util_name, input_filename.c_str(), std::strerror( errno ) );
+ if( infd < 0 )
+ show_error2( "Can't open input file", input_filename.c_str() );
}
return infd;
}
@@ -371,9 +369,7 @@ int main( const int argc, const char * const argv[] )
DIR * const dirp = opendir( input_filename.c_str() );
if( !dirp )
{
- if( verbosity >= 0 )
- std::fprintf( stderr, "%s: Can't open directory `%s': %s.\n",
- util_name, input_filename.c_str(), std::strerror( errno ) );
+ show_error2( "Can't open directory", input_filename.c_str() );
if( retval < 1 ) retval = 1; continue;
}
std::list< std::string > tmp_list;