From: Rich Salz <rsalz@akamai.com>
Date: Tue, 23 Jun 2015 11:27:23 +0000 (-0400)
Subject: Add $! to errors, use script basename.
X-Git-Tag: OpenSSL_1_1_0-pre1~960
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ce7e647bc2c328404b1e3cdac6211773afdefe07;p=oweals%2Fopenssl.git

Add $! to errors, use script basename.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/crypto/objects/objxref.pl b/crypto/objects/objxref.pl
index 1913b9d133..a1900cab5c 100644
--- a/crypto/objects/objxref.pl
+++ b/crypto/objects/objxref.pl
@@ -7,7 +7,7 @@ my %oid_tbl;
 
 my ($mac_file, $xref_file) = @ARGV;
 
-open(IN, $mac_file) || die "Can't open $mac_file";
+open(IN, $mac_file) || die "Can't open $mac_file, $!\n";
 
 # Read in OID nid values for a lookup table.
 
@@ -19,7 +19,7 @@ while (<IN>)
 	}
 close IN;
 
-open(IN, $xref_file) || die "Can't open $xref_file";
+open(IN, $xref_file) || die "Can't open $xref_file, $!\n";
 
 my $ln = 1;
 
@@ -57,8 +57,7 @@ my @srt2 = sort
 	} @xrkeys;
 
 my $pname = $0;
-
-$pname =~ s|^.[^/]/||;
+$pname =~ s|.*/||;
 
 print <<EOF;
 /* AUTOGENERATED BY $pname, DO NOT EDIT */
@@ -111,6 +110,6 @@ sub check_oid
 	my ($chk) = @_;
 	if (!exists $oid_tbl{$chk})
 		{
-		die "Not Found \"$chk\"\n";
+		die "Can't find \"$chk\", $!\n";
 		}
 	}