Convert another test to DebugWrap.

[perl5.git] / installhtml

diff --git a/installhtml b/installhtml
index 0208cc8..75d6adc 100644 (file)
--- a/installhtml
+++ b/installhtml
@@ -4,7 +4,7 @@
 
 use strict;
 use Config;            # for config options in the makefile
-use File::Spec;
+use File::Spec::Functions qw(rel2abs no_upwards);
 use Getopt::Long;      # for command-line parsing
 use Cwd;
 use Pod::Html 'anchorify';
@@ -291,14 +291,11 @@ sub parse_command_line {
 sub create_index {
     my($html, $dir) = @_;
     (my $pod = $dir) =~ s,^.*/,,;
-    my(@files, @filedata, @index, $file);
-    my($lcp1,$lcp2);
-
 
     # get the list of .html files in this directory
     opendir(DIR, $dir) ||
        die "$0: error opening directory $dir for reading: $!\n";
-    @files = sort(grep(/\.html?$/, readdir(DIR)));
+    my @files = sort(grep(/\.html?$/, readdir(DIR)));
     closedir(DIR);
 
     open(HTML, ">$html") ||
@@ -307,40 +304,28 @@ sub create_index {
     # for each .html file in the directory, extract the index
     #  embedded in the file and throw it into the big index.
     print HTML "<DL COMPACT>\n";
-    foreach $file (@files) {
-       $/ = "";
+    foreach my $file (@files) {
 
-       open(IN, "<$dir/$file") ||
-           die "$0: error opening $dir/$file for input: $!\n";
-       @filedata = <IN>;
-       close(IN);
+       my $filedata = do {
+           open(my $in, "<$dir/$file") ||
+               die "$0: error opening $dir/$file for input: $!\n";
+           local $/ = undef;
+           <$in>;
+       };
 
        # pull out the NAME section
-       my $name;
-       ($name) = grep(/name="name"/i, @filedata);
-       ($lcp1,$lcp2) = ($name =~ m,/H1>\s(\S+)\s[\s-]*(.*?)\s*$,smi);
-       if (defined $lcp1 and $lcp1 =~ m,^<P>$,i) { # Uninteresting.  Try again.
-           ($lcp1,$lcp2) = ($name =~ m,/H1>\s<P>\s*(\S+)\s[\s-]*(.*?)\s*$,smi);
-       }
+       my($lcp1, $lcp2) =
+           ($filedata =~
+               m#<h1 id="NAME">NAME</h1>\s*<p>\s*(\S+)\s+-\s+(\S.*?\S)</p>#);
+       defined $lcp1 or die "$0: can't find NAME section in $dir/$file\n";
+
        my $url= "$pod/$file" ;
        if ( ! defined $Options{htmlroot} || $Options{htmlroot} eq '' ) {
            $url = Pod::Html::relativize_url( "$pod/$file", $html ) ;
        }
 
-       if (defined $lcp1) {
-           print HTML qq(<DT><A HREF="$url">);
-           print HTML "$lcp1</A></DT><DD>$lcp2</DD>\n";
-       }
-
-       next;
-
-       @index = grep(/<!-- INDEX BEGIN -->.*<!-- INDEX END -->/s,
-                   @filedata);
-       for (@index) {
-           s/<!-- INDEX BEGIN -->(\s*<!--)(.*)(-->\s*)<!-- INDEX END -->/$lcp2/s;
-           s,#,$dir/$file#,g;
-           print HTML "$_\n<P><HR><P>\n";
-       }
+       print HTML qq(<DT><A HREF="$url">);
+       print HTML "$lcp1</A></DT><DD>$lcp2</DD>\n";
     }
     print HTML "</DL>\n";
 
@@ -377,8 +362,8 @@ sub split_on_item {
 
     print "splitting files by item.\n" if $verbose && $#splititem >= 0;
     $pwd = getcwd();
-    my $splitter = File::Spec->rel2abs("$splitpod/splitpod", $pwd);
-    my $perl = File::Spec->rel2abs($^X, $pwd);
+    my $splitter = rel2abs("$splitpod/splitpod", $pwd);
+    my $perl = rel2abs($^X, $pwd);
     foreach my $pod (@splititem) {
        # figure out the directory to split into
        $pod      =~ s,^([^/]*)$,/$1,;
@@ -500,34 +485,34 @@ sub splitpod {
 #
 sub installdir {
     my($dir, $recurse, $podroot, $splitdirs, $ignore) = @_;
-    my(@dirlist, @podlist, @pmlist, $doindex);
 
-    @dirlist = ();     # directories to recurse on
-    @podlist = ();     # .pod files to install
-    @pmlist  = ();     # .pm files to install
+    my @dirlist; # directories to recurse on
+    my @podlist; # .pod files to install
+    my @pmlist;  # .pm files to install
 
     # should files in this directory get an index?
-    $doindex = (grep($_ eq "$podroot/$dir", @$splitdirs) ? 0 : 1);
+    my $doindex = (grep($_ eq "$podroot/$dir", @$splitdirs) ? 0 : 1);
 
     opendir(DIR, "$podroot/$dir")
        || die "$0: error opening directory $podroot/$dir: $!\n";
 
-    # find the directories to recurse on
-    @dirlist = map { if ($^O eq 'VMS') {/^(.*)\.dir$/i; "$dir/$1";} else {"$dir/$_";}}
-       grep(-d "$podroot/$dir/$_" && !/^\.{1,2}/, readdir(DIR)) if $recurse;
-    rewinddir(DIR);
-
-    # find all the .pod files within the directory
-    @podlist = map { /^(.*)\.pod$/; "$dir/$1" }
-       grep(! -d "$podroot/$dir/$_" && /\.pod$/, readdir(DIR));
-    rewinddir(DIR);
-
-    # find all the .pm files within the directory
-    @pmlist = map { /^(.*)\.pm$/; "$dir/$1" }
-       grep(! -d "$podroot/$dir/$_" && /\.pm$/, readdir(DIR));
+    while(readdir DIR) {
+       no_upwards($_) or next;
+       my $is_dir = -d "$podroot/$dir/$_";
+       next if $is_dir and not $recurse;
+       my $target = (
+           $is_dir    ? \@dirlist :
+           s/\.pod$// ? \@podlist :
+           s/\.pm$//  ? \@pmlist  :
+           undef
+       );
+       push @$target, "$dir/$_" if $target;
+    }
 
     closedir(DIR);
 
+    if ($^O eq 'VMS') { s/\.dir$//i for @dirlist }
+
     # recurse on all subdirectories we kept track of
     foreach $dir (@dirlist) {
        installdir($dir, $recurse, $podroot, $splitdirs, $ignore);