===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 3.12
retrieving revision 3.19
diff -u -p -r3.12 -r3.19
--- cvsweb/cvsweb.cgi	2000/08/15 06:54:01	3.12
+++ cvsweb/cvsweb.cgi	2000/09/04 15:53:41	3.19
@@ -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.12 2000/08/15 06:54:01 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
@@ -124,7 +124,10 @@ use Cwd;
 # User configuration is stored in
 $config = undef;
 
-for ($ENV{CVSWEB_CONFIG}, '/usr/local/etc/cvsweb.conf', getcwd . '/cvsweb.conf') {
+for ($ENV{CVSWEB_CONFIG},
+#     '/home/knu/etc/cvsweb.conf',
+     '/usr/local/etc/cvsweb.conf',
+     getcwd . '/cvsweb.conf') {
   $config = $_ if defined($_) && -r $_;
 }
 
@@ -344,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);
@@ -717,7 +721,7 @@ elsif (-d $fullname) {
 	    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":"",
+		       $input{only_with_tag} eq $tag ? " SELECTED" : "",
 		       ">$tag\n";
 	    }
 	    print "</SELECT>\n";
@@ -753,7 +757,7 @@ elsif (-d $fullname) {
 	    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";
@@ -883,7 +887,7 @@ sub findLastModifiedSubdirs(@) {
 }
 
 sub htmlify($;$) {
-	my($string, $pr) = @_;
+	my($string, $extra) = @_;
 
 	# Special Characters; RFC 1866
 	$string =~ s/&/&amp;/g;
@@ -892,14 +896,21 @@ sub htmlify($;$) {
 	$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;
@@ -909,7 +920,7 @@ sub spacedHtmlText($) {
 	local $_ = $_[0];
 
 	# Cut trailing spaces
-	s/\s+$//;
+	s/\s+$/\n/;
 
 	# Expand tabs
 	s/\t+/' ' x (length($&) * $tabstop - length($`) % $tabstop)/e
@@ -946,6 +957,10 @@ 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);
@@ -1060,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}\"");
     }
@@ -1167,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 = "         ";
@@ -1211,9 +1227,13 @@ 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 =~ /^[\d\.]+$/)) {
+    if (defined($rev) && $rev =~ /[^\w.]/) {
 	&fatal("404 Not Found",
 		"Malformed query \"$ENV{QUERY_STRING}\"");
     }
@@ -1249,7 +1269,7 @@ 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
@@ -1366,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}\"");
 	}
@@ -1410,7 +1431,7 @@ sub doDiff($$$$$$) {
 
 	# apply special options
 	if ($showfunc) {
-	    push @difftype, '-p';
+	    push @difftype, '-p' if $f =~ /^[cHhu]$/;
 
 	    my($re1, $re2);
 
@@ -2122,7 +2143,7 @@ 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(0);
 	print "<INPUT TYPE=SUBMIT VALUE=\"  Get Diffs  \">\n";
@@ -2370,7 +2391,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.93 $  $Revision: 3.12 $ -->';
+    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\">";
@@ -2722,7 +2743,7 @@ sub http_header(;$) {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.93 $  $Revision: 3.12 $'; #'
+    my $version = '$zRevision: 1.94 $  $Revision: 3.19 $'; #'
     http_header();
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"