cvsweb/cvsweb.cgi - diff

Return to cvsweb.cgi CVS log

Up to [cvsweb.bsd.lv] / cvsweb

Diff for /cvsweb/cvsweb.cgi between version 4.20 and 4.35

version 4.20, 2019/11/11 15:46:39

version 4.35, 2019/11/29 18:15:48

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

Line 67 use vars qw (

Line 66 use vars qw (

$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 $hr_breakable $hr_ignwhite $hr_ignkeysubst

$long_intro $short_instruction $shortLogLen $show_author

$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

);

require Compress::Zlib;

Line 129 EOM

Line 126 EOM

$MimeTypes = undef if $@;

$CheckoutMagic = '~checkout~';

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

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

}

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

Line 144 sub spacedHtmlText($;$);

Line 143 sub spacedHtmlText($;$);

sub link($$);

sub revcmp($$);

sub fatal($$@);

sub config_error($$);

sub redirect($;$);

sub safeglob($);

sub search_path($);

Line 168 sub plural_write($$);

Line 166 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 192 sub checkout_to_temp($$$);

Line 188 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 = $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 263 $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 271 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 315 $maycompress = (

Line 316 $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 cvsweb.conf 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 469 for (my $i = 0; $i < scalar(@CVSrepositories); $i += 2

Line 474 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 482 unless ($rootfound) {

Line 486 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 573 $logsort = $input{logsort};

Line 565 $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 647 if ($input{tarball}) {

Line 642 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 655 if ($input{tarball}) {

Line 650 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 697 if ($input{tarball}) {

Line 683 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 752 if (-d $fullname) {

Line 723 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 790 if (-d $fullname) {

Line 759 if (-d $fullname) {

}

$h->finish();

}

print $short_instruction;

}

if ($use_descriptions &&

Line 807 if (-d $fullname) {

Line 775 if (-d $fullname) {

# give direct access to dirs

if ($where eq '/') {

chooseMirror();

chooseCVSRoot();

} else {

print 'Current directory: ', clickablePath($where, 0), '';

if ($cvshistory_url) {

(my $d = $where) =~ s|^/*(.*?)/*$|$1|;

print ' - ', history_link($d, '');

}

print "\n";

print "Current tag: ", htmlquote($input{only_with_tag}), "\n"

if $input{only_with_tag};

Line 825 if (-d $fullname) {

Line 787 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 1120 EOF

Line 1082 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 1147 EOF

Line 1105 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 1545 sub fatal($$@)

Line 1503 sub fatal($$@)

# Signal a (fatal) configuration error.

sub config_error($$)

{

fatal('500 Internal Error',

'Error loading configuration file "<code>%s</code>": ' .

'%s ', @_);

}

# Sends a redirect to the given URL.

sub redirect($;$)

Line 1612 sub safeglob($)

Line 1559 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 MIME type for the given file name.

sub getMimeType($;$)

Line 2193 sub doDiff($$$$$$)

Line 2126 sub doDiff($$$$$$)

my $human_readable = $difftype->{colored};

# Apply special diff options.

push @difftype, '-p' if $showfunc;

push @difftype, '-p';

if ($human_readable) {

push(@difftype, '-w') if $hr_ignwhite;

Line 2464 sub getDirLogs($$@)

Line 2397 sub getDirLogs($$@)

if ($linesread == 0) {

fatal('500 Internal Error',

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

'Failed to spawn rlog on "%s"',

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

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

}

return @unreadable;

}

Line 2787 sub printLog($$$;$$)

Line 2719 sub printLog($$$;$$)

print " \n";

print '';

if (@mytz) {

print scalar gmtime($date{$_}), ' UTC (';

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

print scalar localtime($date{$_}), " $est (";

} else {

print scalar gmtime($date{$_}), " UTC (";

}

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

print ' by ', htmlquote($author{$_}), " \n";

Line 2939 sub doLog($)

Line 2866 sub doLog($)

&clickablePath($upwhere, 1), "\n\n";

print "\n ";

print &link('Request diff between arbitrary revisions', '#diff');

if ($cvshistory_url) {

(my $d = $upwhere) =~ s|/+$||;

print ' - ', history_link($d, $filename);

}

print "\n\n<hr />\n";

print "\n";

Line 3528 EOF

Line 3451 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\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\n";

}

sub fileSortCmp()

{

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

Line 3673 sub display_link($$;$$)

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