===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 4.19
retrieving revision 4.22
diff -u -p -r4.19 -r4.22
--- cvsweb/cvsweb.cgi	2019/11/11 14:56:27	4.19
+++ cvsweb/cvsweb.cgi	2019/11/13 09:12:47	4.22
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: cvsweb.cgi,v 4.19 2019/11/11 14:56:27 schwarze Exp $
+# $Id: cvsweb.cgi,v 4.22 2019/11/13 09:12:47 schwarze Exp $
 # $knu: cvsweb.cgi,v 1.299 2010/11/13 16:37:18 simon
 #
 # cvsweb - a CGI interface to CVS trees.
@@ -62,8 +62,7 @@ use vars qw (
   %alltags %fileinfo %tags @branchnames %nameprinted
   %symrev %revsym @allrevisions %date %author @revdisplayorder
   @revisions %state %difflines %log %branchpoint @revorder $keywordsubstitution
-  $prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword $mancgi
-  $doCheckout $scriptname $scriptwhere
+  $mancgi $doCheckout $scriptname $scriptwhere
   $where $Browser $nofilelinks $maycompress @stickyvars
   $is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased
   %input $query $barequery $sortby $bydate $byrev $byauthor
@@ -145,7 +144,6 @@ sub spacedHtmlText($;$);
 sub link($$);
 sub revcmp($$);
 sub fatal($$@);
-sub config_error($$);
 sub redirect($;$);
 sub safeglob($);
 sub search_path($);
@@ -264,7 +262,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|/$|) {
@@ -272,6 +270,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 /)
@@ -316,14 +315,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()
@@ -603,10 +606,6 @@ if (-f $config_cvstree) {
 }
 undef $config_cvstree;
 
-$re_prcategories  = '(?:' . join ('|', @prcategories) . ')' if @prcategories;
-$re_prkeyword     = quotemeta($prkeyword) if defined($prkeyword);
-$prcgi           .= '%s' if defined($prcgi) && $prcgi !~ /%s/;
-
 $fullname         = catfile($cvsroot, $where);
 
 my $rewrite = 0;
@@ -1454,39 +1453,6 @@ sub htmlify($;$)
   }
 
   if ($extra) {
-
-    # get PR #'s as link: "PR#nnnn" "PR: nnnn, ..." "PR nnnn, ..." "bin/nnnn"
-    if (defined($prcgi) && defined($re_prkeyword)) {
-      my $prev;
-
-      do {
-        $prev = $_;
-        $_ = htmlify_sub {
-          s{
-            (\b$re_prkeyword[:\#]?\s*
-             (?:
-              \#?
-              \d+[,\s]\s*
-             )*
-             \#?)
-            (\d+)\b
-           }{
-             $1 . &link($2, sprintf($prcgi, $2))
-           }egix;
-        } $_;
-      } while ($_ ne $prev);
-
-      if (defined($re_prcategories)) {
-        $_ = htmlify_sub {
-          s{
-            (\b$re_prcategories/(\d+)\b)
-           }{
-             &link($1, sprintf($prcgi, $2))
-           }egox;
-        } $_;
-      }
-    }
-
     # get manpage specs as link: "foo.1" "foo(1)"
     if (defined($mancgi)) {
       $_ = htmlify_sub {
@@ -1579,17 +1545,6 @@ sub fatal($$@)
     sprintf($format, map(htmlquote($_), @args)), "</div>\n";
   html_footer();
   exit(1);
-}
-
-
-#
-# Signal a (fatal) configuration error.
-#
-sub config_error($$)
-{
-  fatal('500 Internal Error',
-        'Error loading configuration file "<code>%s</code>":<br /><br />' .
-        '%s<br />', @_);
 }