Integrate win32 branch into mainline.

p4raw-id: //depot/perl@983

9 files changed, 218 insertions, 110 deletions

diff --git a/lib/Carp.pm b/lib/Carp.pm
index 685a7933d0..6bac36446a 100644
--- a/lib/Carp.pm
+++ b/lib/Carp.pm
@@ -47,10 +47,20 @@ environment variable.
 
 # This package is heavily used. Be small. Be fast. Be good.
 
+# Comments added by Andy Wardley <abw@kfs.org> 09-Apr-98, based on an
+# _almost_ complete understanding of the package.  Corrections and
+# comments are welcome.
+
+# The $CarpLevel variable can be set to "strip off" extra caller levels for
+# those times when Carp calls are buried inside other functions.  The
+# $Max(EvalLen|(Arg(Len|Nums)) variables are used to specify how the eval
+# text and function arguments should be formatted when printed.
+
 $CarpLevel = 0;		# How many extra package levels to skip on carp.
 $MaxEvalLen = 0;	# How much eval '...text...' to show. 0 = all.
 $MaxArgLen = 64;        # How much of each argument to print. 0 = all.
 $MaxArgNums = 8;        # How many arguments to print. 0 = all.
+$Verbose = 0;		# If true then make shortmess call longmess instead
 
 require Exporter;
 @ISA = ('Exporter');
@@ -58,30 +68,58 @@ require Exporter;
 @EXPORT_OK = qw(cluck verbose);
 @EXPORT_FAIL = qw(verbose);	# hook to enable verbose mode
 
+
+# if the caller specifies verbose usage ("perl -MCarp=verbose script.pl")
+# then the following method will be called by the Exporter which knows
+# to do this thanks to @EXPORT_FAIL, above.  $_[1] will contain the word
+# 'verbose'.
+
 sub export_fail {
     shift;
-    if ($_[0] eq 'verbose') {
-	local $^W = 0;
-	*shortmess = \&longmess;
-	shift;
-    }
+    $Verbose = shift if $_[0] eq 'verbose';
     return @_;
 }
 
 
