===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 4.1
retrieving revision 4.7
diff -u -p -r4.1 -r4.7
--- cvsweb/cvsweb.cgi	2019/11/08 21:08:26	4.1
+++ cvsweb/cvsweb.cgi	2019/11/09 09:32:22	4.7
@@ -1,5 +1,5 @@
-#!/usr/bin/perl -T
-# $Id: cvsweb.cgi,v 4.1 2019/11/08 21:08:26 schwarze Exp $
+#!/usr/bin/perl
+# $Id: cvsweb.cgi,v 4.7 2019/11/09 09:32:22 schwarze Exp $
 # $knu: cvsweb.cgi,v 1.299 2010/11/13 16:37:18 simon
 #
 # cvsweb - a CGI interface to CVS trees.
@@ -50,7 +50,6 @@
 require 5.006;
 
 use strict;
-
 use warnings;
 use filetest qw(access);
 
@@ -65,7 +64,7 @@ use vars qw (
   @revisions %state %difflines %log %branchpoint @revorder $keywordsubstitution
   $prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword $mancgi
   $doCheckout $scriptname $scriptwhere
-  $where $Browser $nofilelinks $maycompress @stickyvars %funcline_regexp
+  $where $Browser $nofilelinks $maycompress @stickyvars
   $is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased
   %input $query $barequery $sortby $bydate $byrev $byauthor
   $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot
@@ -88,7 +87,6 @@ use vars qw (
 );
 
 use Cwd                   qw(abs_path);
-use File::Basename        qw(dirname);
 use File::Path            qw(rmtree);
 use File::Spec::Functions qw(canonpath catdir catfile curdir devnull rootdir
                              tmpdir updir);
@@ -204,23 +202,9 @@ sub checkout_to_temp($$$);
 # (think mod_perl)...
 delete(@ENV{qw(PATH IFS CDPATH ENV BASH_ENV)});
 
-my ($mydir) = (dirname($0) =~ /(.*)/);    # untaint
+# Location of the configuration file inside the web server chroot:
+$config = '/conf/cvsweb/cvsweb.conf';
 
-##### Start of Configuration Area ########
-
-# == EDIT this ==
-# Locations to search for user configuration, in order:
-for (catfile($mydir, 'cvsweb.conf'), '/usr/local/etc/cvsweb/cvsweb.conf') {
-  if (-r $_) {
-    $config = $_;
-    last;
-  }
-}
-
-##### End of Configuration Area   ########
-
-undef $mydir;
-
 ######## Configuration parameters #########
 
 @CVSrepositories = @CVSROOT = %CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS =
@@ -237,7 +221,7 @@ $cvstreedefault = $logo = $defaulttitle =
 
 $allow_version_select = $allow_mailtos = $allow_log_extra = 1;
 
-@DIFFTYPES = qw(h H u c s);
+@DIFFTYPES = qw(h H u c);
 @DIFFTYPES{@DIFFTYPES} = (
   {
     'descr'   => 'colored',
@@ -259,12 +243,6 @@ $allow_version_select = $allow_mailtos = $allow_log_ex
     'opts'    => ['-c'],
     'colored' => 0,
   },
-  {
-    'descr'   => 'side by side',
-    # width=168 should be enough to support 80 character line lengths
-    'opts'    => ['--side-by-side', '--width=168'],
-    'colored' => 0,
-  },
 );
 
 @LOGSORTKEYS = qw(cvs date rev);
@@ -555,8 +533,8 @@ foreach (@stickyvars) {
 }
 
 if ($allow_enscript) {
-  push(@DIFFTYPES, qw(uc cc sc));
-  @DIFFTYPES{qw(uc cc sc)} = (
+  push(@DIFFTYPES, qw(uc cc));
+  @DIFFTYPES{qw(uc cc)} = (
     {
      'descr'   => 'unified, colored',
      'opts'    => ['-u'],
@@ -567,12 +545,6 @@ if ($allow_enscript) {
      'opts'    => ['-c'],
      'colored' => 0,
     },
-    {
-     'descr'   => 'side by side, colored',
-     # width=168 should be enough to support 80 character line lengths
-     'opts'    => ['--side-by-side', '--width=168'],
-     'colored' => 0,
-    },
   );
 } else {
   # No Enscript -> respect difftype, but don't offer colorization.
@@ -1568,7 +1540,7 @@ sub htmlify($;$)
          }{
             my($text, $name, $section) = ($1, $2, defined($3) ? $3 : $4);
             ($name =~ /[A-Za-z]/ && $name !~ /\.(:|$)/)
-             ? &link($text, sprintf($mancgi, $section, uri_escape($name)))
+             ? &link($text, sprintf($mancgi, uri_escape($name), $section))
               : $text;
          }egx;
       } $_;
@@ -2319,18 +2291,8 @@ sub doDiff($$$$$$)
   my @difftype       = @{$difftype->{opts}};
   my $human_readable = $difftype->{colored};
 
-  # Apply special diff options.  -p and -F are not available with side by side
-  # diffs and may cause problems with older (< 2.8) versions of diffutils if
-  # used with --side-by-side.
-  if ($showfunc && $f !~ /^s/) {
-    push(@difftype, '-p');
-    while (my ($re1, $re2) = each %funcline_regexp) {
-      if ($fullname =~ $re1) {
-        push(@difftype, '-F', $re2);
-        last;
-      }
-    }
-  }
+  # Apply special diff options.
+  push @difftype, '-p' if $showfunc;
 
   if ($human_readable) {
     push(@difftype, '-w')  if $hr_ignwhite;
@@ -2956,7 +2918,7 @@ sub printLog($$$;$$)
   print "<br />\n";
 
   print '<i>';
-  if (defined @mytz) {
+  if (@mytz) {
     my ($est) = $mytz[(localtime($date{$_}))[8]];
     print scalar localtime($date{$_}), " $est</i> (";
   } else {
@@ -4232,6 +4194,7 @@ sub htmlquote($)
   # Special Characters; RFC 1866
   s/&/&amp;/g;
   s/\"/&quot;/g;
+  s/%22/&quot;/g;
   s/</&lt;/g;
   s/>/&gt;/g;
   return $_;