cvsweb/cvsweb.cgi - diff

Return to cvsweb.cgi CVS log

Up to [cvsweb.bsd.lv] / cvsweb

Diff for /cvsweb/cvsweb.cgi between version 4.18 and 4.34

version 4.18, 2019/11/11 14:37:54

version 4.34, 2019/11/29 16:30:06

Line 56 use filetest qw(access);

use vars qw (

$VERSION $CheckoutMagic $MimeTypes $DEBUG

$config $allow_version_select

@CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr

@CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr %DEFAULTVALUE %MTYPES

%MIRRORS %DEFAULTVALUE %ICONS %MTYPES

%DIFF_COMMANDS @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS

%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

$mancgi $doCheckout $scriptname $scriptwhere

$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

$bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot

$charset $output_filter

$charset $output_filter %CMD $allow_compress $backicon $diricon $fileicon

@command_path %CMD $allow_compress $backicon $diricon $fileicon

$fullname $logo $defaulttitle $address $binfileicon $iconsdir

$fullname $cvstreedefault $logo $defaulttitle $address $binfileicon

$shortLogLen $show_author

$long_intro $short_instruction $shortLogLen $show_author

$hr_breakable $showfunc $hr_ignwhite $hr_ignkeysubst

$tablepadding $hr_breakable $showfunc $hr_ignwhite $hr_ignkeysubst

$inputTextSize $mime_types $allow_annotate $allow_markup $allow_mailtos

$allow_log_extra $allow_dir_extra $allow_source_extra

$edit_option_form

$show_subdir_lastmod $show_log_in_markup $preformat_in_markup

$tabstop $state $annTable $sel @ForbiddenFiles

$use_descriptions %descriptions @mytz $dwhere

$use_descriptions %descriptions $dwhere

$use_moddate $gzip_open $file_list_len

$allow_tar @tar_options @gzip_options @zip_options @cvs_options

$allow_tar @tar_options @cvs_options

@annotate_options @rcsdiff_options

$HTML_DOCTYPE $HTML_META $cssurl $CSS $cvshistory_url

$HTML_DOCTYPE $HTML_META $cssurl $CSS

$allow_enscript @enscript_options %enscript_types

);

require Compress::Zlib;

Line 131 EOM

Line 127 EOM

$MimeTypes = undef if $@;

$CheckoutMagic = '~checkout~';

$CMD{$_} = "/usr/bin/$_" for (qw(cvs rcsdiff rlog));

$CMD{tar} = "/bin/tar";

}

# -----------------------------------------------------------------------------

Line 146 sub spacedHtmlText($;$);

Line 144 sub spacedHtmlText($;$);

sub link($$);

sub revcmp($$);

sub fatal($$@);

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($$$$$$);

Line 172 sub plural_write($$);

Line 167 sub plural_write($$);

sub readableTime($$);

sub clickablePath($$);

sub chooseCVSRoot();

sub chooseMirror();

sub fileSortCmp();

sub download_url($$;$);

sub download_link($$$;$);

sub display_url($$;$);

sub display_link($$;$$);

sub history_link($$;$);

sub toggleQuery($;$);

sub htmlquote($);

sub htmlunquote($);

Line 196 sub checkout_to_temp($$$);

Line 189 sub checkout_to_temp($$$);

# (think mod_perl)...

delete(@ENV{qw(PATH IFS CDPATH ENV BASH_ENV)});

# Helps to achieve read only access to the repositories

# with cvs >= 1.12.1 and doesn't hurt other versions.

$ENV{CVSREADONLYFS} = 1;

# Location of the configuration file inside the web server chroot:

$config = '/conf/cvsweb/cvsweb.conf';

######## Configuration parameters #########

@CVSrepositories = @CVSROOT = %CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS =

@CVSrepositories = @CVSROOT = %CVSROOT = %DEFAULTVALUE =

%MTYPES = %tags = %alltags = %fileinfo = %DIFF_COMMANDS = ();

$cvstreedefault = $logo = $defaulttitle =

$logo = $defaulttitle =

$address = $long_intro = $short_instruction = $shortLogLen = $show_author =

$address = $shortLogLen = $show_author =

$tablepadding = $hr_breakable = $showfunc = $hr_ignwhite =

$hr_breakable = $showfunc = $hr_ignwhite =

