===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.1.1.21
retrieving revision 1.1.1.23
diff -u -p -r1.1.1.21 -r1.1.1.23
--- cvsweb/cvsweb.cgi	2001/01/12 04:17:16	1.1.1.21
+++ cvsweb/cvsweb.cgi	2001/03/22 19:52:43	1.1.1.23
@@ -18,7 +18,7 @@
 # Copyright (c) 1996-1998 Bill Fenner
 #           (c) 1998-1999 Henner Zeller
 #	    (c) 1999      Henrik Nordstrom
-#	    (c) 2000      Akinori MUSHA
+#	    (c) 2000-2001 Akinori MUSHA
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -42,8 +42,8 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $
-# $kId: cvsweb.cgi,v 1.63 2001/01/11 23:42:01 knu Exp $
+# $zId: cvsweb.cgi,v 1.106 2001/03/10 01:16:27 hnordstrom Exp $
+# $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.68 2001/03/22 19:46:59 knu Exp $
 #
 ###
 
@@ -52,6 +52,7 @@ require 5.000;
 use strict;
 
 use vars qw (
+    $cvsweb_revision
     $mydir $uname $config $allow_version_select $verbose
     @CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr
     %MIRRORS %DEFAULTVALUE %ICONS %MTYPES
@@ -138,6 +139,10 @@ sub forbidden_module($);
 ##### Start of Configuration Area ########
 delete $ENV{PATH};
 
+$cvsweb_revision = '1.106' . '.' . (split(/ /,
+ q$Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.68 2001/03/22 19:46:59 knu Exp $
+))[2];
+
 use File::Basename;
 
 ($mydir) = (dirname($0) =~ /(.*)/); # untaint
@@ -248,7 +253,7 @@ $where =~ s|^/||;
 $scriptname = defined($ENV{SCRIPT_NAME}) ? $ENV{SCRIPT_NAME} : '';
 $scriptname =~ s|^/*|/|;
 
-# Let's workaround thttpd's stupidness..
+# Let's workaround thttpd's stupidity..
 if ($scriptname =~ m|/$|) {
     $pathinfo .= '/';
     my $re = quotemeta $pathinfo;
@@ -304,9 +309,7 @@ if (-f $config) {
 } else {
    &fatal("500 Internal Error",
 	  'Configuration not found.  Set the variable <code>$config</code> '
-          . 'in cvsweb.cgi, or the environment variable '
-          . '<code>CVSWEB_CONFIG</code>, to your <b>cvsweb.conf</b> '
-          . 'configuration file first.');
+          . 'in cvsweb.cgi to your <b>cvsweb.conf</b> configuration file first.');
 }
 
 undef %input;
@@ -733,7 +736,8 @@ if (-d $fullname) {
 
 	    if ($_ eq '..' || -d "$fullname/$_") {
 		next if ($_ eq '..' && $where eq '/');
-		my ($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}}
+		my ($rev,$date,$log,$author,$filename);
+		($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}}
 		    if (defined($fileinfo{$_}));
 		printf '<tr bgcolor="%s"><td>', $tabcolors[$dirrow % 2] if $dirtable;
 		if ($_ eq '..') {
@@ -1222,6 +1226,8 @@ sub spacedHtmlText($;$) {
 sub link($$) {
 	my($name, $url) = @_;
 
+	$url =~ s/:/sprintf("%%%02x", ord($&))/eg;
+
 	sprintf '<A HREF="%s">%s</A>', hrefquote($url), $name;
 }
 
@@ -1299,6 +1305,7 @@ sub safeglob($) {
 				push(@results, "$dirname/" .$_);
 			}
 		}
+ 		closedir($dh);
 	}
 
 	@results;
@@ -1407,7 +1414,7 @@ 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", @cvs_options, "server")
+    $pid = open2($reader, $writer, $CMD{cvs}, @cvs_options, "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:
@@ -2634,8 +2641,8 @@ sub human_readable_diff($){
   print "<br>Tag: $sym2\n" if ($sym1);
   print "</th>\n";
 
-  my $fs = "<font face=\"$difffontface\" size=\"$difffontsize\">";
-  my $fe = "</font>";
+  my $fs = "<font face=\"$difffontface\" size=\"$difffontsize\"><tt>";
+  my $fe = "</tt></font>";
 
   my $leftRow = 0;
   my $rightRow = 0;
@@ -2752,14 +2759,19 @@ sub navigateHeader($$$$$) {
     my ($swhere,$path,$filename,$rev,$title) = @_;
     $swhere = "" if ($swhere eq $scriptwhere);
     $swhere = urlencode($filename) if ($swhere eq "");
-    print qq`<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">`;
-    print "<HTML>\n<HEAD>\n";
-    print qq`<META name="robots" content="nofollow">\n`;
-    print '<!-- CVSweb $zRevision: 1.104 $  $kRevision: 1.63 $ -->';
-    print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n";
-    print  "$body_tag_for_src\n";
-    print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">";
-    print "<tr valign=bottom><td>";
+
+    print <<EOF;
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<META name="robots" content="nofollow">
+<!-- knu-cvsweb $cvsweb_revision -->
+<TITLE>$path$filename - $title - $rev</TITLE></HEAD>
+$body_tag_for_src
+<table width="100%" border=0 cellspacing=0 cellpadding=1 bgcolor="$navigationHeaderColor">
+<tr valign=bottom><td>
+EOF
+
     print &link($backicon, "$swhere$query#rev$rev");
     print "</a> <b>Return to ", &link("$filename","$swhere$query#rev$rev")," CVS log";
     print "</b> $fileicon</td>";
@@ -2970,6 +2982,8 @@ sub download_url($$;$) {
     $url .= "?rev=$revision";
     $url .= '&content-type=' . urlencode($mimetype) if (defined($mimetype));
 
+    $url =~ s/:/sprintf("%%%02x", ord($&))/eg;
+
     $url;
 }
 
@@ -3150,7 +3164,6 @@ sub http_header(;$) {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.104 $  $kRevision: 1.63 $'; #'
     http_header("text/html");
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"
@@ -3159,7 +3172,7 @@ sub html_header($) {
 <head>
 <meta name="robots" content="nofollow">
 <title>$title</title>
-<!-- CVSweb $version -->
+<!-- knu-cvsweb $cvsweb_revision -->
 </head>
 $body_tag
 $logo <h1 align="center">$title</h1>