=================================================================== RCS file: /cvs/cvsweb/cvsweb.cgi,v retrieving revision 1.1.1.2 retrieving revision 3.12 diff -u -p -r1.1.1.2 -r3.12 --- cvsweb/cvsweb.cgi 2000/08/15 08:40:58 1.1.1.2 +++ cvsweb/cvsweb.cgi 2000/08/15 06:54:01 3.12 @@ -42,7 +42,7 @@ # SUCH DAMAGE. # # $zId: cvsweb.cgi,v 1.93 2000/07/27 17:42:28 hzeller Exp $ -# $kId: cvsweb.cgi,v 1.13 2000/08/15 08:35:51 knu 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 "All tags / default branch\n"; foreach my $tag (reverse sort { lc $a cmp lc $b } keys %tags) { print "$tag\n"; } print "\n"; @@ -756,7 +753,7 @@ elsif (-d $fullname) { printDiffSelect(0); print ""; print "Show Attic files: "; - print "\n"; print ""; print "\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 @@ -2373,7 +2370,7 @@ sub navigateHeader($$$$$) { $swhere = urlencode($filename) if ($swhere eq ""); print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">"; print "\n\n"; - print ''; + print ''; print "\n$path$filename - $title - $rev\n"; print "\n"; print ""; @@ -2725,7 +2722,7 @@ sub http_header(;$) { sub html_header($) { my ($title) = @_; - my $version = '$zRevision: 1.93 $ $kRevision: 1.13 $'; #' + my $version = '$zRevision: 1.93 $ $Revision: 3.12 $'; #' http_header(); print <