$hr_ignkeysubst = $inputTextSize = $mime_types = $allow_annotate =

$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;

Line 267 $scriptname = '' unless defined($scriptname);

Line 264 $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|/$|) {

Line 275 if ($scriptname =~ m|/$|) {

Line 272 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 /)

Line 319 $maycompress = (

Line 317 $maycompress = (

qw(cvsroot hideattic ignorecase sortby logsort f only_with_tag ln

hidecvsroot hidenonreadable);

# Load configuration.

{

if (-f $config) {

$config =~ m|^/| or fatal '500 Internal Error',

do "$config" or config_error($config, $@);

'Configuration file name "<code>%s</code>" is not an absolute path.',

} else {

$config;

fatal("500 Internal Error",

defined do $config and last;

'Configuration not found. Set the parameter <code>$config</code> in cvsweb.cgi to your <b>cvsweb.conf</b> configuration file first.');

$@ 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()

Line 473 for (my $i = 0; $i < scalar(@CVSrepositories); $i += 2

Line 475 for (my $i = 0; $i < scalar(@CVSrepositories); $i += 2

next;

}

$rootfound ||= 1;

$cvstreedefault = $key unless defined($cvstreedefault);

$CVSROOTdescr{$key} = $descr;

$CVSROOT{$key} = $root;

push(@CVSROOT, $key);

Line 486 unless ($rootfound) {

Line 487 unless ($rootfound) {

}

undef $rootfound;

$DEFAULTVALUE{cvsroot} = $CVSrepositories[0];

# Default CVS root

if (!defined($CVSROOT{$cvstreedefault})) {

fatal("500 Internal Error",

'<code>$cvstreedefault</code> points to a repository (%s) not ' .

'defined in <code>@CVSrepositories</code> in your configuration ' .

'file (<code>%s</code>).',

$cvstreedefault,

$config);

}

$DEFAULTVALUE{cvsroot} = $cvstreedefault;

while (my ($key, $defval) = each %DEFAULTVALUE) {

# Replace not given parameters with defaults.

Line 534 foreach (@stickyvars) {

Line 523 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);

Line 598 $logsort = $input{logsort};

Line 566 $logsort = $input{logsort};

if ($input{cvsroot} && $CVSROOT{$input{cvsroot}}) {

$cvstree = $input{cvsroot};

} else {

$cvstree = $cvstreedefault;

$cvstree = $CVSrepositories[0];

}

$cvsroot = $CVSROOT{$cvstree};

# create icons out of description

if ($iconsdir) {

foreach my $k (keys %ICONS) {

$backicon = '<img src="' . $iconsdir . '/back.gif" alt="[BACK]"' .

my ($itxt, $ipath, $iwidth, $iheight) = @{$ICONS{$k}};

' border="0" width="20" height="22"/>';

no strict 'refs';

$diricon = '<img src="' . $iconsdir . '/dir.gif" alt="[DIR]"' .

if ($ipath) {

' border="0" width="20" height="22"/>';

${"${k}icon"} =

$fileicon = '<img src="' . $iconsdir . '/text.gif" alt="[TXT]"' .

sprintf('<img src="%s" alt="%s" border="0" width="%d" height="%d" />',

' border="0" width="20" height="22"/>';

htmlquote($ipath), htmlquote($itxt), $iwidth, $iheight);

$binfileicon = '<img src="' . $iconsdir . '/binary.gif" alt="[BIN]"' .

} else {

' border="0" width="20" height="22"/>';

${"${k}icon"} = $itxt;

} else {

}

$backicon = 'back';

$diricon = 'dir';

$fileicon = 'file';

$binfileicon = 'binfile';

}

my $config_cvstree = "$config-$cvstree";

Line 627 if (-f $config_cvstree) {

Line 598 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;

Line 676 if ($input{tarball}) {

Line 643 if ($input{tarball}) {

my ($module) = ($where =~ m,^/?(.*),); # untaint

$module =~ s,/([^/]*)$,,;

my ($ext) = ($1 =~ /(\.t(?:ar\.)?gz|\.zip)$/);

my ($ext) = ($1 =~ /(\.t(?:ar\.)?gz)$/);

my ($basedir) = ($module =~ m,([^/]+)$,);

if ($basedir eq '' || $module eq '') {

Line 684 if ($input{tarball}) {

Line 651 if ($input{tarball}) {

'You cannot download the top level directory.');

}

my $istar = ($ext eq '.tar.gz' || $ext eq '.tgz');

unless ($ext eq '.tar.gz' || $ext eq '.tgz') {

if ($istar) {

fatal('404 Not Found', 'Unsupported archive type.');

fatal('500 Internal Error', 'tar command not found.') unless $CMD{tar};

fatal('500 Internal Error', 'gzip command not found.') unless $CMD{gzip};

}

my $iszip = ($ext eq '.zip');

if ($iszip && !$CMD{zip}) {

fatal('500 Internal Error', 'zip command not found.');

}

if (!$istar && !$iszip) {

fatal('500 Internal Error', 'Unsupported archive type.');

}

my $tmpexportdir;

eval {

Line 726 if ($input{tarball}) {

Line 684 if ($input{tarball}) {

('500 Internal Error',

'Export failure (exit status %s), output: <pre>%s</pre>',

$errcode, $err || $export_err);

} else {

$| = 1; # Essential to get the buffering right.

local (*TAR_OUT);

my ($h, $err) = startproc($CMD{tar}, @tar_options, '-czf', '-',

my (@cmd, $ctype);

$basedir, '>pipe', \*TAR_OUT);

if ($istar) {

my @tar = ($CMD{tar}, @tar_options, '-cf', '-', $basedir);

my @gzip = ($CMD{gzip}, @gzip_options, '-c');

push(@cmd, \@tar, '|', \@gzip);

$ctype = 'application/x-gzip';

} elsif ($iszip) {

my @zip = ($CMD{zip}, @zip_options, '-r', '-', $basedir);

push(@cmd, \@zip, \'');

$ctype = 'application/zip';

}

push(@cmd, '>pipe', \*TAR_OUT);

my ($h, $err) = startproc(@cmd);

if ($h) {

print "Content-Type: $ctype\r\n\r\n";

print "Content-Type: application/x-gzip\r\n\r\n";

local $/ = undef;

print <TAR_OUT>;

$h->finish();

} else {

@fatal = ('500 Internal Error',

'%s failure (exit status %s), output: <pre>%s</pre>',

'tar failure (exit status %s), output: <pre>%s</pre>',

$istar ? 'Tar' : 'Zip', $? >> 8 || -1, $err);

$? >> 8 || -1, $err);

}

Line 781 if (-d $fullname) {

Line 724 if (-d $fullname) {

if ($where eq '/') {

html_header($defaulttitle);

$long_intro =~ s/!!CVSROOTdescr!!/$CVSROOTdescr{$cvstree}/g;

print $long_intro;

} else {

html_header($where);

my $html = (-f catfile($fullname, 'README.cvs.html,v') ||

Line 819 if (-d $fullname) {

Line 760 if (-d $fullname) {

}

$h->finish();

}

print $short_instruction;

}

if ($use_descriptions &&

Line 836 if (-d $fullname) {

Line 776 if (-d $fullname) {

# give direct access to dirs

if ($where eq '/') {

chooseMirror();

chooseCVSRoot();

} 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};

Line 854 if (-d $fullname) {

Line 788 if (-d $fullname) {

my $infocols = 1;

printf(<<EOF, $tablepadding, 'Directory index of ' . htmlquote($where));

printf(<<EOF, 'Directory index of ' . htmlquote($where));

<tr>

EOF

printf('<th colspan="2"%s>', ($byfile ? ' class="sorted"' : ''));

Line 1149 EOF

Line 1083 EOF

if ($allow_tar && $filesfound) {

my ($basefile) = ($where =~ m,(?:.*/)?([^/]+),);

my $havetar = $CMD{tar} && $CMD{gzip};

if (defined($basefile) && $basefile ne '') {

my $havezip = $CMD{zip};

if (defined($basefile) && $basefile ne '' && ($havetar || $havezip)) {

my $q = ($query ? "$query;" : '?') . 'tarball=1';

print "<hr />\n",

'<div style="text-align: center">Download this directory in ';

# Mangle the filename so browsers show a reasonable filename to download.

my @types = ();

$basefile = uri_escape($basefile);

push(@types, &link('tarball', "$basefile.tar.gz$q")) if $havetar;

print &link('tarball', "$basefile.tar.gz$q");

push(@types, &link('zip archive', "$basefile.zip$q")) if $havezip;

print "</div>\n";

print join(' or ', @types), "</div>\n";

}

Line 1176 EOF

Line 1106 EOF

printf(qq{<input type="hidden" name="%s" value="%s" />\n},

$v, $input{$v} || 0);

}

if ($cvstree ne $cvstreedefault) {

if ($cvstree ne $CVSrepositories[0]) {

print "<input type=\"hidden\" name=\"cvsroot\" value=\"$cvstree\" />\n";

}

print <<EOF;

Line 1478 sub htmlify($;$)

Line 1408 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 {

(\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 {

(\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 {

Line 1607 sub fatal($$@)

Line 1504 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($;$)

Line 1674 sub safeglob($)

Line 1560 sub safeglob($)

# Searches @command_path for the given executable file.

sub search_path($)

{

my ($command) = @_;

for my $d (@command_path) {

my $cmd = catfile($d, $command);

return $cmd if (-x $cmd && !-d _);

}

return '';

}

# 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($;$)

Line 2130 EOF

Line 1987 EOF

printf '<embed src="%s" width="100%%" height="100%%" /><br />',

$url . $barequery;

} else {

print "<pre>\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;

Line 2157 EOF

Line 2008 EOF

}

print $preformat_in_markup ? spacedHtmlText($_, $ts) : htmlquote($_);

}

print "</pre>\n";

}

html_footer();

Line 2301 sub doDiff($$$$$$)

Line 2150 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, $where_nd, $rev1, $rev2);

<h3 style="text-align: center">Diff for /%s between versions %s and %s</h3>

<pre>

EOF

doEnscript(\$fh, $hl, 0, 'cvsweb_diff');

print <<EOF;

</pre>

EOF

printDiffSelectStickyVars();

print 'Diff format: ';

printDiffSelect();

print "<input type=\"submit\" value=\"Show\" />\n</form>\n";

html_footer();

gzipclose();

exit;

} else {

# Plain diff.

Line 2579 sub getDirLogs($$@)

Line 2398 sub getDirLogs($$@)

if ($linesread == 0) {

fatal('500 Internal Error',

'Failed to spawn GNU rlog on <em>"%s"</em>.<br /><br />Did you set the <b><code>@command_path</code></b> in your configuration file correctly? (Currently: "<code>%s</code>")',

'Failed to spawn rlog on <em>"%s"</em>',

htmlquote(join(', ', @files)), join(':', @command_path));

htmlquote(join(', ', @files)));

}

return @unreadable;

}

Line 2902 sub printLog($$$;$$)

Line 2720 sub printLog($$$;$$)

print "<br />\n";

print '<i>';

if (@mytz) {

print scalar gmtime($date{$_}), ' UTC</i> (';

my ($est) = $mytz[(localtime($date{$_}))[8]];

print scalar localtime($date{$_}), " $est</i> (";

} else {

print scalar gmtime($date{$_}), " UTC</i> (";

}

print readableTime(time() - $date{$_}, 1), ' ago)';

print ' by <i>', htmlquote($author{$_}), "</i><br />\n";

Line 3054 sub doLog($)

Line 2867 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";

Line 3453 EOF

Line 3262 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 (<ENSCRIPT_OUT>) {

printf '<a id="l%d" class="src">%5d: </a>', (++$ln) x 2;

print $_;

}

} else {

local $/ = undef;

print <ENSCRIPT_OUT>;

}

$h->finish();

}

# The passed in $path and $filename should not be URI escaped, and $swhere

# *should* be.

Line 3673 EOF

Line 3452 EOF

}

sub chooseMirror()

{

# This code comes from the original BSD-cvsweb

# and may not be useful for your site; If you don't

# set %MIRRORS this won't show up, anyway.

scalar(%MIRRORS) or return;

# Should perhaps exclude the current site somehow...

print "\n<p>\nThis CVSweb is mirrored in\n";

my @tmp = map(&link(htmlquote($_), $MIRRORS{$_}), sort keys %MIRRORS);

my $tmp = pop (@tmp);

if (scalar(@tmp)) {

print join (', ', @tmp), ' and ';

}

print "$tmp.\n</p>\n";

}

sub fileSortCmp()

{

(my $af = $a) =~ s/,v$//;

Line 3818 sub display_link($$;$$)

Line 3576 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

CVSweb