+# longmess() crawls all the way up the stack reporting on all the function
+# calls made.  The error string, $error, is originally constructed from the
+# arguments passed into longmess() via confess(), cluck() or shortmess().
+# This gets appended with the stack trace messages which are generated for
+# each function call on the stack.
+
 sub longmess {
     my $error = join '', @_;
     my $mess = "";
     my $i = 1 + $CarpLevel;
     my ($pack,$file,$line,$sub,$hargs,$eval,$require);
     my (@a);
+    #
+    # crawl up the stack....
+    #
     while (do { { package DB; @a = caller($i++) } } ) {
-      ($pack,$file,$line,$sub,$hargs,undef,$eval,$require) = @a;
+	# get copies of the variables returned from caller()
+	($pack,$file,$line,$sub,$hargs,undef,$eval,$require) = @a;
+	#
+	# if the $error error string is newline terminated then it
+	# is copied into $mess.  Otherwise, $mess gets set (at the end of
+	# the 'else {' section below) to one of two things.  The first time
+	# through, it is set to the "$error at $file line $line" message.
+	# $error is then set to 'called' which triggers subsequent loop
+	# iterations to append $sub to $mess before appending the "$error
+	# at $file line $line" which now actually reads "called at $file line
+	# $line".  Thus, the stack trace message is constructed:
+	#
+	#        first time: $mess  = $error at $file line $line
+	#  subsequent times: $mess .= $sub $error at $file line $line
+	#                                  ^^^^^^
+	#                                 "called"
 	if ($error =~ m/\n$/) {
 	    $mess .= $error;
 	} else {
+	    # Build a string, $sub, which names the sub-routine called.
+	    # This may also be "require ...", "eval '...' or "eval {...}"
 	    if (defined $eval) {
-	        if ($require) {
+		if ($require) {
 		    $sub = "require $eval";
 		} else {
 		    $eval =~ s/([\\\'])/\\$1/g;
@@ -93,32 +131,48 @@ sub longmess {
 	    } elsif ($sub eq '(eval)') {
 		$sub = 'eval {...}';
 	    }
+	    # if there are any arguments in the sub-routine call, format
+	    # them according to the format variables defined earlier in
+	    # this file and join them onto the $sub sub-routine string
 	    if ($hargs) {
-	      @a = @DB::args;	# must get local copy of args
-	      if ($MaxArgNums and @a > $MaxArgNums) {
-		$#a = $MaxArgNums;
-		$a[$#a] = "...";
-	      }
-	      for (@a) {
-		$_ = "undef", next unless defined $_;
-		if (ref $_) {
-		  $_ .= '';
-		  s/'/\\'/g;
+		# we may trash some of the args so we take a copy
+		@a = @DB::args;	# must get local copy of args
+		# don't print any more than $MaxArgNums
+		if ($MaxArgNums and @a > $MaxArgNums) {
+		    # cap the length of $#a and set the last element to '...'
+		    $#a = $MaxArgNums;
+		    $a[$#a] = "...";
 		}
-		else {
-		  s/'/\\'/g;
-		  substr($_,$MaxArgLen) = '...'
-		    if $MaxArgLen and $MaxArgLen < length;
+		for (@a) {
+		    # set args to the string "undef" if undefined
+		    $_ = "undef", next unless defined $_;
+		    if (ref $_) {
+			# dunno what this is for...
+			$_ .= '';
+			s/'/\\'/g;
+		    }
+		    else {
+			s/'/\\'/g;
+			# terminate the string early with '...' if too long
+			substr($_,$MaxArgLen) = '...'
+			    if $MaxArgLen and $MaxArgLen < length;
+		    }
+		    # 'quote' arg unless it looks like a number
+		    $_ = "'$_'" unless /^-?[\d.]+$/;
+		    # print high-end chars as 'M-<char>' or '^<char>'
+		    s/([\200-\377])/sprintf("M-%c",ord($1)&0177)/eg;
+		    s/([\0-\37\177])/sprintf("^%c",ord($1)^64)/eg;
 		}
-		$_ = "'$_'" unless /^-?[\d.]+$/;
-		s/([\200-\377])/sprintf("M-%c",ord($1)&0177)/eg;
-		s/([\0-\37\177])/sprintf("^%c",ord($1)^64)/eg;
-	      }
-	      $sub .= '(' . join(', ', @a) . ')';
+		# append ('all', 'the', 'arguments') to the $sub string
+		$sub .= '(' . join(', ', @a) . ')';
 	    }
+	    # here's where the error message, $mess, gets constructed
 	    $mess .= "\t$sub " if $error eq "called";
 	    $mess .= "$error at $file line $line\n";
 	}
+	# we don't need to print the actual error message again so we can
+	# change this to "called" so that the string "$error at $file line
+	# $line" makes sense as "called at $file line $line".
 	$error = "called";
     }
     # this kludge circumvents die's incorrect handling of NUL
@@ -127,36 +181,71 @@ sub longmess {
     $$msg;
 }
 
+
+# shortmess() is called by carp() and croak() to skip all the way up to
+# the top-level caller's package and report the error from there.  confess()
+# and cluck() generate a full stack trace so they call longmess() to
+# generate that.  In verbose mode shortmess() calls longmess() so
+# you always get a stack trace
+
 sub shortmess {	# Short-circuit &longmess if called via multiple packages
+    goto &longmess if $Verbose;
     my $error = join '', @_;
     my ($prevpack) = caller(1);
     my $extra = $CarpLevel;
     my $i = 2;
     my ($pack,$file,$line);
+    # when reporting an error, we want to report it from the context of the
+    # calling package.  So what is the calling package?  Within a module,
+    # there may be many calls between methods and perhaps between sub-classes
+    # and super-classes, but the user isn't interested in what happens
+    # inside the package.  We start by building a hash array which keeps
+    # track of all the packages to which the calling package belongs.  We
+    # do this by examining its @ISA variable.  Any call from a base class
+    # method (one of our caller's @ISA packages) can be ignored
     my %isa = ($prevpack,1);
 
+    # merge all the caller's @ISA packages into %isa.
     @isa{@{"${prevpack}::ISA"}} = ()
 	if(defined @{"${prevpack}::ISA"});
 
+    # now we crawl up the calling stack and look at all the packages in
+    # there.  For each package, we look to see if it has an @ISA and then
+    # we see if our caller features in that list.  That would imply that
+    # our caller is a derived class of that package and its calls can also
+    # be ignored
     while (($pack,$file,$line) = caller($i++)) {
 	if(defined @{$pack . "::ISA"}) {
 	    my @i = @{$pack . "::ISA"};
 	    my %i;
 	    @i{@i} = ();
+	    # merge any relevant packages into %isa
 	    @isa{@i,$pack} = ()
 		if(exists $i{$prevpack} || exists $isa{$pack});
 	}
 
+	# and here's where we do the ignoring... if the package in
+	# question is one of our caller's base or derived packages then
+	# we can ignore it (skip it) and go onto the next (but note that
+	# the continue { } block below gets called every time)
 	next
 	    if(exists $isa{$pack});
 
+	# Hey!  We've found a package that isn't one of our caller's
+	# clan....but wait, $extra refers to the number of 'extra' levels
+	# we should skip up.  If $extra > 0 then this is a false alarm.
+	# We must merge the package into the %isa hash (so we can ignore it
+	# if it pops up again), decrement $extra, and continue.
 	if ($extra-- > 0) {
 	    %isa = ($pack,1);
 	    @isa{@{$pack . "::ISA"}} = ()
 		if(defined @{$pack . "::ISA"});
 	}
 	else {
-	    # this kludge circumvents die's incorrect handling of NUL
+	    # OK!  We've got a candidate package.  Time to construct the
+	    # relevant error message and return it.   die() doesn't like
+	    # to be given NUL characters (which $msg may contain) so we
+	    # remove them first.
 	    (my $msg = "$error at $file line $line\n") =~ tr/\0//d;
 	    return $msg;
 	}
@@ -165,12 +254,23 @@ sub shortmess {	# Short-circuit &longmess if called via multiple packages
 	$prevpack = $pack;
     }
 
+    # uh-oh!  It looks like we crawled all the way up the stack and
+    # never found a candidate package.  Oh well, let's call longmess
+    # to generate a full stack trace.  We use the magical form of 'goto'
+    # so that this shortmess() function doesn't appear on the stack
+    # to further confuse longmess() about it's calling package.
     goto &longmess;
 }
 
-sub confess { die longmess @_; }
-sub croak { die shortmess @_; }
-sub carp { warn shortmess @_; }
-sub cluck { warn longmess @_; }
+
+# the following four functions call longmess() or shortmess() depending on
+# whether they should generate a full stack trace (confess() and cluck())
+# or simply report the caller's package (croak() and carp()), respectively.
+# confess() and croak() die, carp() and cluck() warn.
+
+sub croak   { die  shortmess @_ }
+sub confess { die  longmess  @_ }
+sub carp    { warn shortmess @_ }
+sub cluck   { warn longmess  @_ }
 
 1;
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index 4f861dfe2a..99ca0bd1fb 100644
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
@@ -1953,7 +1953,7 @@ pure_site_install ::
 		}.$self->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{
 
 doc_perl_install ::
-	}.$self->{NOECHO}.q{$(DOC_INSTALL) \
+	-}.$self->{NOECHO}.q{$(DOC_INSTALL) \
 		"Module" "$(NAME)" \
 		"installed into" "$(INSTALLPRIVLIB)" \
 		LINKTYPE "$(LINKTYPE)" \
@@ -1962,7 +1962,7 @@ doc_perl_install ::
 		>> }.$self->catfile('$(INSTALLARCHLIB)','perllocal.pod').q{
 
 doc_site_install ::
-	}.$self->{NOECHO}.q{$(DOC_INSTALL) \
+	-}.$self->{NOECHO}.q{$(DOC_INSTALL) \
 		"Module" "$(NAME)" \
 		"installed into" "$(INSTALLSITELIB)" \
 		LINKTYPE "$(LINKTYPE)" \
@@ -2327,7 +2327,7 @@ $tmp/perlmain.c: $makefilename}, q{
     push @m, q{
 doc_inst_perl:
 	}.$self->{NOECHO}.q{echo Appending installation info to $(INSTALLARCHLIB)/perllocal.pod
-	}.$self->{NOECHO}.q{$(DOC_INSTALL) \
+	-}.$self->{NOECHO}.q{$(DOC_INSTALL) \
 		"Perl binary" "$(MAP_TARGET)" \
 		MAP_STATIC "$(MAP_STATIC)" \
 		MAP_EXTRA "`cat $(INST_ARCHAUTODIR)/extralibs.all`" \
diff --git a/lib/File/Basename.pm b/lib/File/Basename.pm
index 3333844ca6..e21af92682 100644
--- a/lib/File/Basename.pm
+++ b/lib/File/Basename.pm
@@ -160,23 +160,23 @@ sub fileparse {
   if ($fstype =~ /^VMS/i) {
     if ($fullname =~ m#/#) { $fstype = '' }  # We're doing Unix emulation
     else {
-      ($dirpath,$basename) = ($fullname =~ /^(.*[:>\]])?(.*)/);
+      ($dirpath,$basename) = ($fullname =~ /^(.*[:>\]])?(.*)/t);
       $dirpath ||= '';  # should always be defined
     }
   }
   if ($fstype =~ /^MS(DOS|Win32)/i) {
-    ($dirpath,$basename) = ($fullname =~ /^((?:.*[:\\\/])?)(.*)/);
+    ($dirpath,$basename) = ($fullname =~ /^((?:.*[:\\\/])?)(.*)/t);
     $dirpath .= '.\\' unless $dirpath =~ /[\\\/]$/;
   }
   elsif ($fstype =~ /^MacOS/i) {
-    ($dirpath,$basename) = ($fullname =~ /^(.*:)?(.*)/);
+    ($dirpath,$basename) = ($fullname =~ /^(.*:)?(.*)/t);
   }
   elsif ($fstype =~ /^AmigaOS/i) {
-    ($dirpath,$basename) = ($fullname =~ /(.*[:\/])?(.*)/);
+    ($dirpath,$basename) = ($fullname =~ /(.*[:\/])?(.*)/t);
     $dirpath = './' unless $dirpath;
   }
   elsif ($fstype !~ /^VMS/i) {  # default to Unix
-    ($dirpath,$basename) = ($fullname =~ m#^(.*/)?(.*)#);
+    ($dirpath,$basename) = ($fullname =~ m#^(.*/)?(.*)#t);
     if ($^O eq 'VMS' and $fullname =~ m:/[^/]+/000000/?:) {
       # dev:[000000] is top of VMS tree, similar to Unix '/'
       ($basename,$dirpath) = ('',$fullname);
@@ -188,7 +188,7 @@ sub fileparse {
     $tail = '';
     foreach $suffix (@suffices) {
       my $pat = ($igncase ? '(?i)' : '') . "($suffix)\$";
-      if ($basename =~ s/$pat//) {
+      if ($basename =~ s/$pat//t) {
         $taint .= substr($suffix,0,0);
         $tail = $1 . $tail;
       }
@@ -226,30 +226,30 @@ sub dirname {
     }
     if ($fstype =~ /MacOS/i) { return $dirname }
     elsif ($fstype =~ /MSDOS/i) { 
-        $dirname =~ s/([^:])[\\\/]*$/$1/;
+        $dirname =~ s/([^:])[\\\/]*$/$1/t;
         unless( length($basename) ) {
 	    ($basename,$dirname) = fileparse $dirname;
-	    $dirname =~ s/([^:])[\\\/]*$/$1/;
+	    $dirname =~ s/([^:])[\\\/]*$/$1/t;
 	}
     }
     elsif ($fstype =~ /MSWin32/i) { 
-        $dirname =~ s/([^:])[\\\/]*$/$1/;
+        $dirname =~ s/([^:])[\\\/]*$/$1/t;
         unless( length($basename) ) {
 	    ($basename,$dirname) = fileparse $dirname;
-	    $dirname =~ s/([^:])[\\\/]*$/$1/;
+	    $dirname =~ s/([^:])[\\\/]*$/$1/t;
 	}
     }
     elsif ($fstype =~ /AmigaOS/i) {
         if ( $dirname =~ /:$/) { return $dirname }
         chop $dirname;
-        $dirname =~ s#[^:/]+$## unless length($basename);
+        $dirname =~ s#[^:/]+$##t unless length($basename);
     }
     else { 
         $dirname =~ s:(.)/*$:$1:;
         unless( length($basename) ) {
 	    local($File::Basename::Fileparse_fstype) = $fstype;
 	    ($basename,$dirname) = fileparse $dirname;
-	    $dirname =~ s:(.)/*$:$1:;
+	    $dirname =~ s:(.)/*$:$1:t;
 	}
     }
 
diff --git a/lib/File/Find.pm b/lib/File/Find.pm
index 67abf6088b..1305d21e6b 100644
--- a/lib/File/Find.pm
+++ b/lib/File/Find.pm
@@ -202,7 +202,7 @@ sub find {
   find_opt(wrap_wanted($wanted), @_);
 }
 
-sub find_depth {
+sub finddepth {
   my $wanted = wrap_wanted(shift);
   $wanted->{bydepth} = 1;
   find_opt($wanted, @_);
diff --git a/lib/Pod/Html.pm b/lib/Pod/Html.pm
index 8ff3e8964b..dafa27d781 100644
--- a/lib/Pod/Html.pm
+++ b/lib/Pod/Html.pm
@@ -3,6 +3,8 @@ package Pod::Html;
 use Pod::Functions;
 use Getopt::Long;	# package for handling command-line parameters
 require Exporter;
+use vars qw($VERSION);
+$VERSION = 1.01;
 @ISA = Exporter;
 @EXPORT = qw(pod2html htmlify);
 use Cwd;
@@ -11,13 +13,15 @@ use Carp;
 
 use strict;
 
+use Config;
+
 =head1 NAME
 
-Pod::HTML - module to convert pod files to HTML
+Pod::Html - module to convert pod files to HTML
 
 =head1 SYNOPSIS
 
-    use Pod::HTML;
+    use Pod::Html;
     pod2html([options]);
 
 =head1 DESCRIPTION
@@ -302,7 +306,7 @@ sub pod2html {
 	for (my $i = 0; $i < @poddata; $i++) { 
 	    if ($poddata[$i] =~ /^=head1\s*NAME\b/m) {
 		for my $para ( @poddata[$i, $i+1] ) { 
-		    last TITLE_SEARCH if ($title) = $para =~ /(\S+\s+-+\s*.*)/s;
+		    last TITLE_SEARCH if ($title) = $para =~ /(\S+\s+-+.*\S)/s;
 		}
 	    } 
 
@@ -316,19 +320,22 @@ sub pod2html {
 	warn "adopted '$title' as title for $podfile\n"
 	    if $verbose and $title;
     } 
-    unless ($title) { 
+    if ($title) {
+	$title =~ s/\s*\(.*\)//;
+    } else {
 	warn "$0: no title for $podfile";
 	$podfile =~ /^(.*)(\.[^.\/]+)?$/;
 	$title = ($podfile eq "-" ? 'No Title' : $1);
 	warn "using $title" if $verbose;
     }
     print HTML <<END_OF_HEAD;
-    <HTML> 
-	<HEAD> 
-	    <TITLE>$title</TITLE> 
-	</HEAD>
+<HTML>
+<HEAD>
+<TITLE>$title</TITLE>
+<LINK REV="made" HREF="mailto:$Config{perladmin}">
+</HEAD>
 
-	<BODY>
+<BODY>
 
 END_OF_HEAD
 
@@ -368,9 +375,9 @@ END_OF_HEAD
 	    } else {
 		next if @begin_stack && $begin_stack[-1] ne 'html';
 
-		if (/^=(head[1-6])\s+(.*)/s) {	# =head[1-6] heading
+		if (/^=(head[1-6])\s+(.*\S)/s) {	# =head[1-6] heading
 		    process_head($1, $2);
-		} elsif (/^=item\s*(.*)/sm) {	# =item text
+		} elsif (/^=item\s*(.*\S)/sm) {	# =item text
 		    process_item($1);
 		} elsif (/^=over\s*(.*)/) {		# =over N
 		    process_over();
@@ -391,16 +398,16 @@ END_OF_HEAD
 	    next if @begin_stack && $begin_stack[-1] ne 'html';
 	    my $text = $_;
 	    process_text(\$text, 1);
-	    print HTML "$text\n<P>\n\n";
+	    print HTML "<P>\n$text";
 	}
     }
 
     # finish off any pending directives
     finish_list();
     print HTML <<END_OF_TAIL;
-    </BODY>
+</BODY>
 
-    </HTML>
+</HTML>
 END_OF_TAIL
 
     # close the html file
@@ -782,7 +789,7 @@ sub scan_headings {
 
 	    $index .= "\n" . ("\t" x $listdepth) . "<LI>" .
 	              "<A HREF=\"#" . htmlify(0,$title) . "\">" .
-		      process_text(\$title, 0) . "</A>";
+		      html_escape(process_text(\$title, 0)) . "</A>";
 	}
     }
 
@@ -823,8 +830,8 @@ sub scan_items {
 	    if ($1 eq "*") {		# bullet list
 		/\A=item\s+\*\s*(.*?)\s*\Z/s;
 		$item = $1;
-	    } elsif ($1 =~ /^[0-9]+/) {	# numbered list
-		/\A=item\s+[0-9]+\.?(.*?)\s*\Z/s;
+	    } elsif ($1 =~ /^\d+/) {	# numbered list
+		/\A=item\s+\d+\.?(.*?)\s*\Z/s;
 		$item = $1;
 	    } else {
 #		/\A=item\s+(.*?)\s*\Z/s;
@@ -856,6 +863,7 @@ sub process_head {
     print HTML "<H$level>"; # unless $listlevel;
     #print HTML "<H$level>" unless $listlevel;
     my $convert = $heading; process_text(\$convert, 0);
+    $convert = html_escape($convert);
     print HTML '<A NAME="' . htmlify(0,$heading) . "\">$convert</A>";
     print HTML "</H$level>"; # unless $listlevel;
     print HTML "\n";
@@ -898,30 +906,36 @@ sub process_item {
 	    print HTML "<UL>\n";
 	}
 
-       print HTML "<LI><STRONG>";
-       $text =~ /\A\*\s*(.*)\Z/s;
-       print HTML "<A NAME=\"item_" . htmlify(1,$1) . "\">" if $1 && !$items_named{$1}++;
-       $quote = 1;
-       #print HTML process_puretext($1, \$quote);
-       print HTML $1;
-       print HTML "</A>" if $1;
-       print HTML "</STRONG>";
+	print HTML '<LI>';
+	if ($text =~ /\A\*\s*(.+)\Z/s) {
+	    print HTML '<STRONG>';
+	    if ($items_named{$1}++) {
+		print HTML html_escape($1);
+	    } else {
+		my $name = 'item_' . htmlify(1,$1);
+		print HTML qq(<A NAME="$name">), html_escape($1), '</A>';
+	    }
+	    print HTML '</STRONG>';
+	}
 
-    } elsif ($text =~ /\A[0-9#]+/) {	# numbered list
+    } elsif ($text =~ /\A[\d#]+/) {	# numbered list
 
 	if ($need_preamble) {
 	    push(@listend,  "</OL>");
 	    print HTML "<OL>\n";
 	}
 
-       print HTML "<LI><STRONG>";
-       $text =~ /\A[0-9]+\.?(.*)\Z/s;
-       print HTML "<A NAME=\"item_" . htmlify(0,$1) . "\">" if $1;
-       $quote = 1;
-       #print HTML process_puretext($1, \$quote);
-       print HTML $1 if $1;
-       print HTML "</A>" if $1;
-       print HTML "</STRONG>";
+	print HTML '<LI>';
+	if ($text =~ /\A\d+\.?\s*(.+)\Z/s) {
+	    print HTML '<STRONG>';
+	    if ($items_named{$1}++) {
+		print HTML html_escape($1);
+	    } else {
+		my $name = 'item_' . htmlify(0,$1);
+		print HTML qq(<A NAME="$name">), html_escape($1), '</A>';
+	    }
+	    print HTML '</STRONG>';
+	}
 
     } else {			# all others
 
@@ -930,18 +944,17 @@ sub process_item {
 	    print HTML "<DL>\n";
 	}
 
-       print HTML "<DT><STRONG>";
-       print HTML "<A NAME=\"item_" . htmlify(1,$text) . "\">" 
-	    if $text && !$items_named{($text =~ /(\S+)/)[0]}++;
-	    # preceding craziness so that the duplicate leading bits in 
-	    # perlfunc work to find just the first one.  otherwise
-	    # open etc would have many names
-       $quote = 1;
-       #print HTML process_puretext($text, \$quote);
-       print HTML $text;
-       print HTML "</A>" if $text;
-       print HTML "</STRONG>";
-
+	print HTML '<DT>';
+	if ($text =~ /(\S+)/) {
+	    print HTML '<STRONG>';
+	    if ($items_named{$1}++) {
+		print HTML html_escape($text);
+	    } else {
+		my $name = 'item_' . htmlify(1,$text);
+		print HTML qq(<A NAME="$name">), html_escape($text), '</A>';
+	    }
+	    print HTML '</STRONG>';
+	}
        print HTML '<DD>';
     }
 
@@ -1276,12 +1289,15 @@ sub process_puretext {
 	    $word = qq(<A HREF="$word">$word</A>);
 	} elsif ($word =~ /[\w.-]+\@\w+\.\w/) {
 	    # looks like an e-mail address
-	    $word = qq(<A HREF="MAILTO:$word">$word</A>);
+	    my ($w1, $w2, $w3) = ("", $word, "");
+	    ($w1, $w2, $w3) = ("(", $1, ")$2") if $word =~ /^\((.*?)\)(,?)/;
+	    ($w1, $w2, $w3) = ("&lt;", $1, "&gt;$2") if $word =~ /^<(.*?)>(,?)/;
+	    $word = qq($w1<A HREF="mailto:$w2">$w2</A>$w3);
 	} elsif ($word !~ /[a-z]/ && $word =~ /[A-Z]/) {  # all uppercase?
-	    $word = html_escape($word) if $word =~ /[&<>]/;
+	    $word = html_escape($word) if $word =~ /["&<>]/;
 	    $word = "\n<FONT SIZE=-1>$word</FONT>" if $netscape;
 	} else { 
-	    $word = html_escape($word) if $word =~ /[&<>]/;
+	    $word = html_escape($word) if $word =~ /["&<>]/;
 	}
     }
 
@@ -1443,6 +1459,7 @@ sub process_C {
     $s1 =~ s/\([^()]*\)//g;	# delete parentheses
     $s2 = $s1;
     $s1 =~ s/\W//g;		# delete bogus characters
+    $str = html_escape($str);
 
     # if there was a pod file that we found earlier with an appropriate
     # =item directive, then create a link to that page.
@@ -1512,7 +1529,7 @@ sub process_X {
 # after the entire pod file has been read and converted.
 #
 sub finish_list {
-    while ($listlevel >= 0) {
+    while ($listlevel > 0) {
 	print HTML "</DL>\n";
 	$listlevel--;
     }
@@ -1546,4 +1563,3 @@ BEGIN {
 }
 
 1;
-
diff --git a/lib/Term/ReadLine.pm b/lib/Term/ReadLine.pm
index 2183c8d235..83ba375742 100644
--- a/lib/Term/ReadLine.pm
+++ b/lib/Term/ReadLine.pm
@@ -310,7 +310,7 @@ sub ornaments {
   return $rl_term_set unless @_;
   $rl_term_set = shift;
   $rl_term_set ||= ',,,';
-  $rl_term_set = 'us,ue,md,me' if $rl_term_set == 1;
+  $rl_term_set = 'us,ue,md,me' if $rl_term_set eq '1';
   my @ts = split /,/, $rl_term_set, 4;
   eval { LoadTermCap };
   unless (defined $terminal) {
diff --git a/lib/strict.pm b/lib/strict.pm
index 2b1d964e65..4e2baa3b1c 100644
--- a/lib/strict.pm
+++ b/lib/strict.pm
@@ -72,19 +72,11 @@ appears in curly braces or on the left hand side of the "=E<gt>" symbol.
 
 =back
 
-See L<perlmod/Pragmatic Modules>.
+See L<perlmodlib/Pragmatic Modules>.
 
 
 =cut
 
-$strict::VERSION = "1.01";
-
-my %bitmask = (
-refs => 0x00000002,
-subs => 0x00000200,
-vars => 0x00000400
-);
-
 sub bits {
     my $bits = 0;
     foreach my $s (@_){ $bits |= $bitmask{$s} || 0; };
diff --git a/lib/subs.pm b/lib/subs.pm
index 512bc9be9a..aa332a6785 100644
--- a/lib/subs.pm
+++ b/lib/subs.pm
@@ -20,7 +20,7 @@ C<use subs> declarations are not BLOCK-scoped.  They are thus effective
 for the entire file in which they appear.  You may not rescind such
 declarations with C<no vars> or C<no subs>.
 
-See L<perlmod/Pragmatic Modules> and L<strict/strict subs>.
+See L<perlmodlib/Pragmatic Modules> and L<strict/strict subs>.
 
 =cut
 
diff --git a/lib/vars.pm b/lib/vars.pm
index 5723ac6c2c..5256d1199f 100644
--- a/lib/vars.pm
+++ b/lib/vars.pm
@@ -61,6 +61,6 @@ outside of the package), it can act as an acceptable substitute by
 pre-declaring global symbols, ensuring their availability to the
 later-loaded routines.
 
-See L<perlmod/Pragmatic Modules>.
+See L<perlmodlib/Pragmatic Modules>.
 
 =cut