Commit aaa29f9e authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add error checking to obj_xref.pl and add command line support for data 

file locations.
parent ede6ef5e

Makefile.org

+1 −1
Original line number Diff line number Diff line
@@ -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

crypto/objects/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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:

crypto/objects/objxref.pl

+9 −2
Original line number Diff line number Diff line 
#!/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;