require 5.10.0;
use warnings;
use strict;
+
use Pod::Checker;
use File::Find;
use File::Basename;
use lib catdir(dirname($0), "perl");
use OpenSSL::Util::Pod;
-my $debug = 0; # Set to 1 for debug output
+# Set to 1 for debug output
+my $debug = 0;
# Options.
our($opt_d);
our($opt_v);
our($opt_c);
+# Print usage message and exit.
sub help {
print <<EOF;
Find small errors (nits) in documentation. Options:
+ -c List undocumented commands and options
-d Detailed list of undocumented (implies -u)
-e Detailed list of new undocumented (implies -v)
- -s Same as -e except no output is generated if nothing is undocumented
- -o Causes -e/-v to count symbols added since 1.1.1 as new (implies -v)
+ -h Print this help message
-l Print bogus links
-n Print nits in POD pages
- -p Warn if non-public name documented (implies -n)
+ -o Causes -e/-v to count symbols added since 1.1.1 as new (implies -v)
-u Count undocumented functions
-v Count new undocumented functions
- -h Print this help message
- -c List undocumented commands and options
EOF
exit;
}
+getopts('cdehlnouv');
+
+help() if $opt_h;
+$opt_u = 1 if $opt_d;
+$opt_v = 1 if $opt_o || $opt_e;
+die "Cannot use both -u and -v"
+ if $opt_u && $opt_v;
+die "Cannot use both -d and -e"
+ if $opt_d && $opt_e;
+
+# We only need to check c, l, n, u and v.
+# Options d, e, o imply one of the above.
+die "Need one of -[cdehlnouv] flags.\n"
+ unless $opt_c or $opt_l or $opt_n or $opt_u or $opt_v;
+
+
my $temp = '/tmp/docnits.txt';
my $OUT;
my %public;
my $status = 0;
-my %mandatory_sections =
- ( '*' => [ 'NAME', 'DESCRIPTION', 'COPYRIGHT' ],
- 1 => [ 'SYNOPSIS', 'OPTIONS' ],
- 3 => [ 'SYNOPSIS', 'RETURN VALUES' ],
- 5 => [ ],
- 7 => [ ] );
+my %mandatory_sections = (
+ '*' => [ 'NAME', 'DESCRIPTION', 'COPYRIGHT' ],
+ 1 => [ 'SYNOPSIS', 'OPTIONS' ],
+ 3 => [ 'SYNOPSIS', 'RETURN VALUES' ],
+ 5 => [ ],
+ 7 => [ ]
+);
+
# Print error message, set $status.
sub err {
$names{$n} = 1;
$foundfilename++ if $n eq $simplename;
$foundfilenames{$n} = 1
- if ((-f "$dirname/$n.pod.in" || -f "$dirname/$n.pod")
- && $n ne $simplename);
+ if -f "$dirname/$n.pod" && $n ne $simplename;
}
- err($id, "the following exist as other .pod or .pod.in files:",
+ err($id, "the following exist as other .pod files:",
sort keys %foundfilenames)
if %foundfilenames;
err($id, "$simplename (filename) missing from NAME section")
unless $foundfilename;
- foreach my $n ( keys %names ) {
- err($id, "$n is not public")
- if $opt_p and !defined $public{$n};
+ if ( $filename !~ /internal/ ) {
+ foreach my $n ( keys %names ) {
+ err($id, "$n is not public")
+ if !defined $public{$n};
+ }
}
# Find all functions in SYNOPSIS
# Helper function to check if a given $thing is properly marked up
# option. It returns one of these values:
-#
-# undef if it's not an option
-# "" if it's a malformed option
-# $unwrapped the option with the outermost B<> wrapping removed.
+# undef if it's not an option
+# "" if it's a malformed option
+# $unwrapped the option with the outermost B<> wrapping removed.
sub normalise_option {
my $id = shift;
my $filename = shift;
# Checks of function name (man3) formatting. The man3 checks are
# easier than the man1 checks, we only check the names followed by (),
# and only the names that have POD markup.
-
sub functionname_check {
my $id = shift;
my $filename = shift;
'zeroes' => 'zeros'
);
+# Search manpage for words that have a different preferred use.
sub wording {
my $id = shift;
my $contents = shift;
foreach my $k ( keys %preferred_words ) {
+ # Sigh, trademark
+ next if $k eq 'file system'
+ and $contents =~ /Microsoft Encrypted File System/;
err($id, "found '$k' should use '$preferred_words{$k}'")
if $contents =~ /\b\Q$k\E\b/i;
}
if $contents =~ /\bepoch\b/;
}
+# Perform all sorts of nit/error checks on a manpage
sub check {
my $filename = shift;
my $dirname = basename(dirname($filename));
check_section_location($id, $contents, "EXAMPLES", "SEE ALSO");
}
- unless ( $contents =~ /=for comment generic/ ) {
+ # Make sure every link has a section.
+ while ( $contents =~ /$markup_re/msg ) {
+ my $target = $1;
+ next unless $target =~ /^L</; # Skip if not L<...>, or
+ next if $target =~ /::/; # links to a Perl module, or
+ next if $target =~ m@L</@; # links within the page, or
+ next if $target =~ /^L<https?:/; # is a URL link, or
+ next if $target =~ m@\([1357]\)>$@; # it has a section, or
+ next if $target =~ m@\([1357]\)/.*>$@; # it has a section/anchor
+ err($id, "Section missing in $target")
+ }
+ # Check for proper links to commands.
+ while ( $contents =~ /L<([^>]*)\(1\)(?:\/.*)?>/g ) {
+ my $target = $1;
+ next if $target =~ /openssl-?/;
+ next if -f "doc/man1/$target.pod";
+ # TODO: Filter out "foreign manual" links.
+ next if $target =~ /ps|apropos|sha1sum|procmail|perl/;
+ err($id, "Bad command link L<$target(1)>");
+ }
+ # Check for proper in-man-3 API links.
+ while ( $contents =~ /L<([^>]*)\(3\)(?:\/.*)?>/g ) {
+ my $target = $1;
+ err($id, "Bad L<$target>")
+ unless $target =~ /^[_[:alpha:]][_[:alnum:]]*$/
+ }
+
+ unless ( $contents =~ /=for openssl generic/ ) {
if ( $filename =~ m|man3/| ) {
name_synopsis($id, $filename, $contents);
functionname_check($id, $filename, $contents);
err($id, "Possible version style issue")
if $contents =~ /OpenSSL version [019]/;
- if ( $contents !~ /=for comment multiple includes/ ) {
+ if ( $contents !~ /=for openssl multiple includes/ ) {
# Look for multiple consecutive openssl #include lines
# (non-consecutive lines are okay; see man3/MD5.pod).
if ( $contents =~ /=head1 SYNOPSIS(.*)=head1 DESCRIPTION/ms ) {
my $section = 3;
$section = $1 if $dirname =~ /man([1-9])/;
- foreach ((@{$mandatory_sections{'*'}}, @{$mandatory_sections{$section}})) {
- # Skip "return values" if not -s
+ foreach ( (@{$mandatory_sections{'*'}}, @{$mandatory_sections{$section}}) ) {
err($id, "missing $_ head1 section")
if $contents !~ /^=head1\s+${_}\s*$/m;
}
}
-my %dups;
-
+# Parse libcrypto.num, etc., and return sorted list of what's there.
sub parsenum {
my $file = shift;
my @apis;
close $IN;
- print "# Found ", scalar(@apis), " in $file\n" unless $opt_p;
return sort @apis;
}
+# Parse all the manpages, getting return map of what they document
+# (by looking at their NAME sections).
sub getdocced
{
my $dir = shift;
my %return;
+ my %dups;
- foreach my $pod ( glob("$dir/*.pod"), glob("$dir/*.pod.in") ) {
+ foreach my $pod ( glob("$dir/*.pod") ) {
my %podinfo = extract_pod_info($pod);
foreach my $n ( @{$podinfo{names}} ) {
$return{$n} = $pod;
- print "# Duplicate $n in $pod and $dups{$n}\n"
+ err("# Duplicate $n in $pod and $dups{$n}")
if defined $dups{$n} && $dups{$n} ne $pod;
$dups{$n} = $pod;
}
return %return;
}
+# Map of documented functions; function => manpage
my %docced;
+# Map of links in each POD file; filename => [ "foo(1)", "bar(3)", ... ]
+my %link_map = ();
+# Map of names in each POD file; "name(s)" => filename
+my %name_map = ();
+# Load file of symbol names that we know aren't documented.
sub loadmissing($)
{
my $missingfile = shift;
return @missing;
}
+# Check for undocumented macros; ignore those in the "missing" file
+# and do simple check for #define in our header files.
sub checkmacros {
my $count = 0;
my %seen;
my @missing;
- if ($opt_o) {
+ if ( $opt_o ) {
@missing = loadmissing('util/missingmacro111.txt');
- } elsif ($opt_v) {
+ } elsif ( $opt_v ) {
@missing = loadmissing('util/missingmacro.txt');
}
- print "# Checking macros (approximate)\n"
- if !$opt_s;
foreach my $f ( glob('include/openssl/*.h') ) {
# Skip some internals we don't want to document yet.
next if $f eq 'include/openssl/asn1.h';
# Skip macros known to be missing
next if $opt_v && grep( /^$macro$/, @missing);
- print "$f:$macro\n"
+ err("$f:", "macro $macro undocumented")
if $opt_d || $opt_e;
$count++;
$seen{$macro} = 1;
}
close(IN);
}
- print "# Found $count macros missing\n"
- if !$opt_s || $count > 0;
+ err("# $count macros undocumented (count is approximate)")
+ if $count > 0;
}
+# Find out what is undocumented (filtering out the known missing ones)
+# and display them.
sub printem {
my $libname = shift;
my $numfile = shift;
my $count = 0;
my %seen;
- my @missing = loadmissing($missingfile) if ($opt_v);
+ my @missing = loadmissing($missingfile) if ( $opt_v );
foreach my $func ( parsenum($numfile) ) {
next if $docced{$func} || defined $seen{$func};
# Skip functions known to be missing
next if $opt_v && grep( /^$func$/, @missing);
- print "$libname:$func\n"
+ err("$libname:", "function $func undocumented")
if $opt_d || $opt_e;
$count++;
$seen{$func} = 1;
}
- print "# Found $count missing from $numfile\n\n"
- if !$opt_s || $count > 0;
+ err("# $count in $numfile are not documented")
+ if $count > 0;
}
-
-# Collection of links in each POD file.
-# filename => [ "foo(1)", "bar(3)", ... ]
-my %link_collection = ();
-# Collection of names in each POD file.
-# "name(s)" => filename
-my %name_collection = ();
-
+# Collect all the names in a manpage.
sub collectnames {
my $filename = shift;
$filename =~ m|man(\d)/|;
my $section = $1;
- my $simplename = basename(basename($filename, ".in"), ".pod");
+ my $simplename = basename($filename, ".pod");
my $id = "${filename}:1:";
my $contents = '';
$contents =~ /=head1 NAME([^=]*)=head1 /ms;
my $tmp = $1;
- unless (defined $tmp) {
+ unless ( defined $tmp ) {
err($id, "weird name section");
return;
}
map { s|/|-|g; $_ } # Treat slash as dash
map { s/^\s+//g; s/\s+$//g; $_ } # Trim prefix and suffix blanks
split(/,/, $tmp);
- unless (grep { $simplename eq $_ } @names) {
+ unless ( grep { $simplename eq $_ } @names ) {
err($id, "missing $simplename");
push @names, $simplename;
}
foreach my $name (@names) {
next if $name eq "";
- if ($name =~ /\s/) {
+ if ( $name =~ /\s/ ) {
err($id, "'$name' contains white space")
}
my $name_sec = "$name($section)";
- if (! exists $name_collection{$name_sec}) {
- $name_collection{$name_sec} = $filename;
- } elsif ($filename eq $name_collection{$name_sec}) {
+ if ( !exists $name_map{$name_sec} ) {
+ $name_map{$name_sec} = $filename;
+ } elsif ( $filename eq $name_map{$name_sec} ) {
err($id, "$name_sec repeated in NAME section of",
- $name_collection{$name_sec});
+ $name_map{$name_sec});
} else {
err($id, "$name_sec also in NAME section of",
- $name_collection{$name_sec});
+ $name_map{$name_sec});
}
}
my @foreign_names =
map { map { s/\s+//g; $_ } split(/,/, $_) }
$contents =~ /=for\s+comment\s+foreign\s+manuals:\s*(.*)\n\n/;
- foreach (@foreign_names) {
- $name_collection{$_} = undef; # It still exists!
+ foreach ( @foreign_names ) {
+ $name_map{$_} = undef; # It still exists!
}
my @links = $contents =~ /L<
# a one digit section number
([^\/>\(]+\(\d\))
/gx;
- $link_collection{$filename} = [ @links ];
+ $link_map{$filename} = [ @links ];
}
+# Look for L<> ("link") references that point to files that do not exist.
sub checklinks {
- foreach my $filename (sort keys %link_collection) {
- foreach my $link (@{$link_collection{$filename}}) {
+ foreach my $filename (sort keys %link_map) {
+ foreach my $link (@{$link_map{$filename}}) {
err("${filename}:1:", "reference to non-existing $link")
- unless exists $name_collection{$link};
+ unless exists $name_map{$link};
}
}
}
+# Load the public symbol/macro names
sub publicize {
foreach my $name ( parsenum('util/libcrypto.num') ) {
$public{$name} = 1;
foreach my $name ( parsenum('util/libssl.num') ) {
$public{$name} = 1;
}
- foreach my $name ( parsenum('util/private.num') ) {
+ foreach my $name ( parsenum('util/other.syms') ) {
$public{$name} = 1;
}
}
-# Cipher/digests to skip if not documented
+# Cipher/digests to skip if they show up as "not implemented"
+# because they are, via the "-*" construct.
my %skips = (
'aes128' => 1,
'aes192' => 1,
'digest' => 1,
);
+# Check the flags of a command and see if everything is in the manpage
sub checkflags {
my $cmd = shift;
my $doc = shift;
while ( <CFH> ) {
chop;
last if /DESCRIPTION/;
- if ( /=for comment ifdef (.*)/ ) {
+ if ( /=for openssl ifdef (.*)/ ) {
foreach my $f ( split / /, $1 ) {
$localskips{$f} = 1;
}
close CFH;
# See what's in the command not the manpage.
- my @undocced = ();
- foreach my $k ( keys %cmdopts ) {
- push @undocced, $k unless $docopts{$k};
- }
- if ( scalar @undocced > 0 ) {
- foreach ( @undocced ) {
- err("$doc: undocumented option -$_");
- }
+ my @undocced = sort grep { !defined $docopts{$_} } keys %cmdopts;
+ foreach ( @undocced ) {
+ next if /-/; # Skip the -- end-of-flags marker
+ err("$doc: undocumented option -$_");
}
# See what's in the command not the manpage.
- my @unimpl = ();
- foreach my $k ( keys %docopts ) {
- push @unimpl, $k unless $cmdopts{$k};
- }
- if ( scalar @unimpl > 0 ) {
- foreach ( @unimpl ) {
- next if defined $skips{$_} || defined $localskips{$_};
- err("$cmd documented but not implemented -$_");
- }
+ my @unimpl = sort grep { !defined $cmdopts{$_} } keys %docopts;
+ foreach ( @unimpl ) {
+ next if defined $skips{$_} || defined $localskips{$_};
+ err("$cmd documented but not implemented -$_");
}
}
-getopts('cdesolnphuv');
-
-help() if $opt_h;
-
-$opt_n = 1 if $opt_p;
-$opt_u = 1 if $opt_d;
-$opt_e = 1 if $opt_s;
-$opt_v = 1 if $opt_o || $opt_e;
-
-die "Cannot use both -u and -v"
- if $opt_u && $opt_v;
-die "Cannot use both -d and -e"
- if $opt_d && $opt_e;
-
-# We only need to check c, l, n, u and v.
-# Options d, e, s, o and p imply one of the above.
-die "Need one of -[cdesolnpuv] flags.\n"
- unless $opt_c or $opt_l or $opt_n or $opt_u or $opt_v;
+##
+## MAIN()
+## Do the work requested by the various getopt flags.
+## The flags are parsed in alphabetical order, just because we have
+## to have *some way* of listing them.
+##
if ( $opt_c ) {
my @commands = ();
}
if ( $opt_l ) {
- foreach (@ARGV ? @ARGV : (glob('doc/*/*.pod'), glob('doc/*/*.pod.in'),
- glob('doc/internal/*/*.pod'))) {
+ foreach ( glob('doc/*/*.pod doc/internal/*/*.pod') ) {
collectnames($_);
}
checklinks();
}
if ( $opt_n ) {
- publicize() if $opt_p;
- foreach (@ARGV ? @ARGV : (glob('doc/*/*.pod'), glob('doc/*/*.pod.in'))) {
+ publicize();
+ foreach ( @ARGV ? @ARGV : glob('doc/*/*.pod doc/internal/*/*.pod') ) {
check($_);
}
- {
- local $opt_p = undef;
- foreach (@ARGV ? @ARGV : glob('doc/internal/*/*.pod')) {
- check($_);
- }
- }
# If not given args, check that all man1 commands are named properly.
if ( scalar @ARGV == 0 ) {
foreach (glob('doc/man1/*.pod')) {
- next if /CA.pl/ || /openssl.pod/;
+ next if /CA.pl/ || /openssl\.pod/ || /tsget\.pod/;
err("$_ doesn't start with openssl-") unless /openssl-/;
}
}
foreach ( keys %temp ) {
$docced{$_} = $temp{$_};
}
- if ($opt_o) {
+ if ( $opt_o ) {
printem('crypto', 'util/libcrypto.num', 'util/missingcrypto111.txt');
printem('ssl', 'util/libssl.num', 'util/missingssl111.txt');
} else {
projects / openssl.git / blobdiff