===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.1.1.4
retrieving revision 3.14
diff -u -p -r1.1.1.4 -r3.14
--- cvsweb/cvsweb.cgi	2000/09/03 18:41:30	1.1.1.4
+++ cvsweb/cvsweb.cgi	2000/08/24 15:53:11	3.14
@@ -42,7 +42,7 @@
 # SUCH DAMAGE.
 #
 # $zId: cvsweb.cgi,v 1.94 2000/08/24 06:41:22 hnordstrom Exp $
-# $kId: cvsweb.cgi,v 1.17 2000/09/03 18:25:47 knu Exp $
+# $Id: cvsweb.cgi,v 3.14 2000/08/24 15:53:11 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 $mancgi
+    @revisions %state %difflines %log %branchpoint @revorder $prcgi
+    @prcategories $prcategories
     $checkoutMagic $doCheckout $scriptname $scriptwhere
     $where $pathinfo $Browser $nofilelinks $maycompress @stickyvars
     %funcline_regexp $is_mod_perl
@@ -347,7 +347,6 @@ 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);
@@ -887,7 +886,7 @@ sub findLastModifiedSubdirs(@) {
 }
 
 sub htmlify($;$) {
-	my($string, $extra) = @_;
+	my($string, $pr) = @_;
 
 	# Special Characters; RFC 1866
 	$string =~ s/&/&/g;
@@ -896,21 +895,14 @@ sub htmlify($;$) {
 	$string =~ s/>/>/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>`g;
+	$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>`;
 	# 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>`g;
+	$string =~ s`([-a-zA-Z0-9_.]+@([-a-zA-Z0-9]+\.)+[A-Za-z]{2,4})`<A HREF="mailto:$1">$1</A>`;
 
-	if ($extra) {
-	    # get PR #'s as link ..
-	    if (defined($prcgi)) {
-		1 while $string =~ s`\b(pr[:#]?\s*(?:#?\d+[,\s]\s*)*#?)(\d+)\b`sprintf('%s<A HREF="%s">%s</A>', $1, sprintf($prcgi, $2), $2)`ie;
-		$string =~ s`\b${prcategories}/(\d+)\b`sprintf('<A HREF="%s">%s</A>', sprintf($prcgi, $1), $&)`igeo;
-	    }
-
-	    # get manpage specs as link ..
-	    if (defined($mancgi)) {
-		$string =~ s`\b([a-zA-Z]\w+)\(([0-9n])\)\B`sprintf('<A HREF="%s">%s</A>', sprintf($mancgi, $2, $1), $&)`ge;
-	    }
+	# 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;
 	}
 
 	return $string;
@@ -957,10 +949,6 @@ sub link($$) {
 
 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);
@@ -1075,7 +1063,7 @@ sub doAnnotate($$) {
 
     # make sure the revisions a wellformed, for security
     # reasons ..
-    if ($rev =~ /[^\w.]/) {
+    if (!($rev =~ /^[\d\.]+$/)) {
 	&fatal("404 Not Found",
 		"Malformed query \"$ENV{QUERY_STRING}\"");
     }
@@ -1226,13 +1214,9 @@ sub doCheckout($$) {
     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 =~ /[^\w.]/) {
+    if (defined($rev) && !($rev =~ /^[\d\.]+$/)) {
 	&fatal("404 Not Found",
 		"Malformed query \"$ENV{QUERY_STRING}\"");
     }
@@ -1268,7 +1252,7 @@ sub doCheckout($$) {
     # Safely for a child process to read from.
     if (! open($fh, "-|")) { # child
       open(STDERR, ">&STDOUT"); # Redirect stderr to stdout
-      exec("cvs", "-Rld", $cvsroot, "co", "-p", $revopt, $where);
+      exec("cvs", "-d", $cvsroot, "co", "-p", $revopt, $where);
     }
 #===================================================================
 #Checking out squid/src/ftp.c
@@ -1385,10 +1369,9 @@ sub doDiff($$$$$$) {
 	    $rev2 = $tr2;
 	    $sym2 = "";
 	}
-
 	# make sure the revisions a wellformed, for security
 	# reasons ..
-	if ($rev1 =~ /[^\w.]/ || $rev2 =~ /[^\w.]/) {
+	if (!($rev1 =~ /^[\d\.]+$/) || !($rev2 =~ /^[\d\.]+$/)) {
 	    &fatal("404 Not Found",
 		    "Malformed query \"$ENV{QUERY_STRING}\"");
 	}
@@ -1430,7 +1413,7 @@ sub doDiff($$$$$$) {
 
 	# apply special options
 	if ($showfunc) {
-	    push @difftype, '-p' if $f =~ /^[cHhu]$/;
+	    push @difftype, '-p';
 
 	    my($re1, $re2);
 
@@ -2390,7 +2373,7 @@ sub navigateHeader($$$$$) {
     $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.94 $  $kRevision: 1.17 $ -->';
+    print '<!-- CVSweb $zRevision: 1.94 $  $Revision: 3.14 $ -->';
     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\">";
@@ -2742,7 +2725,7 @@ sub http_header(;$) {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.94 $  $kRevision: 1.17 $'; #'
+    my $version = '$zRevision: 1.94 $  $Revision: 3.14 $'; #'
     http_header();
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"