X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pod%2Fcheckpods.PL;h=610aad886d1b854b8f433e40e7f8438ba50ca33c;hb=8a2485f87de4ac33d6c8564ae6b27c5efc3e1430;hp=5265a19808198721c40d748b46f34335996c2263;hpb=5f05dabc4054964aa3b10f44f8468547f051cdf8;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pod/checkpods.PL b/pod/checkpods.PL
index 5265a19..610aad8 100644
--- a/pod/checkpods.PL
+++ b/pod/checkpods.PL
@@ -2,6 +2,7 @@
 
 use Config;
 use File::Basename qw(&basename &dirname);
+use Cwd;
 
 # List explicitly here the variables you want Configure to
 # generate.  Metaconfig only looks for shell variables, so you
@@ -12,11 +13,10 @@ use File::Basename qw(&basename &dirname);
 
 # This forces PL files to create target in same directory as PL file.
 # This is so that make depend always knows where to find PL derivatives.
-chdir(dirname($0));
-($file = basename($0)) =~ s/\.PL$//;
-$file =~ s/\.pl$//
-	if ($Config{'osname'} eq 'VMS' or
-	    $Config{'osname'} eq 'OS2');  # "case-forgiving"
+$origdir = cwd;
+chdir dirname($0);
+$file = basename($0, '.PL');
+$file .= '.com' if $^O eq 'VMS';
 
 open OUT,">$file" or die "Can't create $file: $!";
 
@@ -39,7 +39,7 @@ print OUT <<'!NO!SUBS!';
 # From: Roderick Schertler <roderick@gate.net>
 # To: perl5-porters@africa.nicoh.com
 # Subject: POD lines with only spaces
-# 
+#
 # There are some places in the documentation where a POD directive is
 # ignored because the line before it contains whitespace (and so the
 # directive doesn't start a paragraph).  This patch adds a way to check
@@ -48,23 +48,33 @@ print OUT <<'!NO!SUBS!';
 # problem currently exists.
 #
 #  Version 1.00  Original.
-#  Version 1.01  Andy Dougherty <doughera@lafcol.lafayette.edu>
+#  Version 1.01  Andy Dougherty <doughera@lafayette.edu>
 #    Trivial modifications to output format for easier auto-parsing
 #    Broke it out as a separate function to avoid nasty
 #	Make/Shell/Perl quoting problems, and also to make it easier
 #	to grow.  Someone will probably want to rewrite in terms of
 #	some sort of Pod::Checker module.  Or something.  Consider this
 #	a placeholder for the future.
-$exit = $last_blank = 0;
+#  Version 1.02  Roderick Schertler <roderick@argon.org>
+#	Check for pod directives following any kind of unempty line, not
+#	just lines of whitespace.
+
+@directive = qw(head1 head2 item over back cut pod for begin end);
+@directive{@directive} = (1) x @directive;
+
+$exit = $last_unempty = 0;
 while (<>) {
-    chop;
-    if (/^(=\S+)/ && $last_blank) {
-	printf "%s: line %5d, Non-empty line preceeding directive %s\n",
+    s/(\012|\015\012|\015)$//;
+    if (/^=(\S+)/ && $directive{$1} && $last_unempty) {
+	printf "%s: line %5d, no blank line preceeding directive =%s\n",
 		$ARGV, $., $1;
 	$exit = 1;
     }
-    $last_blank = /^\s+$/;
-    close(ARGV) if eof;
+    $last_unempty = ($_ ne '');
+    if (eof) {
+	close(ARGV);
+	$last_unempty = 0;
+    }
 }
 exit $exit
 !NO!SUBS!
@@ -72,3 +82,4 @@ exit $exit
 close OUT or die "Can't close $file: $!";
 chmod 0755, $file or die "Can't reset permissions for $file: $!\n";
 exec("$Config{'eunicefix'} $file") if $Config{'eunicefix'} ne ':';
+chdir $origdir;