===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 4.20
retrieving revision 4.23
diff -u -p -r4.20 -r4.23
--- cvsweb/cvsweb.cgi	2019/11/11 15:46:39	4.20
+++ cvsweb/cvsweb.cgi	2019/11/26 11:21:27	4.23
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: cvsweb.cgi,v 4.20 2019/11/11 15:46:39 schwarze Exp $
+# $Id: cvsweb.cgi,v 4.23 2019/11/26 11:21:27 schwarze Exp $
 # $knu: cvsweb.cgi,v 1.299 2010/11/13 16:37:18 simon
 #
 # cvsweb - a CGI interface to CVS trees.
@@ -81,7 +81,7 @@ use vars qw (
   $use_moddate $gzip_open $file_list_len
   $allow_tar @tar_options @gzip_options @zip_options @cvs_options
   @annotate_options @rcsdiff_options
-  $HTML_DOCTYPE $HTML_META $cssurl $CSS $cvshistory_url
+  $HTML_DOCTYPE $HTML_META $cssurl $CSS
 );
 
 require Compress::Zlib;
@@ -144,7 +144,6 @@ sub spacedHtmlText($;$);
 sub link($$);
 sub revcmp($$);
 sub fatal($$@);
-sub config_error($$);
 sub redirect($;$);
 sub safeglob($);
 sub search_path($);
@@ -174,7 +173,6 @@ sub download_url($$;$);
 sub download_link($$$;$);
 sub display_url($$;$);
 sub display_link($$;$$);
-sub history_link($$;$);
 sub toggleQuery($;$);
 sub htmlquote($);
 sub htmlunquote($);
@@ -207,7 +205,7 @@ $cvstreedefault = $logo = $defaulttitle =
   $allow_markup = $allow_compress = $edit_option_form =
   $show_subdir_lastmod = $show_log_in_markup = $preformat_in_markup =
   $tabstop = $use_moddate = $gzip_open = $DEBUG =
-  $cvshistory_url = $allow_tar = undef;
+  $allow_tar = undef;
 
 $allow_version_select = $allow_mailtos = $allow_log_extra = 1;
 
@@ -263,7 +261,7 @@ $scriptname    = '' unless defined($scriptname);
 $where         =  $pathinfo;
 $doCheckout    =  $where =~ s|^/$CheckoutMagic/|/|o;
 $where         =~ s|^/||;
-$scriptname    =~ s|^/*|/|;
+$scriptname    =~ s|^/+||;
 
 # Let's workaround thttpd's stupidity..
 if ($scriptname =~ m|/$|) {
@@ -271,6 +269,7 @@ if ($scriptname =~ m|/$|) {
   my $re = quotemeta $pathinfo;
   $scriptname =~ s/$re$//;
 }
+$scriptname = "/$scriptname" if $scriptname;
 
 # $scriptname : the URI escaped path to this script
 # $where      : the path in the CVS repository (without leading /, or only /)
@@ -315,14 +314,18 @@ $maycompress = (
   qw(cvsroot hideattic ignorecase sortby logsort f only_with_tag ln
      hidecvsroot hidenonreadable);
 
-#
 # Load configuration.
-#
-if (-f $config) {
-  do "$config" or config_error($config, $@);
-} else {
-  fatal("500 Internal Error",
-        'Configuration not found.  Set the parameter <code>$config</code> in cvsweb.cgi to your <b>cvsweb.conf</b> configuration file first.');
+{
+  $config =~ m|^/| or fatal '500 Internal Error',
+    'Configuration file name "<code>%s</code>" is not an absolute path.',
+    $config;
+  defined do $config and last;
+  $@ and fatal '500 Internal Error',
+    'Error loading configuration file "<code>%s</code>": <pre>%s</pre>',
+    $config, $@;
+  fatal '500 Internal Error',
+    'Cannot read configuration file "<code>%s</code>": %s',
+    $config, $! || 'unknown error';
 }
 
 # Try to find a readable dir where we can cd into.  Some abs_path()
@@ -812,10 +815,6 @@ if (-d $fullname) {
 
   } else {
     print '<p>Current directory: <b>', clickablePath($where, 0), '</b>';
-    if ($cvshistory_url) {
-      (my $d = $where) =~ s|^/*(.*?)/*$|$1|;
-      print ' - ', history_link($d, '');
-    }
     print "</p>\n";
     print "<p>Current tag: <b>", htmlquote($input{only_with_tag}), "</b></p>\n"
       if $input{only_with_tag};
@@ -1545,17 +1544,6 @@ sub fatal($$@)
 
 
 #
-# Signal a (fatal) configuration error.
-#
-sub config_error($$)
-{
-  fatal('500 Internal Error',
-        'Error loading configuration file "<code>%s</code>":<br /><br />' .
-        '%s<br />', @_);
-}
-
-
-#
 # Sends a redirect to the given URL.
 #
 sub redirect($;$)
@@ -2939,10 +2927,6 @@ sub doLog($)
     &clickablePath($upwhere, 1), "</b>\n</p>\n";
   print "<p>\n ";
   print &link('Request diff between arbitrary revisions', '#diff');
-  if ($cvshistory_url) {
-    (my $d = $upwhere) =~ s|/+$||;
-    print ' - ', history_link($d, $filename);
-  }
   print "\n</p>\n<hr />\n";
 
   print "<p>\n";
@@ -3673,21 +3657,6 @@ sub display_link($$;$$)
   return sprintf('<a href="%s" class="display-link">%s</a>',
                  display_url($url, $revision, $mtype) . $barequery,
                  htmlquote($textlink));
-}
-
-#
-# Returns a link to CVSHistory for the given directory and filename.
-#
-sub history_link($$;$)
-{
-  my ($dir, $file, $text) = @_;
-  $dir  ||= '';
-  $file ||= '';
-  $text ||= 'History';
-  return &link($text,
-               sprintf('%s?cvsroot=%s;dsearch=%s;fsearch=%s;limit=1',
-                       $cvshistory_url, uri_escape($input{cvsroot} || ''),
-                       uri_escape($dir), uri_escape($file)));
 }
 
 # Returns a Query string with the