diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-02-10 13:03:31 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-02-10 13:03:31 +0000 |
| commit | aaa29f9e8354aa8a3a8d33474a28b70a2010ad30 (patch) | |
| tree | 00273bb479f44514c26b5775c3effedca61e0a95 | |
| parent | ede6ef5e0813e87b27648c32d1d6de212d967d4e (diff) | |
| download | openssl-new-aaa29f9e8354aa8a3a8d33474a28b70a2010ad30.tar.gz | |
Add error checking to obj_xref.pl and add command line support for data
file locations.
| -rw-r--r-- | Makefile.org | 2 | ||||
| -rw-r--r-- | crypto/objects/Makefile | 2 | ||||
| -rw-r--r-- | crypto/objects/objxref.pl | 11 |
3 files changed, 11 insertions, 4 deletions
diff --git a/Makefile.org b/Makefile.org index 580a26937a..21d194e7d7 100644 --- a/Makefile.org +++ b/Makefile.org @@ -438,7 +438,7 @@ crypto/objects/obj_dat.h: crypto/objects/obj_dat.pl crypto/objects/obj_mac.h crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num $(PERL) crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num crypto/objects/obj_mac.h crypto/objects/obj_xref.h: crypto/objects/objxref.pl crypto/objects/obj_xref.txt crypto/objects/obj_mac.num - $(PERL) crypto/objects/objxref.pl > crypto/objects/obj_xref.h + $(PERL) crypto/objects/objxref.pl crypto/objects/obj_mac.num crypto/objects/obj_xref.txt >crypto/objects/obj_xref.h apps/openssl-vms.cnf: apps/openssl.cnf $(PERL) VMS/VMSify-conf.pl < apps/openssl.cnf > apps/openssl-vms.cnf diff --git a/crypto/objects/Makefile b/crypto/objects/Makefile index d7365e96c4..a8aedbd422 100644 --- a/crypto/objects/Makefile +++ b/crypto/objects/Makefile @@ -47,7 +47,7 @@ obj_mac.h: objects.pl objects.txt obj_mac.num @sleep 1; touch obj_mac.h; sleep 1 obj_xref.h: objxref.pl obj_xref.txt obj_mac.num - $(PERL) objxref.pl > obj_xref.h + $(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h @sleep 1; touch obj_xref.h; sleep 1 files: diff --git a/crypto/objects/objxref.pl b/crypto/objects/objxref.pl index 4a42924c56..3fa584036e 100644 --- a/crypto/objects/objxref.pl +++ b/crypto/objects/objxref.pl @@ -1,6 +1,13 @@ #!/usr/local/bin/perl -open IN, "obj_mac.num"; +use strict; + +my %xref_tbl; +my %oid_tbl; + +my ($mac_file, $xref_file) = @ARGV; + +open(IN, $mac_file) || die "Can't open $mac_file"; # Read in OID nid values for a lookup table. @@ -12,7 +19,7 @@ while (<IN>) } close IN; -open IN, "obj_xref.txt"; +open(IN, $xref_file) || die "Can't open $xref_file"; my $ln = 1; |