===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.1.1.8
retrieving revision 3.25
diff -u -p -r1.1.1.8 -r3.25
--- cvsweb/cvsweb.cgi	2000/09/30 18:55:43	1.1.1.8
+++ cvsweb/cvsweb.cgi	2000/09/21 15:30:04	3.25
@@ -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.25 2000/09/21 15:30:04 knu Exp $
 #
 ###
 
@@ -64,9 +64,8 @@ use vars qw (
     $bylog $byfile $hr_default $logsort $cvstree $cvsroot
     $mimetype $defaultTextPlain $defaultViewable $allow_compress
     $GZIPBIN $backicon $diricon $fileicon $fullname $newname
-    $cvstreedefault $body_tag $body_tag_for_src
-    $logo $defaulttitle $address
-    $long_intro $short_instruction $shortLogLen
+    $cvstreedefault $body_tag $logo $defaulttitle $address
+    $backcolor $long_intro $short_instruction $shortLogLen
     $show_author $dirtable $tablepadding $columnHeaderColorDefault
     $columnHeaderColorSorted $hr_breakable $showfunc $hr_ignwhite
     $hr_ignkeysubst $diffcolorHeading $diffcolorEmpty $diffcolorRemove
@@ -125,13 +124,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,9 +145,8 @@ $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 =
-$logo = $defaulttitle = $address =
-$long_intro = $short_instruction = $shortLogLen =
+$cvstreedefault = $body_tag = $logo = $defaulttitle = $address =
+$backcolor = $long_intro = $short_instruction = $shortLogLen =
 $show_author = $dirtable = $tablepadding = $columnHeaderColorDefault =
 $columnHeaderColorSorted = $hr_breakable = $showfunc = $hr_ignwhite =
 $hr_ignkeysubst = $diffcolorHeading = $diffcolorEmpty = $diffcolorRemove =
@@ -223,11 +222,9 @@ $maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING})
 @stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag);
 
 if (-f $config) {
-   do $config
-     || &fatal("500 Internal Error",
-	       sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>',
-		       $config, &htmlify($@)));
-} else {
+    do $config;
+}
+else {
    &fatal("500 Internal Error",
 	  'Configuration not found.  Set the variable <code>$config</code> '
           . 'in cvsweb.cgi, or the environment variable '
@@ -356,15 +353,8 @@ foreach my $k (keys %ICONS) {
     }
 }
 
-my $config_cvstree = "$config-$cvstree";
-
 # Do some special configuration for cvstrees
-if (-f $config_cvstree) {
-   do $config_cvstree
-     || &fatal("500 Internal Error",
-	       sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>',
-		       $config_cvstree, &htmlify($@)));
-}
+do "$config-$cvstree" if (-f "$config-$cvstree");
 
 $prcategories = '(?:' . join('|', @prcategories) . ')';
 $prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/;
@@ -1155,7 +1145,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,9 +2468,9 @@ 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.103 $  $kRevision: 1.29 $ -->';
+    print '<!-- CVSweb $zRevision: 1.103 $  $Revision: 3.25 $ -->';
     print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n";
-    print  "$body_tag_for_src\n";
+    print  "<BODY BGCOLOR=\"$backcolor\">\n";
     print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">";
     print "<tr valign=bottom><td>";
     print  "<a href=\"$swhere$query#rev$rev\">$backicon";
@@ -2833,7 +2823,7 @@ sub http_header(;$) {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.103 $  $kRevision: 1.29 $'; #'
+    my $version = '$zRevision: 1.103 $  $Revision: 3.25 $'; #'
     http_header();
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"