Commit 00ae96ca authored by Richard Levitte's avatar Richard Levitte
Browse files

Refactor config - consolidate and refresh print_table_entry 



It's time for print_table_entry to get a bit of refreshment.  The way it
was put together, we needed to maintain the list of known configuration
keys of interest twice, in different shapes.  This is error prone, so
move the list of strings to a common list for all printing cases, and
use simple formatting of lines to do the actual printout based on that
list.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 44fdf1c2

Configure

+84 −120
Original line number Diff line number Diff line
@@ -646,16 +646,15 @@ while (@tocheckfor) { 
}



if ($target eq "TABLE") {

	foreach $target (sort keys %table) {

		print_table_entry($target, "TABLE");

    foreach (sort keys %table) {

	print_table_entry($_, "TABLE");

    }

    exit 0;

}



if ($target eq "LIST") {

    foreach (sort keys %table) {

		print;

		print "\n";

	print $_,"\n" unless $table{$_}->{template};

    }

    exit 0;

}
@@ -668,6 +667,7 @@ if ($target eq "HASH") { 
    exit 0;

}



# Backward compatibility?

if ($target =~ m/^CygWin32(-.*)$/) {

    $target = "Cygwin".$1;

}
@@ -1885,38 +1885,7 @@ sub usage 
	exit(1);

	}



sub which

	{

	my($name)=@_;

	my $path;

	foreach $path (split /:/, $ENV{PATH})

		{

		if (-f "$path/$name$exe_ext" and -x _)

			{

			return "$path/$name$exe_ext" unless ($name eq "perl" and

			 system("$path/$name$exe_ext -e " . '\'exit($]<5.0);\''));

			}

		}

	}



sub dofile

	{

	my $f; my $p; my %m; my @a; my $k; my $ff;

	($f,$p,%m)=@_;



	open(IN,"<$f.in") || open(IN,"<$f") || die "unable to open $f:$!\n";

	@a=<IN>;

	close(IN);

	foreach $k (keys %m)

		{

		grep(/$k/ && ($_=sprintf($m{$k}."\n",$p)),@a);

		}

	open(OUT,">$f.new") || die "unable to open $f.new:$!\n";

	print OUT @a;

	close(OUT);

	rename($f,"$f.bak") || die "unable to rename $f\n" if -e $f;

	rename("$f.new",$f) || die "unable to rename $f.new\n";

	}

# Configuration printer ##############################################



sub print_table_entry

{
@@ -1927,50 +1896,6 @@ sub print_table_entry 
    # Don't print the templates

    return if $target{template};



	if ($type eq "TABLE") {

	    print <<"EOF"



*** $target

\$cc           = $target{cc}

\$cflags       = $target{cflags}

\$debug_cflags   = $target{debug_cflags}

\$release_cflags = $target{release_cflags}

\$unistd       = $target{unistd}

\$thread_cflag = $target{thread_cflag}

\$sys_id       = $target{sys_id}

\$lflags       = $target{lflags}

\$debug_lflags   = $target{debug_lflags}

\$release_lflags = $target{release_lflags}

\$bn_ops       = $target{bn_ops}

\$cpuid_obj    = $target{cpuid_obj}

\$bn_obj       = $target{bn_obj}

\$ec_obj       = $target{ec_obj}

\$des_obj      = $target{des_obj}

\$aes_obj      = $target{aes_obj}

\$bf_obj       = $target{bf_obj}

\$md5_obj      = $target{md5_obj}

\$sha1_obj     = $target{sha1_obj}

\$cast_obj     = $target{cast_obj}

\$rc4_obj      = $target{rc4_obj}

\$rmd160_obj   = $target{rmd160_obj}

\$rc5_obj      = $target{rc5_obj}

\$wp_obj       = $target{wp_obj}

\$cmll_obj     = $target{cmll_obj}

\$modes_obj    = $target{modes_obj}

\$engines_obj  = $target{engines_obj}

\$chacha_obj   = $target{chacha_obj}

\$poly1305_obj = $target{poly1305_obj}

\$perlasm_scheme = $target{perlasm_scheme}

\$dso_scheme   = $target{dso_scheme}

\$shared_target= $target{shared_target}

\$shared_cflag = $target{shared_cflag}

\$shared_ldflag = $target{shared_ldflag}

\$shared_extension = $target{shared_extension}

\$ranlib       = $target{ranlib}

\$arflags      = $target{arflags}

\$multilib     = $target{multilib}

EOF

	} elsif ($type eq "HASH") {

    my @sequence = (

	"cc",

	"cflags",
@@ -1999,8 +1924,6 @@ EOF 
	"cmll_obj",

	"modes_obj",

	"engines_obj",

		"chacha_obj",

		"poly1305_obj",

	"perlasm_scheme",

	"dso_scheme",

	"shared_target",
@@ -2011,6 +1934,12 @@ EOF 
	"arflags",

	"multilib",

	);



    if ($type eq "TABLE") {

	print "\n";

	print "*** $target\n";

	printf "\$%-12s = %s\n", $_, $target{$_} foreach (@sequence);

    } elsif ($type eq "HASH") {

	my $largest =

	    length((sort { length($a) <=> length($b) } @sequence)[-1]);

	print "    '$target' => {\n";
@@ -2023,6 +1952,41 @@ EOF 
    }

}



# Utility routines ###################################################



sub which

	{

	my($name)=@_;

	my $path;

	foreach $path (split /:/, $ENV{PATH})

		{

		if (-f "$path/$name$exe_ext" and -x _)

			{

			return "$path/$name$exe_ext" unless ($name eq "perl" and

			 system("$path/$name$exe_ext -e " . '\'exit($]<5.0);\''));

			}

		}

	}



sub dofile

	{

	my $f; my $p; my %m; my @a; my $k; my $ff;

	($f,$p,%m)=@_;



	open(IN,"<$f.in") || open(IN,"<$f") || die "unable to open $f:$!\n";

	@a=<IN>;

	close(IN);

	foreach $k (keys %m)

		{

		grep(/$k/ && ($_=sprintf($m{$k}."\n",$p)),@a);

		}

	open(OUT,">$f.new") || die "unable to open $f.new:$!\n";

	print OUT @a;

	close(OUT);

	rename($f,"$f.bak") || die "unable to rename $f\n" if -e $f;

	rename("$f.new",$f) || die "unable to rename $f.new\n";

	}



sub quotify {

    my %processors = (

	perl    => sub { my $x = shift;