1
0
Fork 0

Merging upstream version 0.9~rc1.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-24 05:04:40 +01:00
parent 4f4c7c8781
commit 6503461316
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
19 changed files with 126 additions and 131 deletions

10
main.cc
View file

@ -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;