===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 3.9
retrieving revision 3.19
diff -u -p -r3.9 -r3.19
--- cvsweb/cvsweb.cgi	2000/07/29 12:41:25	3.9
+++ cvsweb/cvsweb.cgi	2000/09/04 15:53:41	3.19
@@ -1,11 +1,11 @@
-#!/usr/bin/perl -ws
+#!/usr/bin/perl5 -ws
 #
 # cvsweb - a CGI interface to CVS trees.
 #
-# Written in their spare time by 
+# Written in their spare time by
 #             Bill Fenner      <fenner@FreeBSD.org>   (original work)
 # extended by Henner Zeller    <zeller@think.de>,
-#             Henrik Nordstrom <hno@hem.passagen.se> 
+#             Henrik Nordstrom <hno@hem.passagen.se>
 #             Ken Coar         <coar@Apache.Org>
 #             Dick Balaska     <dick@buckosoft.com>
 #             Akinori MUSHA    <knu@FreeBSD.org>
@@ -41,8 +41,8 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $zId: cvsweb.cgi,v 1.93 2000/07/27 17:42:28 hzeller Exp $
-# $Id: cvsweb.cgi,v 3.9 2000/07/29 12:41:25 knu Exp $
+# $zId: cvsweb.cgi,v 1.94 2000/08/24 06:41:22 hnordstrom Exp $
+# $Id: cvsweb.cgi,v 3.19 2000/09/04 15:53:41 knu Exp $
 #
 ###
 
@@ -53,8 +53,8 @@ use vars qw (
     %CVSROOT %CVSROOTdescr %MIRRORS %DEFAULTVALUE %ICONS %MTYPES
     %alltags @tabcolors %fileinfo %tags @branchnames %nameprinted
     %symrev %revsym @allrevisions %date %author @revdisplayorder
-    @revisions %state %difflines %log %branchpoint @revorder $prcgi
-    @prcategories $prcategories
+    @revisions %state %difflines %log %branchpoint @revorder
+    $prcgi @prcategories $prcategories $mancgi
     $checkoutMagic $doCheckout $scriptname $scriptwhere
     $where $pathinfo $Browser $nofilelinks $maycompress @stickyvars
     %funcline_regexp $is_mod_perl
@@ -79,11 +79,58 @@ use vars qw (
     $use_moddate
 );
 
+sub printDiffSelect($);
+sub findLastModifiedSubdirs(@);
+sub htmlify($;$);
+sub spacedHtmlText($);
+sub link($$);
+sub revcmp($$);
+sub fatal($$);
+sub redirect($);
+sub safeglob($);
+sub getMimeTypeFromSuffix($);
+sub doAnnotate($$);
+sub doCheckout($$);
+sub cvswebMarkup($$$);
+sub viewable($);
+sub doDiff($$$$$$);
+sub getDirLogs($$@);
+sub readLog($;$);
+sub printLog($;$);
+sub doLog($);
+sub flush_diff_rows($$$$);
+sub human_readable_diff($);
+sub navigateHeader($$$$$);
+sub plural_write($$);
+sub readableTime($$);
+sub clickablePath($$);
+sub chooseCVSRoot();
+sub chooseMirror();
+sub fileSortCmp();
+sub download_url($$;$);
+sub download_link($$$;$);
+sub toggleQuery($$);
+sub urlencode($);
+sub http_header(;$);
+sub html_header($);
+sub html_footer();
+sub link_tags($);
+sub forbidden_module($);
+
 ##### Start of Configuration Area ########
-# == EDIT this == 
+use Cwd;
+
+# == EDIT this ==
 # User configuration is stored in
-$config = defined($ENV{CVSWEB_CONFIG}) ? $ENV{CVSWEB_CONFIG} : '/usr/local/etc/cvsweb.conf';
+$config = undef;
 
+for ($ENV{CVSWEB_CONFIG},
+#     '/home/knu/etc/cvsweb.conf',
+     '/usr/local/etc/cvsweb.conf',
+     getcwd . '/cvsweb.conf') {
+  $config = $_ if defined($_) && -r $_;
+}
+
 # == Configuration defaults ==
 # Defaults for configuration variables that shouldn't need
 # to be configured..
@@ -105,7 +152,7 @@ $difffontsize = $inputTextSize = $mime_types = $allow_
 $allow_markup = $use_java_script = $open_extern_window =
 $extern_window_width = $extern_window_height = $edit_option_form =
 $checkout_magic = $show_subdir_lastmod = $show_log_in_markup = $v =
-$navigationHeaderColor = $tableBorderColor = $markupLogColor = 
+$navigationHeaderColor = $tableBorderColor = $markupLogColor =
 $tabstop = $use_moddate = $moddate = undef;
 
 ##### End of configuration variables #####
@@ -133,7 +180,7 @@ $is_mod_perl = defined($ENV{MOD_PERL});
 # in lynx, it it very annoying to have two links
 # per file, so disable the link at the icon
 # in this case:
-$Browser = $ENV{HTTP_USER_AGENT} || '';
+$Browser = $ENV{HTTP_USER_AGENT};
 $is_lynx = ($Browser =~ m`^Lynx/`i);
 $is_w3m = ($Browser =~ m`^w3m/`i);
 $is_msie = ($Browser =~ m`MSIE`);
@@ -153,14 +200,14 @@ $nofilelinks = $is_textbased;
 # Turn off gzip if running under mod_perl. piping does
 # not work as expected inside the server. One can probably
 # achieve the same result using Apache::GZIPFilter.
-$maycompress =(($ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`
-		|| $is_mozilla3)
-	       && !$is_msie
-	       && !$is_mod_perl);
+$maycompress = (($ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`
+		 || $is_mozilla3)
+		&& !$is_msie
+		&& !$is_mod_perl);
 
 # put here the variables we need in order
 # to hold our state - they will be added (with
-# their current value) to any link/query string 
+# their current value) to any link/query string
 # you construct
 @stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag);
 
