===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -p -r3.10 -r3.11
--- cvsweb/cvsweb.cgi 2000/08/01 12:42:07 3.10
+++ cvsweb/cvsweb.cgi 2000/08/13 18:58:24 3.11
@@ -42,7 +42,7 @@
# SUCH DAMAGE.
#
# $zId: cvsweb.cgi,v 1.93 2000/07/27 17:42:28 hzeller Exp $
-# $Id: cvsweb.cgi,v 3.10 2000/08/01 12:42:07 knu Exp $
+# $Id: cvsweb.cgi,v 3.11 2000/08/13 18:58:24 knu Exp $
#
###
@@ -80,10 +80,16 @@ use vars qw (
);
##### Start of Configuration Area ########
+use Cwd;
+
# == EDIT this ==
# User configuration is stored in
-$config = defined($ENV{CVSWEB_CONFIG}) ? $ENV{CVSWEB_CONFIG} : '/usr/local/etc/cvsweb.conf';
+$config = undef;
+for ($ENV{CVSWEB_CONFIG}, '/usr/local/etc/cvsweb.conf', getcwd . '/cvsweb.conf') {
+ $config = $_ if -r $_;
+}
+
# == Configuration defaults ==
# Defaults for configuration variables that shouldn't need
# to be configured..
@@ -2330,7 +2336,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 "";
@@ -2684,7 +2690,7 @@ sub http_header {
sub html_header($) {
my ($title) = @_;
- my $version = '$zRevision: 1.93 $ $Revision: 3.10 $';
+ my $version = '$zRevision: 1.93 $ $Revision: 3.11 $';
http_header();
print <