===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.1.1.8
retrieving revision 3.27
diff -u -p -r1.1.1.8 -r3.27
--- cvsweb/cvsweb.cgi 2000/09/30 18:55:43 1.1.1.8
+++ cvsweb/cvsweb.cgi 2000/09/28 18:06:58 3.27
@@ -43,7 +43,7 @@
# SUCH DAMAGE.
#
# $zId: cvsweb.cgi,v 1.103 2000/09/20 17:02:29 jumager Exp $
-# $kId: cvsweb.cgi,v 1.29 2000/09/30 18:48:16 knu Exp $
+# $Id: cvsweb.cgi,v 3.27 2000/09/28 18:06:58 knu Exp $
#
###
@@ -125,13 +125,14 @@ sub forbidden_module($);
use Cwd;
# == EDIT this ==
-# Locations to search for user configuration, in order:
-for (
- $ENV{CVSWEB_CONFIG},
+# User configuration is stored in
+$config = undef;
+
+for ($ENV{CVSWEB_CONFIG},
+# '/home/knu/etc/cvsweb.conf',
'/usr/local/etc/cvsweb.conf',
- getcwd() . '/cvsweb.conf'
- ) {
- $config = $_ if defined($_) && -r $_;
+ getcwd . '/cvsweb.conf') {
+ $config = $_ if defined($_) && -r $_;
}
# == Configuration defaults ==
@@ -145,7 +146,7 @@ $allow_version_select = 1;
# These are defined to allow checking with perl -cw
%CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES =
%tags = %alltags = @tabcolors = ();
-$cvstreedefault = $body_tag = $body_tag_for_src =
+$cvstreedefault = $body_tag = $body_tag_for_src =
$logo = $defaulttitle = $address =
$long_intro = $short_instruction = $shortLogLen =
$show_author = $dirtable = $tablepadding = $columnHeaderColorDefault =
@@ -1155,7 +1156,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 -Rl server") || fatal ("500 Internal Error",
+ $pid = open2($reader, $writer, "cvs 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:
@@ -2478,7 +2479,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 "$body_tag_for_src\n";
print "";
@@ -2833,7 +2834,7 @@ sub http_header(;$) {
sub html_header($) {
my ($title) = @_;
- my $version = '$zRevision: 1.103 $ $kRevision: 1.29 $'; #'
+ my $version = '$zRevision: 1.103 $ $Revision: 3.27 $'; #'
http_header();
print <