@@ -178,7 +225,7 @@ else {
 undef %input;
 $query = $ENV{QUERY_STRING};
 
-if ($query ne '') {
+if (defined($query) && $query ne '') {
     foreach (split(/&/, $query)) {
 	s/%(..)/sprintf("%c", hex($1))/ge;	# unquote %-quoted
 	if (/(\S+)=(.*)/) {
@@ -190,7 +237,7 @@ if ($query ne '') {
     }
 }
 
-# For backwards compability, set only_with_tag to only_on_branch if set. 
+# For backwards compability, set only_with_tag to only_on_branch if set.
 $input{only_with_tag} = $input{only_on_branch}
     if (defined($input{only_on_branch}));
 
@@ -217,11 +264,11 @@ foreach (keys %DEFAULTVALUE)
 	}
     }
 }
-    
+
 $barequery = "";
 foreach (@stickyvars) {
     # construct a query string with the sticky non default parameters set
-    if (defined($input{$_}) && $input{$_} ne '' && 
+    if (defined($input{$_}) && $input{$_} ne '' &&
 	!(defined($DEFAULTVALUE{$_}) && $input{$_} eq $DEFAULTVALUE{$_})) {
         if ($barequery) {
 	    $barequery = $barequery . "&amp;";
@@ -300,6 +347,7 @@ foreach my $k (keys %ICONS) {
 do "$config-$cvstree" if (-f "$config-$cvstree");
 
 $prcategories = '(?:' . join('|', @prcategories) . ')';
+$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/;
 
 $fullname = $cvsroot . '/' . $where;
 $mimetype = &getMimeTypeFromSuffix ($fullname);
@@ -309,7 +357,7 @@ $defaultViewable = $allow_markup && viewable($mimetype
 # search for GZIP if compression allowed
 # We've to find out if the GZIP-binary exists .. otherwise
 # ge get an Internal Server Error if we try to pipe the
-# output through the nonexistent gzip .. 
+# output through the nonexistent gzip ..
 # any more elegant ways to prevent this are welcome!
 if ($allow_compress && $maycompress) {
     foreach (split(/:/, $ENV{PATH})) {
@@ -390,13 +438,13 @@ elsif (-d $fullname) {
 		$input{only_with_tag};
 
 	}
-	 
 
+
 	print "<HR NOSHADE>\n";
 	# Using <MENU> in this manner violates the HTML2.0 spec but
 	# provides the results that I want in most browsers.  Another
 	# case of layout spooging up HTML.
-	
+
 	my $infocols = 0;
 	if ($dirtable) {
 	    if (defined($tableBorderColor)) {
@@ -405,8 +453,8 @@ elsif (-d $fullname) {
 	    }
 	    print "<table  width=\"100%\" border=0 cellspacing=1 cellpadding=$tablepadding>\n";
 	    $infocols++;
-	    print "<tr><th align=left bgcolor=\"" . (($byfile) ? 
-						   $columnHeaderColorSorted : 
+	    print "<tr><th align=left bgcolor=\"" . (($byfile) ?
+						   $columnHeaderColorSorted :
 						   $columnHeaderColorDefault) . "\">";
 	    print "<a href=\"./" . &toggleQuery("sortby","file") .
 		"#dirlist\">" if (!$byfile);
@@ -417,8 +465,8 @@ elsif (-d $fullname) {
 	    # with revision information:
 	    if (scalar(%fileinfo)) {
 		$infocols++;
-		print "<th align=left bgcolor=\"" . (($byrev) ? 
-						   $columnHeaderColorSorted : 
+		print "<th align=left bgcolor=\"" . (($byrev) ?
+						   $columnHeaderColorSorted :
 						   $columnHeaderColorDefault) . "\">";
 		print "<a href=\"./" . &toggleQuery ("sortby","rev") .
 		    "#dirlist\">" if (!$byrev);
@@ -426,8 +474,8 @@ elsif (-d $fullname) {
 		print "</a>" if (!$byrev);
 		print "</th>";
 		$infocols++;
-		print "<th align=left bgcolor=\"" . (($bydate) ? 
-						   $columnHeaderColorSorted : 
+		print "<th align=left bgcolor=\"" . (($bydate) ?
+						   $columnHeaderColorSorted :
 						   $columnHeaderColorDefault) . "\">";
 		print "<a href=\"./" . &toggleQuery ("sortby","date") .
 		    "#dirlist\">" if (!$bydate);
@@ -436,8 +484,8 @@ elsif (-d $fullname) {
 		print "</th>";
 		if ($show_author) {
 		    $infocols++;
-		    print "<th align=left bgcolor=\"" . (($byauthor) ? 
-						   $columnHeaderColorSorted : 
+		    print "<th align=left bgcolor=\"" . (($byauthor) ?
+						   $columnHeaderColorSorted :
 						   $columnHeaderColorDefault) . "\">";
 		    print "<a href=\"./" . &toggleQuery ("sortby","author") .
 			    "#dirlist\">" if (!$byauthor);
@@ -446,8 +494,8 @@ elsif (-d $fullname) {
 		    print "</th>";
 		}
 		$infocols++;
-		print "<th align=left bgcolor=\"" . (($bylog) ? 
-					       $columnHeaderColorSorted : 
+		print "<th align=left bgcolor=\"" . (($bylog) ?
+					       $columnHeaderColorSorted :
 					       $columnHeaderColorDefault) . "\">";
 		print "<a href=\"./", toggleQuery("sortby","log"), "#dirlist\">" if (!$bylog);
 		print "Last log entry";
@@ -465,7 +513,7 @@ elsif (-d $fullname) {
 	    print "<menu>\n";
 	}
 	my $dirrow = 0;
-	
+
 	my $i;
 	lookingforattic:
 	for ($i = 0; $i <= $#dir; $i++) {
@@ -480,7 +528,7 @@ elsif (-d $fullname) {
 	    closedir($dh);
 	}
 
-	my $hideAtticToggleLink = "<a href=\"./" . 
+	my $hideAtticToggleLink = "<a href=\"./" .
 	        &toggleQuery ("hideattic") .
 		"#dirlist\">[Hide]</a>" if (!$input{'hideattic'});
 
@@ -542,11 +590,11 @@ elsif (-d $fullname) {
 		    }
 		    print " ", &link($_ . "/", $url), $attic;
 		    if ($_ eq "Attic") {
-			print "&nbsp; <a href=\"./" . 
+			print "&nbsp; <a href=\"./" .
 			    &toggleQuery ("hideattic") .
 				"#dirlist\">[Don't hide]</a>";
 		    }
-		} 
+		}
 		# Show last change in dir
 		if ($filename) {
 		    print "</td><td>&nbsp;</td><td>&nbsp;" if ($dirtable);
@@ -615,7 +663,7 @@ elsif (-d $fullname) {
 		print " ", &link($_, $url), $attic;
 		print "</td><td>&nbsp;" if ($dirtable);
 		download_link($fileurl,
-			$rev, $rev, 
+			$rev, $rev,
 			$defaultViewable ? "text/x-cvsweb-markup" : undef);
 		print "</td><td>&nbsp;" if ($dirtable);
 		if ($date) {
@@ -643,15 +691,15 @@ elsif (-d $fullname) {
 	    print "</td></tr></table>";
 	}
 	print "". ($dirtable == 1) ? "</table>" : "</menu>" . "\n";
-	
+
 	if ($filesexists && !$filesfound) {
 	    print "<P><B>NOTE:</B> There are $filesexists files, but none matches the current tag ($input{only_with_tag})\n";
 	}
 	if ($input{only_with_tag} && (!%tags || !$tags{$input{only_with_tag}})) {
 	    %tags = %alltags
 	}
-	if (scalar %tags 
-	    || $input{only_with_tag} 
+	if (scalar %tags
+	    || $input{only_with_tag}
 	    || $edit_option_form
 	    || defined($input{"options"})) {
 	    print "<hr size=1 NOSHADE>";
@@ -672,8 +720,8 @@ elsif (-d $fullname) {
 	    print ">";
 	    print "<OPTION VALUE=\"\">All tags / default branch\n";
 	    foreach my $tag (reverse sort { lc $a cmp lc $b } keys %tags) {
-		print "<OPTION",defined($input{only_with_tag}) && 
-		       $input{only_with_tag} eq $tag ? " SELECTED":"",
+		print "<OPTION",defined($input{only_with_tag}) &&
+		       $input{only_with_tag} eq $tag ? " SELECTED" : "",
 		       ">$tag\n";
 	    }
 	    print "</SELECT>\n";
@@ -706,17 +754,17 @@ elsif (-d $fullname) {
 	    print "<OPTION VALUE=rev",$logsort eq "rev" ? " SELECTED" : "", ">Revision";
 	    print "</SELECT></td></tr>";
 	    print "<tr><td>Diff format: ";
-	    printDiffSelect();
+	    printDiffSelect(0);
 	    print "</td>";
 	    print "<td>Show Attic files: ";
-	    print "<INPUT NAME=hideattic TYPE=CHECKBOX", $input{'hideattic'}?" CHECKED":"", 
+	    print "<INPUT NAME=hideattic TYPE=CHECKBOX", $input{'hideattic'} ? " CHECKED" : "",
 	    "></td></tr>\n";
 	    print "<tr><td align=center colspan=2><input type=submit value=\"Change Options\">";
 	    print "</td></tr></table></center></FORM>\n";
 	}
 	print &html_footer;
 	print "</BODY></HTML>\n";
-    } 
+    }
 
 ###############################
 # View Files
@@ -790,9 +838,8 @@ elsif (-d $fullname) {
     }
 ## End MAIN
 
-sub printDiffSelect {
+sub printDiffSelect($) {
     my ($use_java_script) = @_;
-    $use_java_script = 0 if (!defined($use_java_script));
     my ($f) = $input{'f'};
     print "<SELECT NAME=\"f\"";
     print " onchange=\"submit()\"" if ($use_java_script);
@@ -805,7 +852,7 @@ sub printDiffSelect {
     print "</SELECT>";
 }
 
-sub findLastModifiedSubdirs {
+sub findLastModifiedSubdirs(@) {
     my (@dirs) = @_;
     my ($dirname, @files);
 
@@ -839,70 +886,81 @@ sub findLastModifiedSubdirs {
     return @files;
 }
 
-sub htmlify {
-	my($string, $pr) = @_;
+sub htmlify($;$) {
+	my($string, $extra) = @_;
 
 	# Special Characters; RFC 1866
 	$string =~ s/&/&amp;/g;
-	$string =~ s/\"/&quot;/g; 
+	$string =~ s/\"/&quot;/g;
 	$string =~ s/</&lt;/g;
 	$string =~ s/>/&gt;/g;
 
 	# get URL's as link ..
-	$string =~ s`(http|ftp|https)(://[-a-zA-Z0-9%.~:_/]+)([?&]([-a-zA-Z0-9%.~:_]+)=([-a-zA-Z0-9%.~:_])+)*`<A HREF="$1$2$3">$1$2$3</A>`;
+	$string =~ s`(http|ftp|https)(://[-a-zA-Z0-9%.~:_/]+)([?&]([-a-zA-Z0-9%.~:_]+)=([-a-zA-Z0-9%.~:_])+)*`<A HREF="$1$2$3">$1$2$3</A>`g;	# `
 	# get e-mails as link
-	$string =~ s`([-a-zA-Z0-9_.]+@([-a-zA-Z0-9]+\.)+[A-Za-z]{2,4})`<A HREF="mailto:$1">$1</A>`;
+	$string =~ s`([-a-zA-Z0-9_.]+@([-a-zA-Z0-9]+\.)+[A-Za-z]{2,4})`<A HREF="mailto:$1">$1</A>`g;	# `
 
-	# get #PR as link ..
-	if ($pr && defined($prcgi)) {
-	    1 while $string =~ s`\b(pr[:#]?\s*(?:#?\d+[,\s]\s*)*#?)(\d+)\b`$1<A HREF="$prcgi$2">$2</A>`i;
-	    $string =~ s`\b${prcategories}/(\d+)\b`<A HREF="$prcgi$1">$&</A>`igo;
+	if ($extra) {
+	    # get PR #'s as link ..
+	    if (defined($prcgi)) {
+		1 while $string =~ s`\b(pr[:#]?\s*(?:#?\d+[,\s]\s*)*#?)(\d+)\b`$1 . &link($2, sprintf($prcgi, $2))`ie; # `
+		$string =~ s`\b${prcategories}/(\d+)\b`&link($&, sprintf($prcgi, $1))`igeo;	# `
+	    }
+
+	    # get manpage specs as link ..
+	    if (defined($mancgi)) {
+		$string =~ s`\b([a-zA-Z]\w+)\(([0-9n])\)\B`&link($&, sprintf($mancgi, $2, $1))`ge; # `
+	    }
 	}
 
 	return $string;
 }
 
-sub spacedHtmlText {
-	my($string, $pr) = @_;
+sub spacedHtmlText($) {
+	local $_ = $_[0];
 
 	# Cut trailing spaces
-	s/\s+$//;
+	s/\s+$/\n/;
 
 	# Expand tabs
-	$string =~ s/\t+/' ' x (length($&) * $tabstop - length($`) % $tabstop)/e
+	s/\t+/' ' x (length($&) * $tabstop - length($`) % $tabstop)/e
 	    if (defined($tabstop));
 
 	# replace <tab> and <space> (\001 is to protect us from htmlify)
 	# gzip can make excellent use of this repeating pattern :-)
-	$string =~ s/\001/\001%/g; #protect our & substitute
+	s/\001/\001%/g; #protect our & substitute
 	if ($hr_breakable) {
 	    # make every other space 'breakable'
-	    $string =~ s/	/ \001nbsp; \001nbsp; \001nbsp; \001nbsp;/g;    # <tab>
-	    $string =~ s/  / \001nbsp;/g;                              # 2 * <space>
+	    s/	/ \001nbsp; \001nbsp; \001nbsp; \001nbsp;/g;    # <tab>
+	    s/  / \001nbsp;/g;                              # 2 * <space>
 	    # leave single space as it is
 	}
 	else {
-	    $string =~ s/	/\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;/g; 
-	    $string =~ s/ /\001nbsp;/g;
+	    s/	/\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;/g;
+	    s/ /\001nbsp;/g;
 	}
 
-	$string = htmlify($string);
+	$_ = htmlify($_);
 
 	# unescape
-	$string =~ s/\001([^%])/&$1/g;
-	$string =~ s/\001%/\001/g;
+	s/\001([^%])/&$1/g;
+	s/\001%/\001/g;
 
-	return $string;
+	return $_;
 }
 
-sub link {
+sub link($$) {
 	my($name, $where) = @_;
 
 	return "<A HREF=\"$where\">$name</A>\n";
 }
 
-sub revcmp {
+sub revcmp($$) {
 	my($rev1, $rev2) = @_;
+
+	# make no comparison for a tag or a branch
+	return 0 if $rev1 =~ /[^\d.]/ || $rev2 =~ /[^\d.]/;
+
 	my(@r1) = split(/\./, $rev1);
 	my(@r2) = split(/\./, $rev2);
 	my($a,$b);
@@ -917,7 +975,7 @@ sub revcmp {
 	return 0;
 }
 
-sub fatal {
+sub fatal($$) {
 	my($errcode, $errmsg) = @_;
 	if ($is_mod_perl) {
 		Apache->request->status((split(/ /, $errcode))[0]);
@@ -931,7 +989,7 @@ sub fatal {
 	exit(1);
 }
 
-sub redirect {
+sub redirect($) {
 	my($url) = @_;
 	if ($is_mod_perl) {
 		Apache->request->status(301);
@@ -947,7 +1005,7 @@ sub redirect {
 	exit(1);
 }
 
-sub safeglob {
+sub safeglob($) {
 	my ($filename) = @_;
 	my ($dirname);
 	my (@results);
@@ -976,7 +1034,7 @@ sub safeglob {
 	@results;
 }
 
-sub getMimeTypeFromSuffix {
+sub getMimeTypeFromSuffix($) {
     my ($fullname) = @_;
     my ($mimetype, $suffix);
     my $fh = do {local(*FH);};
@@ -984,7 +1042,7 @@ sub getMimeTypeFromSuffix {
     ($suffix = $fullname) =~ s/^.*\.([^.]*)$/$1/;
     $mimetype = $MTYPES{$suffix};
     $mimetype = $MTYPES{'*'} if (!$mimetype);
-    
+
     if (!$mimetype && -f $mime_types) {
 	# okey, this is something special - search the
 	# mime.types database
@@ -997,7 +1055,7 @@ sub getMimeTypeFromSuffix {
 	}
 	close ($fh);
     }
-    
+
 # okey, didn't find anything useful ..
     if (!($mimetype =~ /\S\/\S/)) {
 	$mimetype = "text/plain";
@@ -1008,7 +1066,7 @@ sub getMimeTypeFromSuffix {
 ###############################
 # show Annotation
 ###############################
-sub doAnnotate ($$) {
+sub doAnnotate($$) {
     my ($rev) = @_;
     my ($pid);
     my ($pathname, $filename);
@@ -1017,7 +1075,7 @@ sub doAnnotate ($$) {
 
     # make sure the revisions a wellformed, for security
     # reasons ..
-    if (!($rev =~ /^[\d\.]+$/)) {
+    if ($rev =~ /[^\w.]/) {
 	&fatal("404 Not Found",
 		"Malformed query \"$ENV{QUERY_STRING}\"");
     }
@@ -1027,7 +1085,7 @@ sub doAnnotate ($$) {
 
     http_header();
 
-    navigateHeader ($scriptwhere,$pathname,$filename,$rev, "annotate");
+    navigateHeader($scriptwhere,$pathname,$filename,$rev, "annotate");
     print "<h3 align=center>Annotation of $pathname$filename, Revision $rev</h3>\n";
 
     # this seems to be necessary
@@ -1039,9 +1097,9 @@ sub doAnnotate ($$) {
     # the public domain.
     # we could abandon the use of rlog, rcsdiff and co using
     # the cvsserver in a similiar way one day (..after rewrite)
-    $pid = open2($reader, $writer, "cvs server") || fatal ("500 Internal Error", 
+    $pid = open2($reader, $writer, "cvs server") || fatal ("500 Internal Error",
 							       "Fatal Error - unable to open cvs for annotation");
-    
+
     # OK, first send the request to the server.  A simplified example is:
     #     Root /home/kingdon/zwork/cvsroot
     #     Argument foo/xx
@@ -1051,7 +1109,7 @@ sub doAnnotate ($$) {
     #     /home/kingdon/zwork/cvsroot
     #     annotate
     # although as you can see there are a few more details.
-    
+
     print $writer "Root $cvsroot\n";
     print $writer "Valid-responses ok error Valid-requests Checked-in Updated Merged Removed M E\n";
     # Don't worry about sending valid-requests, the server just needs to
@@ -1071,7 +1129,7 @@ sub doAnnotate ($$) {
 	if ($path eq "") {
 	    # In our example, $_ is "dir".
 	    $path = $_;
-	} 
+	}
 	else {
 	    print $writer "Directory $path\n";
 	    print $writer "$cvsroot/$path\n";
@@ -1084,18 +1142,18 @@ sub doAnnotate ($$) {
     # And the last "Directory" before "annotate" is the top level.
     print $writer "Directory .\n";
     print $writer "$cvsroot\n";
-    
+
     print $writer "annotate\n";
     # OK, we've sent our command to the server.  Thing to do is to
     # close the writer side and get all the responses.  If "cvs server"
     # were nicer about buffering, then we could just leave it open, I think.
     close ($writer) || die "cannot close: $!";
-    
+
     # Ready to get the responses from the server.
     # For example:
     #     E Annotations for foo/xx
     #     E ***************
-    #     M 1.3          (kingdon  06-Sep-97): hello 
+    #     M 1.3          (kingdon  06-Sep-97): hello
     #     ok
     my ($lineNr) = 0;
     my ($oldLrev, $oldLusr) = ("", "");
@@ -1124,6 +1182,7 @@ sub doAnnotate ($$) {
 	    }
 	    else {
 		$revprint = $lrev; $oldLusr = "";
+		$revprint =~ s`^(\S+)`<a href="${scriptwhere}${barequery}#rev$1">$1</A>`;	# `		
 	    }
 	    if ($lusr eq $oldLusr) {
 		$usrprint = "         ";
@@ -1136,7 +1195,7 @@ sub doAnnotate ($$) {
 	    # is there a less timeconsuming way to strip spaces ?
 	    ($lrev = $lrev) =~ s/\s+//g;
 	    my $isCurrentRev = ($rev eq $lrev);
-	    
+
 	    print "<b>" if ($isCurrentRev);
 	    printf ("%8s%s%8s %4d:", $revprint, ($isCurrentRev ? "|" : " "), $usrprint, $lineNr);
 	    print spacedHtmlText($line);
@@ -1163,14 +1222,18 @@ sub doAnnotate ($$) {
 ###############################
 # make Checkout
 ###############################
-sub doCheckout {
+sub doCheckout($$) {
     my ($fullname, $rev) = @_;
     my ($mimetype,$revopt);
     my $fh = do {local(*FH);};
 
+    if ($rev eq 'HEAD' || $rev eq '.') {
+	$rev = undef;
+    }
+
     # make sure the revisions a wellformed, for security
     # reasons ..
-    if (defined($rev) && !($rev =~ /^[\d\.]+$/)) {
+    if (defined($rev) && $rev =~ /[^\w.]/) {
 	&fatal("404 Not Found",
 		"Malformed query \"$ENV{QUERY_STRING}\"");
     }
@@ -1197,7 +1260,7 @@ sub doCheckout {
 	    $moddate=$date{$symrev{HEAD}};
 	}
     }
-    
+
     ### just for the record:
     ### 'cvs co' seems to have a bug regarding single checkout of
     ### directories/files having spaces in it;
@@ -1206,8 +1269,8 @@ sub doCheckout {
     # Safely for a child process to read from.
     if (! open($fh, "-|")) { # child
       open(STDERR, ">&STDOUT"); # Redirect stderr to stdout
-      exec("cvs", "-d", $cvsroot, "co", "-p", $revopt, $where);
-    } 
+      exec("cvs", "-Rld", $cvsroot, "co", "-p", $revopt, $where);
+    }
 #===================================================================
 #Checking out squid/src/ftp.c
 #RCS:  /usr/src/CVS/squid/src/ftp.c,v
@@ -1246,7 +1309,7 @@ sub doCheckout {
     close($fh);
 }
 
-sub cvswebMarkup {
+sub cvswebMarkup($$$) {
     my ($filehandle,$fullname,$revision) = @_;
     my ($pathname, $filename);
 
@@ -1256,7 +1319,7 @@ sub cvswebMarkup {
 
     http_header();
 
-    navigateHeader ($scriptwhere, $pathname, $filename, $revision, "view");
+    navigateHeader($scriptwhere, $pathname, $filename, $revision, "view");
     print "<HR noshade>";
     print "<table width=\"100%\"><tr><td bgcolor=\"$markupLogColor\">";
     print "File: ", &clickablePath($where, 1);
@@ -1264,7 +1327,7 @@ sub cvswebMarkup {
     &download_link(urlencode($fileurl), $revision, "(download)");
     if (!$defaultTextPlain) {
 	print "&nbsp;";
-	&download_link(urlencode($fileurl), $revision, "(as text)", 
+	&download_link(urlencode($fileurl), $revision, "(as text)",
 	       "text/plain");
     }
     print "<BR>\n";
@@ -1296,15 +1359,13 @@ sub cvswebMarkup {
 sub viewable($) {
     my ($mimetype) = @_;
 
-    $mimetype =~ m%^text/% ||
-    $mimetype =~ m%^image/% ||
-    0;
+    $mimetype =~ m%^(text|image)/%;
 }
 
 ###############################
 # Show Colored Diff
 ###############################
-sub doDiff {
+sub doDiff($$$$$$) {
 	my($fullname, $r1, $tr1, $r2, $tr2, $f) = @_;
         my $fh = do {local(*FH);};
 	my ($rev1, $rev2, $sym1, $sym2, @difftype, $diffname, $f1, $f2);
@@ -1325,9 +1386,10 @@ sub doDiff {
 	    $rev2 = $tr2;
 	    $sym2 = "";
 	}
+
 	# make sure the revisions a wellformed, for security
 	# reasons ..
-	if (!($rev1 =~ /^[\d\.]+$/) || !($rev2 =~ /^[\d\.]+$/)) {
+	if ($rev1 =~ /[^\w.]/ || $rev2 =~ /[^\w.]/) {
 	    &fatal("404 Not Found",
 		    "Malformed query \"$ENV{QUERY_STRING}\"");
 	}
@@ -1369,7 +1431,7 @@ sub doDiff {
 
 	# apply special options
 	if ($showfunc) {
-	    push @difftype, '-p';
+	    push @difftype, '-p' if $f =~ /^[cHhu]$/;
 
 	    my($re1, $re2);
 
@@ -1448,7 +1510,7 @@ sub doDiff {
 ###############################
 # Show Logs ..
 ###############################
-sub getDirLogs {
+sub getDirLogs($$@) {
     my ($cvsroot,$dirname,@otherFiles) = @_;
     my ($state,$otherFiles,$tag, $file, $date, $branchpoint, $branch, $log);
     my ($rev, $revision, $revwanted, $filename, $head, $author);
@@ -1466,7 +1528,7 @@ sub getDirLogs {
     }
 
     # just execute rlog if there are any files
-    if ($#files < 0) { 
+    if ($#files < 0) {
 	return;
     }
 
@@ -1511,7 +1573,7 @@ again:
 	}
 	if ($state eq "head" && /^symbolic names/) {
 	    $state = "tags";
-	    ($branch = $head) =~ s/\.\d+$// if (!defined($branch)); 
+	    ($branch = $head) =~ s/\.\d+$// if (!defined($branch));
 	    $branch =~ s/(\.?)(\d+)$/${1}0.$2/;
 	    $symrev{MAIN} = $branch;
 	    $symrev{HEAD} = $branch;
@@ -1609,13 +1671,13 @@ again:
 	}
     }
     if ($. == 0) {
-	fatal("500 Internal Error", 
+	fatal("500 Internal Error",
 	      "Failed to spawn GNU rlog on <em>'".join(", ", @files)."'</em><p>did you set the <b>\$ENV{PATH}</b> in your configuration file correctly ?");
     }
     close($fh);
 }
 
-sub readLog {
+sub readLog($;$) {
 	my($fullname,$revision) = @_;
 	my ($symnames, $head, $rev, $br, $brp, $branch, $branchrev);
 	my $fh = do {local(*FH);};
@@ -1878,7 +1940,7 @@ sub printLog($;$) {
 	    }
 	    if (not $defaultTextPlain) {
 		print " / ";
-		&download_link($fileurl, $_, "(as text)", 
+		&download_link($fileurl, $_, "(as text)",
 			   "text/plain");
 	    }
 	    if (!$defaultViewable) {
@@ -2019,10 +2081,10 @@ sub printLog($;$) {
 	print "</PRE>\n";
 }
 
-sub doLog {
+sub doLog($) {
 	my($fullname) = @_;
 	my ($diffrev, $upwhere, $filename, $backurl);
-	
+
 	readLog($fullname);
 
         html_header("CVS log for $where");
@@ -2081,9 +2143,9 @@ EOF
 	print "</SELECT>\n";
 	$diffrev = $revdisplayorder[0];
 	$diffrev = $input{"r2"} if (defined($input{"r2"}));
-	print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr2\" VALUE=\"$diffrev\" onChange='docuement.diff_select.r2.selectedIndex=0'>\n";
+	print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr2\" VALUE=\"$diffrev\" onChange='document.diff_select.r2.selectedIndex=0'>\n";
         print "<BR>Type of Diff should be a&nbsp;";
-	printDiffSelect();
+	printDiffSelect(0);
 	print "<INPUT TYPE=SUBMIT VALUE=\"  Get Diffs  \">\n";
 	print "</FORM>\n";
 	print "<HR noshade>\n";
@@ -2138,8 +2200,7 @@ EOF
 	print "</BODY></HTML>\n";
 }
 
-sub flush_diff_rows ($$$$)
-{
+sub flush_diff_rows($$$$) {
     my $j;
     my ($leftColRef,$rightColRef,$leftRow,$rightRow) = @_;
     if ($state eq "PreChangeRemove") {          # we just got remove-lines before
@@ -2184,7 +2245,7 @@ sub human_readable_diff($){
   ($pathname = $where_nd) =~ s/(Attic\/)?[^\/]*$//;
   ($scriptwhere_nd = $scriptwhere) =~ s/.diff$//;
 
-  navigateHeader ($scriptwhere_nd, $pathname, $filename, $rev, "diff");
+  navigateHeader($scriptwhere_nd, $pathname, $filename, $rev, "diff");
 
   # Read header to pick up read revision and date, if possible
   while (<$fh>) {
@@ -2200,7 +2261,7 @@ sub human_readable_diff($){
     $rev2 = $r2r;
     $date2 = $r2d;
   }
-  
+
   print "<h3 align=center>Diff for /$where_nd between version $rev1 and $rev2</h3>\n";
 
   print "<table border=0 cellspacing=0 cellpadding=0 width=\"100%\">\n";
@@ -2230,7 +2291,7 @@ sub human_readable_diff($){
   ####
   while (<$fh>) {
       $difftxt = $_;
-      
+
       if ($difftxt =~ /^@@/) {
 	  ($oldline,$newline,$funname) = $difftxt =~ /@@ \-([0-9]+).*\+([0-9]+).*@@(.*)/;
           print  "<tr bgcolor=\"$diffcolorHeading\"><td width=\"50%\">";
@@ -2250,7 +2311,7 @@ sub human_readable_diff($){
 
 	  # Add fontface, size
 	  $_ = "$fs&nbsp;$_$fe";
-	  
+
 	  #########
 	  # little state machine to parse unified-diff output (Hen, zeller@think.de)
 	  # in order to get some nice 'ediff'-mode output
@@ -2268,7 +2329,7 @@ sub human_readable_diff($){
 		  $state = "PreChange";
 		  $rightCol[$rightRow++] = $_;
 	      }
-	  } 
+	  }
 	  elsif ($diffcode eq '-') {
 	      $state = "PreChangeRemove";
 	      $leftCol[$leftRow++] = $_;
@@ -2324,13 +2385,13 @@ sub human_readable_diff($){
   print "</tr></table>";
 }
 
-sub navigateHeader ($$$$$) {
+sub navigateHeader($$$$$) {
     my ($swhere,$path,$filename,$rev,$title) = @_;
     $swhere = "" if ($swhere eq $scriptwhere);
     $swhere = urlencode($filename) if ($swhere eq "");
     print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">";
     print "<HTML>\n<HEAD>\n";
-    print '<!-- CVSweb $zRevision: 1.93 $  $Revision: 3.9 $ -->';
+    print '<!-- CVSweb $zRevision: 1.94 $  $Revision: 3.19 $ -->';
     print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n";
     print  "<BODY BGCOLOR=\"$backcolor\">\n";
     print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">";
@@ -2338,13 +2399,12 @@ sub navigateHeader ($$$$$) {
     print  "<a href=\"$swhere$query#rev$rev\">$backicon";
     print "</a> <b>Return to ", &link("$filename","$swhere$query#rev$rev")," CVS log";
     print "</b> $fileicon</td>";
-    
+
     print "<td align=right>$diricon <b>Up to ", &clickablePath($path, 1), "</b></td>";
     print "</tr></table>";
 }
 
-sub plural_write ($$)
-{
+sub plural_write($$) {
     my ($num,$text) = @_;
     if ($num != 1) {
 	$text = $text . "s";
@@ -2362,8 +2422,7 @@ sub plural_write ($$)
 # '..time ago'
 # H. Zeller <zeller@think.de>
 ##
-sub readableTime ($$)
-{
+sub readableTime($$) {
     my ($i, $break, $retval);
     my ($secs,$long) = @_;
 
@@ -2381,7 +2440,7 @@ sub readableTime ($$)
 		   31536000, 'year');
     my @breaks = sort {$a <=> $b} keys %desc;
     $i = 0;
-    while ($i <= $#breaks && $secs >= 2 * $breaks[$i]) { 
+    while ($i <= $#breaks && $secs >= 2 * $breaks[$i]) {
 	$i++;
     }
     $i--;
@@ -2392,7 +2451,7 @@ sub readableTime ($$)
 	my $rest = $secs % $break;
 	$i--;
 	$break = $breaks[$i];
-	my $resttime = plural_write(int ($rest / $break), 
+	my $resttime = plural_write(int ($rest / $break),
 				$desc{$break});
 	if ($resttime) {
 	    $retval = $retval . ", " . $resttime;
@@ -2410,9 +2469,9 @@ sub readableTime ($$)
 # basename (last directory/file) is a link as well
 ##
 sub clickablePath($$) {
-    my ($pathname,$clickLast) = @_;    
+    my ($pathname,$clickLast) = @_;
     my $retval = '';
-    
+
     if ($pathname eq '/') {
 	# this should never happen - chooseCVSRoot() is
 	# intended to do this
@@ -2454,7 +2513,7 @@ sub chooseCVSRoot() {
 	my ($k);
 	print "<form method=\"GET\" action=\"${scriptwhere}\">\n";
 	foreach $k (keys %input) {
-	    print "<input type=hidden NAME=$k VALUE=$input{$k}>\n" 
+	    print "<input type=hidden NAME=$k VALUE=$input{$k}>\n"
 		if ($input{$k}) && ($k ne "cvsroot");
 	}
 	# Form-Elements look wierd in Netscape if the background
@@ -2488,7 +2547,7 @@ sub chooseMirror() {
     # and may not be useful for your site; If you don't
     # set %MIRRORS this won't show up, anyway
     #
-    # Should perhaps exlude the current site somehow.. 
+    # Should perhaps exlude the current site somehow..
     if (keys %MIRRORS) {
 	print "\nThis cvsweb is mirrored in:\n";
 	foreach $mirror (keys %MIRRORS) {
@@ -2500,7 +2559,7 @@ sub chooseMirror() {
     }
 }
 
-sub fileSortCmp {
+sub fileSortCmp() {
     my ($comp) = 0;
     my ($c,$d,$af,$bf);
 
@@ -2531,7 +2590,7 @@ sub fileSortCmp {
 }
 
 # make A url for downloading
-sub download_url {
+sub download_url($$;$) {
     my ($url,$revision,$mimetype) = @_;
 
     $revision =~ s/\b0\.//;
@@ -2548,9 +2607,9 @@ sub download_url {
     return $url;
 }
 
-# Presents a link to download the 
+# Presents a link to download the
 # selected revision
-sub download_link {
+sub download_link($$$;$) {
     my ($url,$revision,$textlink,$mimetype) = @_;
     my ($fullurl) = download_url($url,$revision,$mimetype);
     my ($paren) = $textlink =~ /^\(/;
@@ -2622,14 +2681,14 @@ sub toggleQuery($$) {
     return "";
 }
 
-sub urlencode {
+sub urlencode($) {
     my ($in) = @_;
     my ($out);
     ($out = $in) =~ s/([\000-+{-\377])/sprintf("%%%02x", ord($1))/ge;
     return $out;
 }
 
-sub http_header {
+sub http_header(;$) {
     my $content_type = shift || "text/html";
     if (defined($moddate)) {
 	if ($is_mod_perl) {
@@ -2684,7 +2743,7 @@ sub http_header {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.93 $  $Revision: 3.9 $';
+    my $version = '$zRevision: 1.94 $  $Revision: 3.19 $'; #'
     http_header();
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"
@@ -2698,12 +2757,11 @@ $logo <h1 align="center">$title</h1>
 EOH
 }
 
-sub html_footer {
+sub html_footer() {
     return "<hr noshade><address>$address</address>\n";
 }
 
-sub link_tags
-{
+sub link_tags($) {
     my ($tags) = @_;
     my ($ret) = "";
     my ($fileurl,$filename);
@@ -2722,9 +2780,9 @@ sub link_tags
 #
 # See if a module is listed in the config file's @HideModule list.
 #
-sub forbidden_module {
+sub forbidden_module($) {
     my($module) = @_;
-    
+
     for (my $i=0; $i < @HideModules; $i++) {
 	return 1 if $module eq $HideModules[$i];
     }