version 4.18, 2019/11/11 14:37:54 |
version 4.28, 2019/11/26 12:14:38 |
|
|
$VERSION $CheckoutMagic $MimeTypes $DEBUG |
$VERSION $CheckoutMagic $MimeTypes $DEBUG |
$config $allow_version_select |
$config $allow_version_select |
@CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr |
@CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr |
%MIRRORS %DEFAULTVALUE %ICONS %MTYPES |
%DEFAULTVALUE %ICONS %MTYPES |
%DIFF_COMMANDS @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS |
%DIFF_COMMANDS @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS |
%alltags %fileinfo %tags @branchnames %nameprinted |
%alltags %fileinfo %tags @branchnames %nameprinted |
%symrev %revsym @allrevisions %date %author @revdisplayorder |
%symrev %revsym @allrevisions %date %author @revdisplayorder |
@revisions %state %difflines %log %branchpoint @revorder $keywordsubstitution |
@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 |
$where $Browser $nofilelinks $maycompress @stickyvars |
$is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased |
$is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased |
%input $query $barequery $sortby $bydate $byrev $byauthor |
%input $query $barequery $sortby $bydate $byrev $byauthor |
$bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot |
$bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot |
$charset $output_filter |
$charset $output_filter |
@command_path %CMD $allow_compress $backicon $diricon $fileicon |
@command_path %CMD $allow_compress $backicon $diricon $fileicon |
$fullname $cvstreedefault $logo $defaulttitle $address $binfileicon |
$fullname $logo $defaulttitle $address $binfileicon |
$long_intro $short_instruction $shortLogLen $show_author |
$long_intro $short_instruction $shortLogLen $show_author |
$tablepadding $hr_breakable $showfunc $hr_ignwhite $hr_ignkeysubst |
$tablepadding $hr_breakable $showfunc $hr_ignwhite $hr_ignkeysubst |
$inputTextSize $mime_types $allow_annotate $allow_markup $allow_mailtos |
$inputTextSize $mime_types $allow_annotate $allow_markup $allow_mailtos |
|
|
$edit_option_form |
$edit_option_form |
$show_subdir_lastmod $show_log_in_markup $preformat_in_markup |
$show_subdir_lastmod $show_log_in_markup $preformat_in_markup |
$tabstop $state $annTable $sel @ForbiddenFiles |
$tabstop $state $annTable $sel @ForbiddenFiles |
$use_descriptions %descriptions @mytz $dwhere |
$use_descriptions %descriptions $dwhere |
$use_moddate $gzip_open $file_list_len |
$use_moddate $gzip_open $file_list_len |
$allow_tar @tar_options @gzip_options @zip_options @cvs_options |
$allow_tar @tar_options @gzip_options @cvs_options |
@annotate_options @rcsdiff_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; |
require Compress::Zlib; |
Line 146 sub spacedHtmlText($;$); |
|
Line 144 sub spacedHtmlText($;$); |
|
sub link($$); |
sub link($$); |
sub revcmp($$); |
sub revcmp($$); |
sub fatal($$@); |
sub fatal($$@); |
sub config_error($$); |
|
sub redirect($;$); |
sub redirect($;$); |
sub safeglob($); |
sub safeglob($); |
sub search_path($); |
sub search_path($); |
sub getEnscriptHL($); |
|
sub getMimeType($;$); |
sub getMimeType($;$); |
sub head($;$); |
sub head($;$); |
sub scan_directives(@); |
sub scan_directives(@); |
sub openOutputFilter(); |
sub openOutputFilter(); |
sub doAnnotate($$); |
sub doAnnotate($$); |
sub doCheckout($$$); |
sub doCheckout($$$); |
sub doEnscript($$$;$); |
|
sub cvswebMarkup($$$$$$;$); |
sub cvswebMarkup($$$$$$;$); |
sub viewable($); |
sub viewable($); |
sub doDiff($$$$$$); |
sub doDiff($$$$$$); |
Line 172 sub plural_write($$); |
|
Line 167 sub plural_write($$); |
|
sub readableTime($$); |
sub readableTime($$); |
sub clickablePath($$); |
sub clickablePath($$); |
sub chooseCVSRoot(); |
sub chooseCVSRoot(); |
sub chooseMirror(); |
|
sub fileSortCmp(); |
sub fileSortCmp(); |
sub download_url($$;$); |
sub download_url($$;$); |
sub download_link($$$;$); |
sub download_link($$$;$); |
sub display_url($$;$); |
sub display_url($$;$); |
sub display_link($$;$$); |
sub display_link($$;$$); |
sub history_link($$;$); |
|
sub toggleQuery($;$); |
sub toggleQuery($;$); |
sub htmlquote($); |
sub htmlquote($); |
sub htmlunquote($); |
sub htmlunquote($); |
Line 201 $config = '/conf/cvsweb/cvsweb.conf'; |
|
Line 194 $config = '/conf/cvsweb/cvsweb.conf'; |
|
|
|
######## Configuration parameters ######### |
######## Configuration parameters ######### |
|
|
@CVSrepositories = @CVSROOT = %CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = |
@CVSrepositories = @CVSROOT = %CVSROOT = %DEFAULTVALUE = %ICONS = |
%MTYPES = %tags = %alltags = %fileinfo = %DIFF_COMMANDS = (); |
%MTYPES = %tags = %alltags = %fileinfo = %DIFF_COMMANDS = (); |
|
|
$cvstreedefault = $logo = $defaulttitle = |
$logo = $defaulttitle = |
$address = $long_intro = $short_instruction = $shortLogLen = $show_author = |
$address = $long_intro = $short_instruction = $shortLogLen = $show_author = |
$tablepadding = $hr_breakable = $showfunc = $hr_ignwhite = |
$tablepadding = $hr_breakable = $showfunc = $hr_ignwhite = |
$hr_ignkeysubst = $inputTextSize = $mime_types = $allow_annotate = |
$hr_ignkeysubst = $inputTextSize = $mime_types = $allow_annotate = |
$allow_markup = $allow_compress = $edit_option_form = |
$allow_markup = $allow_compress = $edit_option_form = |
$show_subdir_lastmod = $show_log_in_markup = $preformat_in_markup = |
$show_subdir_lastmod = $show_log_in_markup = $preformat_in_markup = |
$tabstop = $use_moddate = $gzip_open = $DEBUG = |
$tabstop = $use_moddate = $gzip_open = $DEBUG = |
$cvshistory_url = $allow_tar = undef; |
$allow_tar = undef; |
|
|
$allow_version_select = $allow_mailtos = $allow_log_extra = 1; |
$allow_version_select = $allow_mailtos = $allow_log_extra = 1; |
|
|
Line 267 $scriptname = '' unless defined($scriptname); |
|
Line 260 $scriptname = '' unless defined($scriptname); |
|
$where = $pathinfo; |
$where = $pathinfo; |
$doCheckout = $where =~ s|^/$CheckoutMagic/|/|o; |
$doCheckout = $where =~ s|^/$CheckoutMagic/|/|o; |
$where =~ s|^/||; |
$where =~ s|^/||; |
$scriptname =~ s|^/*|/|; |
$scriptname =~ s|^/+||; |
|
|
# Let's workaround thttpd's stupidity.. |
# Let's workaround thttpd's stupidity.. |
if ($scriptname =~ m|/$|) { |
if ($scriptname =~ m|/$|) { |
Line 275 if ($scriptname =~ m|/$|) { |
|
Line 268 if ($scriptname =~ m|/$|) { |
|
my $re = quotemeta $pathinfo; |
my $re = quotemeta $pathinfo; |
$scriptname =~ s/$re$//; |
$scriptname =~ s/$re$//; |
} |
} |
|
$scriptname = "/$scriptname" if $scriptname; |
|
|
# $scriptname : the URI escaped path to this script |
# $scriptname : the URI escaped path to this script |
# $where : the path in the CVS repository (without leading /, or only /) |
# $where : the path in the CVS repository (without leading /, or only /) |
Line 319 $maycompress = ( |
|
Line 313 $maycompress = ( |
|
qw(cvsroot hideattic ignorecase sortby logsort f only_with_tag ln |
qw(cvsroot hideattic ignorecase sortby logsort f only_with_tag ln |
hidecvsroot hidenonreadable); |
hidecvsroot hidenonreadable); |
|
|
# |
|
# Load configuration. |
# 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() |
# 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 471 for (my $i = 0; $i < scalar(@CVSrepositories); $i += 2 |
|
next; |
next; |
} |
} |
$rootfound ||= 1; |
$rootfound ||= 1; |
$cvstreedefault = $key unless defined($cvstreedefault); |
|
$CVSROOTdescr{$key} = $descr; |
$CVSROOTdescr{$key} = $descr; |
$CVSROOT{$key} = $root; |
$CVSROOT{$key} = $root; |
push(@CVSROOT, $key); |
push(@CVSROOT, $key); |
Line 486 unless ($rootfound) { |
|
Line 483 unless ($rootfound) { |
|
} |
} |
undef $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) { |
while (my ($key, $defval) = each %DEFAULTVALUE) { |
|
|
# Replace not given parameters with defaults. |
# Replace not given parameters with defaults. |
Line 534 foreach (@stickyvars) { |
|
Line 519 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 ? |
# is there any query ? |
if (@barequery) { |
if (@barequery) { |
$barequery = join (';', @barequery); |
$barequery = join (';', @barequery); |
Line 598 $logsort = $input{logsort}; |
|
Line 562 $logsort = $input{logsort}; |
|
if ($input{cvsroot} && $CVSROOT{$input{cvsroot}}) { |
if ($input{cvsroot} && $CVSROOT{$input{cvsroot}}) { |
$cvstree = $input{cvsroot}; |
$cvstree = $input{cvsroot}; |
} else { |
} else { |
$cvstree = $cvstreedefault; |
$cvstree = $CVSrepositories[0]; |
} |
} |
|
|
$cvsroot = $CVSROOT{$cvstree}; |
$cvsroot = $CVSROOT{$cvstree}; |
Line 627 if (-f $config_cvstree) { |
|
Line 591 if (-f $config_cvstree) { |
|
} |
} |
undef $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); |
$fullname = catfile($cvsroot, $where); |
|
|
my $rewrite = 0; |
my $rewrite = 0; |
Line 676 if ($input{tarball}) { |
|
Line 636 if ($input{tarball}) { |
|
|
|
my ($module) = ($where =~ m,^/?(.*),); # untaint |
my ($module) = ($where =~ m,^/?(.*),); # untaint |
$module =~ s,/([^/]*)$,,; |
$module =~ s,/([^/]*)$,,; |
my ($ext) = ($1 =~ /(\.t(?:ar\.)?gz|\.zip)$/); |
my ($ext) = ($1 =~ /(\.t(?:ar\.)?gz)$/); |
my ($basedir) = ($module =~ m,([^/]+)$,); |
my ($basedir) = ($module =~ m,([^/]+)$,); |
|
|
if ($basedir eq '' || $module eq '') { |
if ($basedir eq '' || $module eq '') { |
Line 684 if ($input{tarball}) { |
|
Line 644 if ($input{tarball}) { |
|
'You cannot download the top level directory.'); |
'You cannot download the top level directory.'); |
} |
} |
|
|
my $istar = ($ext eq '.tar.gz' || $ext eq '.tgz'); |
my $istar = $ext eq '.tar.gz' || $ext eq '.tgz'; |
if ($istar) { |
if ($istar) { |
fatal('500 Internal Error', 'tar command not found.') unless $CMD{tar}; |
fatal('500 Internal Error', 'tar command not found.') unless $CMD{tar}; |
fatal('500 Internal Error', 'gzip command not found.') unless $CMD{gzip}; |
fatal('500 Internal Error', 'gzip command not found.') unless $CMD{gzip}; |
} |
} else { |
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.'); |
fatal('500 Internal Error', 'Unsupported archive type.'); |
} |
} |
|
|
Line 738 if ($input{tarball}) { |
|
Line 693 if ($input{tarball}) { |
|
my @gzip = ($CMD{gzip}, @gzip_options, '-c'); |
my @gzip = ($CMD{gzip}, @gzip_options, '-c'); |
push(@cmd, \@tar, '|', \@gzip); |
push(@cmd, \@tar, '|', \@gzip); |
$ctype = 'application/x-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); |
push(@cmd, '>pipe', \*TAR_OUT); |
|
|
Line 753 if ($input{tarball}) { |
|
Line 704 if ($input{tarball}) { |
|
$h->finish(); |
$h->finish(); |
} else { |
} else { |
@fatal = ('500 Internal Error', |
@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 836 if (-d $fullname) { |
|
Line 787 if (-d $fullname) { |
|
|
|
# give direct access to dirs |
# give direct access to dirs |
if ($where eq '/') { |
if ($where eq '/') { |
chooseMirror(); |
|
chooseCVSRoot(); |
chooseCVSRoot(); |
|
|
} else { |
} else { |
print '<p>Current directory: <b>', clickablePath($where, 0), '</b>'; |
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>\n"; |
print "<p>Current tag: <b>", htmlquote($input{only_with_tag}), "</b></p>\n" |
print "<p>Current tag: <b>", htmlquote($input{only_with_tag}), "</b></p>\n" |
if $input{only_with_tag}; |
if $input{only_with_tag}; |
|
|
if ($allow_tar && $filesfound) { |
if ($allow_tar && $filesfound) { |
my ($basefile) = ($where =~ m,(?:.*/)?([^/]+),); |
my ($basefile) = ($where =~ m,(?:.*/)?([^/]+),); |
my $havetar = $CMD{tar} && $CMD{gzip}; |
my $havetar = $CMD{tar} && $CMD{gzip}; |
my $havezip = $CMD{zip}; |
if (defined($basefile) && $basefile ne '' && $havetar) { |
if (defined($basefile) && $basefile ne '' && ($havetar || $havezip)) { |
|
my $q = ($query ? "$query;" : '?') . 'tarball=1'; |
my $q = ($query ? "$query;" : '?') . 'tarball=1'; |
print "<hr />\n", |
print "<hr />\n", |
'<div style="text-align: center">Download this directory in '; |
'<div style="text-align: center">Download this directory in '; |
# Mangle the filename so browsers show a reasonable filename to download. |
# Mangle the filename so browsers show a reasonable filename to download. |
my @types = (); |
|
$basefile = uri_escape($basefile); |
$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"; |
|
} |
} |
} |
} |
|
|
|
|
printf(qq{<input type="hidden" name="%s" value="%s" />\n}, |
printf(qq{<input type="hidden" name="%s" value="%s" />\n}, |
$v, $input{$v} || 0); |
$v, $input{$v} || 0); |
} |
} |
if ($cvstree ne $cvstreedefault) { |
if ($cvstree ne $CVSrepositories[0]) { |
print "<input type=\"hidden\" name=\"cvsroot\" value=\"$cvstree\" />\n"; |
print "<input type=\"hidden\" name=\"cvsroot\" value=\"$cvstree\" />\n"; |
} |
} |
print <<EOF; |
print <<EOF; |
Line 1478 sub htmlify($;$) |
|
Line 1420 sub htmlify($;$) |
|
} |
} |
|
|
if ($extra) { |
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)" |
# get manpage specs as link: "foo.1" "foo(1)" |
if (defined($mancgi)) { |
if (defined($mancgi)) { |
$_ = htmlify_sub { |
$_ = htmlify_sub { |
|
|
|
|
|
|
# |
# |
# 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. |
# Sends a redirect to the given URL. |
# |
# |
sub redirect($;$) |
sub redirect($;$) |
Line 1688 sub search_path($) |
|
Line 1586 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. |
# Gets the MIME type for the given file name. |
# |
# |
sub getMimeType($;$) |
sub getMimeType($;$) |
|
|
printf '<embed src="%s" width="100%%" height="100%%" /><br />', |
printf '<embed src="%s" width="100%%" height="100%%" /><br />', |
$url . $barequery; |
$url . $barequery; |
} else { |
} else { |
|
|
print "<pre>\n"; |
print "<pre>\n"; |
my $linenumbers = $input{ln} || 0; |
my $linenumbers = $input{ln} || 0; |
|
|
if (my $enscript_hl = getEnscriptHL($filename)) { |
|
doEnscript($filehandle, $enscript_hl, $linenumbers); |
|
|
|
} else { |
|
my $ln = 0; |
my $ln = 0; |
my @buf = (); |
my @buf = (); |
my $ts = undef; |
my $ts = undef; |
|
|
} |
} |
print $preformat_in_markup ? spacedHtmlText($_, $ts) : htmlquote($_); |
print $preformat_in_markup ? spacedHtmlText($_, $ts) : htmlquote($_); |
} |
} |
} |
|
|
|
print "</pre>\n"; |
print "</pre>\n"; |
} |
} |
html_footer(); |
html_footer(); |
Line 2301 sub doDiff($$$$$$) |
|
Line 2176 sub doDiff($$$$$$) |
|
html_footer(); |
html_footer(); |
gzipclose(); |
gzipclose(); |
exit; |
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> |
|
<hr style="width: 100%" /> |
|
<form method="get" action="$scriptwhere"> |
|
EOF |
|
printDiffSelectStickyVars(); |
|
print 'Diff format: '; |
|
printDiffSelect(); |
|
print "<input type=\"submit\" value=\"Show\" />\n</form>\n"; |
|
html_footer(); |
|
gzipclose(); |
|
exit; |
|
|
|
} else { |
} else { |
# |
# |
# Plain diff. |
# Plain diff. |
Line 2579 sub getDirLogs($$@) |
|
Line 2424 sub getDirLogs($$@) |
|
|
|
if ($linesread == 0) { |
if ($linesread == 0) { |
fatal('500 Internal Error', |
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>.<br /><br />Did you set the <b><code>@command_path</code></b> in your configuration file correctly? (Currently: "<code>%s</code>")', |
htmlquote(join(', ', @files)), join(':', @command_path)); |
htmlquote(join(', ', @files)), join(':', @command_path)); |
} |
} |
|
|
Line 2902 sub printLog($$$;$$) |
|
Line 2747 sub printLog($$$;$$) |
|
print "<br />\n"; |
print "<br />\n"; |
|
|
print '<i>'; |
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 readableTime(time() - $date{$_}, 1), ' ago)'; |
print ' by <i>', htmlquote($author{$_}), "</i><br />\n"; |
print ' by <i>', htmlquote($author{$_}), "</i><br />\n"; |
|
|
|
|
&clickablePath($upwhere, 1), "</b>\n</p>\n"; |
&clickablePath($upwhere, 1), "</b>\n</p>\n"; |
print "<p>\n "; |
print "<p>\n "; |
print &link('Request diff between arbitrary revisions', '#diff'); |
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 "\n</p>\n<hr />\n"; |
|
|
print "<p>\n"; |
print "<p>\n"; |
|
|
} |
} |
|
|
|
|
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 |
# The passed in $path and $filename should not be URI escaped, and $swhere |
# *should* be. |
# *should* be. |
|
|
} |
} |
|
|
|
|
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() |
sub fileSortCmp() |
{ |
{ |
(my $af = $a) =~ s/,v$//; |
(my $af = $a) =~ s/,v$//; |
Line 3818 sub display_link($$;$$) |
|
Line 3603 sub display_link($$;$$) |
|
return sprintf('<a href="%s" class="display-link">%s</a>', |
return sprintf('<a href="%s" class="display-link">%s</a>', |
display_url($url, $revision, $mtype) . $barequery, |
display_url($url, $revision, $mtype) . $barequery, |
htmlquote($textlink)); |
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 |
# Returns a Query string with the |