From 0b80103bfa12fcd461e8642d351fff40d650313b Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Wed, 14 Feb 2018 12:04:16 -0600 Subject: [PATCH] Auto-size more of configdata.pm "disabled features" configdata.pm -d prints out a lot of information, including a table of what features are disabled, why, and the effect of that disablement (in terms of preprocessor symbols defined and directories skipped). The first column is already auto-sized, to easily accomodate future disableable features with long names. Also auto-size the second column, to accomodate future reasons for disablement with long names as well. Failing to take such precautions results in stderr spew from configdata.pm -d when such long reasons are in use: Negative repeat count does nothing at ./configdata.pm line 14504. Such output is pretty distracting from the actual desired output, so try to avoid it if possible. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/5371) --- Configure | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Configure b/Configure index 2389e52588..cfe3625b7a 100755 --- a/Configure +++ b/Configure @@ -2379,8 +2379,10 @@ _____ } if ($dump || $options) { my $longest = 0; + my $longest2 = 0; foreach my $what (@disablables) { $longest = length($what) if $longest < length($what); + $longest2 = length($disabled{$what}) if $longest2 < length($disabled{$what}); } print "\nEnabled features:\n\n"; foreach my $what (@disablables) { @@ -2390,7 +2392,7 @@ _____ foreach my $what (@disablables) { if ($disabled{$what}) { print " $what", ' ' x ($longest - length($what) + 1), - "[$disabled{$what}]", ' ' x (10 - length($disabled{$what})); + "[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1); print $disabled_info{$what}->{macro} if $disabled_info{$what}->{macro}; print ' (skip ', -- 2.25.1