util/ck_errf.pl: add functionality that brings it closer to util/mkerr.pl
There was no option to give other config files than the default
crypto/err/openssl.ec, and yet it tried to check the errors generated
in engines (and failing, of course).
Also added the same '-internal' option as util/mkerr.pl.
use strict;
use warnings;
+my $config;
my $err_strict = 0;
-my $bad = 0;
+my $debug = 0;
+my $internal = 0;
+
+sub help
+{
+ print STDERR <<"EOF";
+mkerr.pl [options] [files...]
+
+Options:
+
+ -conf FILE Use the named config file FILE instead of the default.
+
+ -debug Verbose output debugging on stderr.
+
+ -internal Generate code that is to be built as part of OpenSSL itself.
+ Also scans internal list of files.
+
+ -strict If any error was found, fail with exit code 1, otherwise 0.
+
+ -help Show this help text.
+
+ ... Additional arguments are added to the file list to scan,
+ if '-internal' was NOT specified on the command line.
+
+EOF
+}
+
+while ( @ARGV ) {
+ my $arg = $ARGV[0];
+ last unless $arg =~ /-.*/;
+ $arg = $1 if $arg =~ /-(-.*)/;
+ if ( $arg eq "-conf" ) {
+ $config = $ARGV[1];
+ shift @ARGV;
+ } elsif ( $arg eq "-debug" ) {
+ $debug = 1;
+ } elsif ( $arg eq "-internal" ) {
+ $internal = 1;
+ } elsif ( $arg eq "-strict" ) {
+ $err_strict = 1;
+ } elsif ( $arg =~ /-*h(elp)?/ ) {
+ &help();
+ exit;
+ } elsif ( $arg =~ /-.*/ ) {
+ die "Unknown option $arg; use -h for help.\n";
+ }
+ shift @ARGV;
+}
+
+my @source;
+if ( $internal ) {
+ die "Extra parameters given.\n" if @ARGV;
+ $config = "crypto/err/openssl.ec" unless defined $config;
+ @source = ( glob('crypto/*.c'), glob('crypto/*/*.c'),
+ glob('ssl/*.c'), glob('ssl/*/*.c') );
+} else {
+ die "Configuration file not given.\nSee '$0 -help' for information\n"
+ unless defined $config;
+ @source = @ARGV;
+}
# To detect if there is any error generation for a libcrypto/libssl libs
# we don't know, we need to find out what libs we do know. That list is
# readily available in crypto/err/openssl.ec, in form of lines starting
-# with "L ".
-my $config = "crypto/err/openssl.ec";
-my %libs = ( "SYS" => 1 );
+# with "L ". Note that we always rely on the modules SYS and ERR to be
+# generally available.
+my %libs = ( SYS => 1, ERR => 1 );
open my $cfh, $config or die "Trying to read $config: $!\n";
while (<$cfh>) {
s|\R$||; # Better chomp
@@ -33,11 +93,8 @@ while (<$cfh>) {
$libs{$1} = 1;
}
-foreach my $file (@ARGV) {
- if ( $file eq "-strict" ) {
- $err_strict = 1;
- next;
- }
+my $bad = 0;
+foreach my $file (@source) {
open( IN, "<$file" ) || die "Can't open $file, $!";
my $func = "";
while (<IN>) {
@@ -52,7 +109,8 @@ foreach my $file (@ARGV) {
my $n = $2;
unless ( $libs{$errlib} ) {
- print "$file:$.:$errlib unknown\n";
+ print "$file:$.:$errlib not listed in $config\n";
+ $libs{$errlib} = 1; # To not display it again
$bad = 1;
}
