mirror of
https://github.com/openssl/openssl.git
synced 2024-11-21 01:15:20 +08:00
Make it possible to build completely static, independent error C
files.
This commit is contained in:
parent
b476df64a1
commit
6343e2fac3
@ -7,7 +7,7 @@ my $static = 1;
|
||||
my $recurse = 0;
|
||||
my $reindex = 0;
|
||||
my $dowrite = 0;
|
||||
|
||||
my $staticloader = "";
|
||||
|
||||
while (@ARGV) {
|
||||
my $arg = $ARGV[0];
|
||||
@ -29,6 +29,9 @@ while (@ARGV) {
|
||||
} elsif($arg eq "-nostatic") {
|
||||
$static = 0;
|
||||
shift @ARGV;
|
||||
} elsif($arg eq "-staticloader") {
|
||||
$staticloader = "static ";
|
||||
shift @ARGV;
|
||||
} elsif($arg eq "-write") {
|
||||
$dowrite = 1;
|
||||
shift @ARGV;
|
||||
@ -156,6 +159,7 @@ while (($hdr, $lib) = each %libinc)
|
||||
if(/^#define\s+(\S+)\s+(\S+)/) {
|
||||
$name = $1;
|
||||
$code = $2;
|
||||
next if $name =~ /^${lib}err/;
|
||||
unless($name =~ /^${lib}_([RF])_(\w+)$/) {
|
||||
print STDERR "Invalid error code $name\n";
|
||||
next;
|
||||
@ -189,9 +193,11 @@ while (($hdr, $lib) = each %libinc)
|
||||
# so all those unreferenced can be printed out.
|
||||
|
||||
|
||||
print STDERR "Files loaded: " if $debug;
|
||||
foreach $file (@source) {
|
||||
# Don't parse the error source file.
|
||||
next if exists $cskip{$file};
|
||||
print STDERR $file if $debug;
|
||||
open(IN, "<$file") || die "Can't open source file $file\n";
|
||||
while(<IN>) {
|
||||
if(/(([A-Z0-9]+)_F_([A-Z0-9_]+))/) {
|
||||
@ -215,6 +221,7 @@ foreach $file (@source) {
|
||||
}
|
||||
close IN;
|
||||
}
|
||||
print STDERR "\n" if $debug;
|
||||
|
||||
# Now process each library in turn.
|
||||
|
||||
@ -258,8 +265,20 @@ foreach $lib (keys %csrc)
|
||||
/* The following lines are auto generated by the script mkerr.pl. Any changes
|
||||
* made after this point may be overwritten when the script is next run.
|
||||
*/
|
||||
void ERR_load_${lib}_strings(void);
|
||||
|
||||
EOF
|
||||
if($static) {
|
||||
print OUT <<"EOF";
|
||||
${staticloader}void ERR_load_${lib}_strings(void);
|
||||
EOF
|
||||
} else {
|
||||
print OUT <<"EOF";
|
||||
${staticloader}void ERR_load_${lib}_strings(void);
|
||||
${staticloader}void ERR_unload_${lib}_strings(void);
|
||||
${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line);
|
||||
#define ${lib}err(f,r) ERR_${lib}_error((f),(r),__FILE__,__LINE__)
|
||||
EOF
|
||||
}
|
||||
print OUT <<"EOF";
|
||||
/* Error codes for the $lib functions. */
|
||||
|
||||
/* Function codes. */
|
||||
@ -426,7 +445,7 @@ if($static) {
|
||||
|
||||
#endif
|
||||
|
||||
void ERR_load_${lib}_strings(void)
|
||||
${staticloader}void ERR_load_${lib}_strings(void)
|
||||
{
|
||||
static int init=1;
|
||||
|
||||
@ -457,18 +476,17 @@ static ERR_STRING_DATA ${lib}_lib_name[]=
|
||||
#endif
|
||||
|
||||
|
||||
int ${lib}_lib_error_code=0;
|
||||
static int ${lib}_lib_error_code=0;
|
||||
static int ${lib}_error_init=1;
|
||||
|
||||
void ERR_load_${lib}_strings(void)
|
||||
${staticloader}void ERR_load_${lib}_strings(void)
|
||||
{
|
||||
static int init=1;
|
||||
|
||||
if (${lib}_lib_error_code == 0)
|
||||
${lib}_lib_error_code=ERR_get_next_error_library();
|
||||
|
||||
if (init)
|
||||
if (${lib}_error_init)
|
||||
{
|
||||
init=0;
|
||||
${lib}_error_init=0;
|
||||
#ifndef OPENSSL_NO_ERR
|
||||
ERR_load_strings(${lib}_lib_error_code,${lib}_str_functs);
|
||||
ERR_load_strings(${lib}_lib_error_code,${lib}_str_reasons);
|
||||
@ -481,7 +499,23 @@ void ERR_load_${lib}_strings(void)
|
||||
}
|
||||
}
|
||||
|
||||
void ERR_${lib}_error(int function, int reason, char *file, int line)
|
||||
${staticloader}void ERR_unload_${lib}_strings(void)
|
||||
{
|
||||
if (${lib}_error_init == 0)
|
||||
{
|
||||
#ifndef OPENSSL_NO_ERR
|
||||
ERR_unload_strings(${lib}_lib_error_code,${lib}_str_functs);
|
||||
ERR_unload_strings(${lib}_lib_error_code,${lib}_str_reasons);
|
||||
#endif
|
||||
|
||||
#ifdef ${lib}_LIB_NAME
|
||||
ERR_unload_strings(0,${lib}_lib_name);
|
||||
#endif
|
||||
${lib}_error_init=1;
|
||||
}
|
||||
}
|
||||
|
||||
${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line)
|
||||
{
|
||||
if (${lib}_lib_error_code == 0)
|
||||
${lib}_lib_error_code=ERR_get_next_error_library();
|
||||
|
Loading…
Reference in New Issue
Block a user