===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.1.1.3
retrieving revision 3.12
diff -u -p -r1.1.1.3 -r3.12
--- cvsweb/cvsweb.cgi	2000/08/25 09:13:40	1.1.1.3
+++ cvsweb/cvsweb.cgi	2000/08/15 06:54:01	3.12
@@ -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.94 2000/08/24 06:41:22 hnordstrom Exp $
-# $kId: cvsweb.cgi,v 1.15 2000/08/25 09:01:58 knu Exp $
+# $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 $
 #
 ###
 
@@ -124,10 +124,7 @@ use Cwd;
 # User configuration is stored in
 $config = undef;
 
-for ($ENV{CVSWEB_CONFIG},
-#     '/home/knu/etc/cvsweb.conf',
-     '/usr/local/etc/cvsweb.conf',
-     getcwd . '/cvsweb.conf') {
+for ($ENV{CVSWEB_CONFIG}, '/usr/local/etc/cvsweb.conf', getcwd . '/cvsweb.conf') {
   $config = $_ if defined($_) && -r $_;
 }
 
@@ -720,7 +717,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";
@@ -756,7 +753,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";
@@ -912,7 +909,7 @@ sub spacedHtmlText($) {
 	local $_ = $_[0];
 
 	# Cut trailing spaces
-	s/\s+\n$//;
+	s/\s+$//;
 
 	# Expand tabs
 	s/\t+/' ' x (length($&) * $tabstop - length($`) % $tabstop)/e
@@ -949,10 +946,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);
@@ -1067,7 +1060,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}\"");
     }
@@ -1218,13 +1211,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}\"");
     }
@@ -1260,7 +1249,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
@@ -1377,10 +1366,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}\"");
 	}
@@ -1422,7 +1410,7 @@ sub doDiff($$$$$$) {
 
 	# apply special options
 	if ($showfunc) {
-	    push @difftype, '-p' if $f =~ /^[cHhu]$/;
+	    push @difftype, '-p';
 
 	    my($re1, $re2);
 
@@ -2134,7 +2122,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='document.diff_select.r2.selectedIndex=0'>\n";
+	print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr2\" VALUE=\"$diffrev\" onChange='docuement.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";
@@ -2382,7 +2370,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.15 $ -->';
+    print '<!-- CVSweb $zRevision: 1.93 $  $Revision: 3.12 $ -->';
     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\">";
@@ -2734,7 +2722,7 @@ sub http_header(;$) {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.94 $  $kRevision: 1.15 $'; #'
+    my $version = '$zRevision: 1.93 $  $Revision: 3.12 $'; #'
     http_header();
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"