===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 4.18
retrieving revision 4.19
diff -u -p -r4.18 -r4.19
--- cvsweb/cvsweb.cgi 2019/11/11 14:37:54 4.18
+++ cvsweb/cvsweb.cgi 2019/11/11 14:56:27 4.19
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $Id: cvsweb.cgi,v 4.18 2019/11/11 14:37:54 schwarze Exp $
+# $Id: cvsweb.cgi,v 4.19 2019/11/11 14:56:27 schwarze Exp $
# $knu: cvsweb.cgi,v 1.299 2010/11/13 16:37:18 simon
#
# cvsweb - a CGI interface to CVS trees.
@@ -83,7 +83,6 @@ use vars qw (
$allow_tar @tar_options @gzip_options @zip_options @cvs_options
@annotate_options @rcsdiff_options
$HTML_DOCTYPE $HTML_META $cssurl $CSS $cvshistory_url
- $allow_enscript @enscript_options %enscript_types
);
require Compress::Zlib;
@@ -150,14 +149,12 @@ sub config_error($$);
sub redirect($;$);
sub safeglob($);
sub search_path($);
-sub getEnscriptHL($);
sub getMimeType($;$);
sub head($;$);
sub scan_directives(@);
sub openOutputFilter();
sub doAnnotate($$);
sub doCheckout($$$);
-sub doEnscript($$$;$);
sub cvswebMarkup($$$$$$;$);
sub viewable($);
sub doDiff($$$$$$);
@@ -534,27 +531,6 @@ foreach (@stickyvars) {
}
}
-if ($allow_enscript) {
- push(@DIFFTYPES, qw(uc cc));
- @DIFFTYPES{qw(uc cc)} = (
- {
- 'descr' => 'unified, colored',
- 'opts' => ['-u'],
- 'colored' => 0,
- },
- {
- 'descr' => 'context, colored',
- 'opts' => ['-c'],
- 'colored' => 0,
- },
- );
-} else {
- # No Enscript -> respect difftype, but don't offer colorization.
- if ($input{f} && $input{f} =~ /^([ucs])c$/) {
- $input{f} = $1;
- }
-}
-
# is there any query ?
if (@barequery) {
$barequery = join (';', @barequery);
@@ -1688,21 +1664,6 @@ sub search_path($)
#
-# Gets the enscript(1) highlight mode corresponding to the given filename,
-# or undef if unsupported.
-#
-sub getEnscriptHL($)
-{
- return undef unless $allow_enscript;
- my ($filename) = @_;
- while (my ($hl, $regex) = each %enscript_types) {
- return $hl if ($filename =~ $regex);
- }
- return undef;
-}
-
-
-#
# Gets the MIME type for the given file name.
#
sub getMimeType($;$)
@@ -2130,14 +2091,8 @@ EOF
printf '
',
$url . $barequery;
} else {
-
print "
\n"; my $linenumbers = $input{ln} || 0; - - if (my $enscript_hl = getEnscriptHL($filename)) { - doEnscript($filehandle, $enscript_hl, $linenumbers); - - } else { my $ln = 0; my @buf = (); my $ts = undef; @@ -2157,8 +2112,6 @@ EOF } print $preformat_in_markup ? spacedHtmlText($_, $ts) : htmlquote($_); } - } - print "\n"; } html_footer(); @@ -2301,36 +2254,6 @@ sub doDiff($$$$$$) html_footer(); gzipclose(); exit; - - } elsif ($f =~ /^([ucs])c$/) { - # - # Enscript colored diff. - # - my $hl = 'diff'; - $hl .= $1 if ($1 eq 'u' || $1 eq 's'); - (my $where_nd = $where) =~ s/\.diff$//; - (my $pathname = $where_nd) =~ s|((?<=/)Attic/)?[^/]*$||; - (my $filename = $where_nd) =~ s|^.*/||; - (my $swhere = $scriptwhere) =~ s|\.diff$||; - navigateHeader($swhere, $pathname, $filename, $rev2, 'diff'); - printf(<
-EOF - doEnscript(\$fh, $hl, 0, 'cvsweb_diff'); - print <-
-\n"; - html_footer(); - gzipclose(); - exit; - } else { # # Plain diff. @@ -3450,36 +3373,6 @@ EOF
EOF -} - - -sub doEnscript($$$;$) -{ - my ($filehandle, $highlight, $linenumbers, $lang) = @_; - $lang ||= 'cvsweb'; - - my @cmd = ($CMD{enscript}, - @enscript_options, - '-q', "--language=$lang", '-o', '-', "--highlight=$highlight"); - - local *ENSCRIPT_OUT; - my ($h, $err) = - startproc(\@cmd, $filehandle, '>pipe', \*ENSCRIPT_OUT); - fatal('500 Internal Error', $err) unless $h; - - # We could short-circuit and have enscript output directly to STDOUT above, - # but that doesn't work with mod_perl (at least some 1.99 versions). - if ($linenumbers) { - my $ln = 0; - while () { - printf '%5d: ', (++$ln) x 2; - print $_; - } - } else { - local $/ = undef; - print ; - } - $h->finish(); }