[openssl-commits] [openssl] master update

[kaduk at mit.edu]

The branch master has been updated
       via  0b80103bfa12fcd461e8642d351fff40d650313b (commit)
      from  4fd39122e51c3c44fcb72fb9b732d5008efda399 (commit)


- Log -----------------------------------------------------------------
commit 0b80103bfa12fcd461e8642d351fff40d650313b
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Wed Feb 14 12:04:16 2018 -0600

    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 <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5371)

-----------------------------------------------------------------------

Summary of changes:
 Configure | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Configure b/Configure
index 2389e52..cfe3625 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 ',