[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  bc5a80910dccbc1e417f96bb7f0a3814d3ad5a4d (commit)
      from  2ad75c6c1341db8a3122bbeaf863440057d71307 (commit)


- Log -----------------------------------------------------------------
commit bc5a80910dccbc1e417f96bb7f0a3814d3ad5a4d
Author: Rich Salz <rsalz at akamai.com>
Date:   Thu Aug 29 12:12:17 2019 -0400

    Handle the renamed command POD files in find-doc-nits
    
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9729)

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

Summary of changes:
 util/find-doc-nits | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/util/find-doc-nits b/util/find-doc-nits
index 9126e73586..d6dfa5a0dc 100755
--- a/util/find-doc-nits
+++ b/util/find-doc-nits
@@ -533,6 +533,7 @@ my %skips = (
 
 sub checkflags() {
     my $cmd = shift;
+    my $doc = shift;
     my %cmdopts;
     my %docopts;
     my $ok = 1;
@@ -548,8 +549,8 @@ sub checkflags() {
     close CFH;
 
     # Get the list of flags from the synopsis
-    open CFH, "<doc/man1/$cmd.pod"
-        || die "Can't open $cmd.pod, $!";
+    open CFH, "<$doc"
+        || die "Can't open $doc, $!";
     while ( <CFH> ) {
         chop;
         last if /DESCRIPTION/;
@@ -617,13 +618,15 @@ if ( $opt_c ) {
     close FH;
 
     # See if each has a manpage.
-    foreach ( @commands ) {
-        next if $_ eq 'help' || $_ eq 'exit';
-        if ( ! -f "doc/man1/$_.pod" ) {
-            print "doc/man1/$_.pod does not exist\n";
+    foreach my $cmd ( @commands ) {
+        next if $cmd eq 'help' || $cmd eq 'exit';
+        my $doc = "doc/man1/$cmd.pod";
+        $doc = "doc/man1/openssl-$cmd.pod" if -f "doc/man1/openssl-$cmd.pod";
+        if ( ! -f "$doc" ) {
+            print "$doc does not exist\n";
             $ok = 0;
         } else {
-            $ok = 0 if not &checkflags($_);
+            $ok = 0 if not &checkflags($cmd, $doc);
         }
     }