version 1.1.1.12, 2000/11/04 19:19:48 |
version 1.1.1.24, 2001/03/27 17:24:25 |
|
|
#!/usr/bin/perl5 -ws |
#!/usr/bin/perl -wT |
# |
# |
# cvsweb - a CGI interface to CVS trees. |
# cvsweb - a CGI interface to CVS trees. |
# |
# |
|
|
# Copyright (c) 1996-1998 Bill Fenner |
# Copyright (c) 1996-1998 Bill Fenner |
# (c) 1998-1999 Henner Zeller |
# (c) 1998-1999 Henner Zeller |
# (c) 1999 Henrik Nordstrom |
# (c) 1999 Henrik Nordstrom |
# (c) 2000 Akinori MUSHA |
# (c) 2000-2001 Akinori MUSHA |
# All rights reserved. |
# All rights reserved. |
# |
# |
# Redistribution and use in source and binary forms, with or without |
# Redistribution and use in source and binary forms, with or without |
|
|
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
# SUCH DAMAGE. |
# SUCH DAMAGE. |
# |
# |
# $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $ |
# $zId: cvsweb.cgi,v 1.106 2001/03/10 01:16:27 hnordstrom Exp $ |
# $kId: cvsweb.cgi,v 1.39 2000/11/04 15:32:17 knu Exp $ |
# $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.70 2001/03/27 17:20:46 knu Exp $ |
# |
# |
### |
### |
|
|
|
require 5.000; |
|
|
use strict; |
use strict; |
|
|
use vars qw ( |
use vars qw ( |
$config $allow_version_select $verbose |
$cvsweb_revision |
%CVSROOT %CVSROOTdescr %MIRRORS %DEFAULTVALUE %ICONS %MTYPES |
$mydir $uname $config $allow_version_select $verbose |
|
@CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr |
|
%MIRRORS %DEFAULTVALUE %ICONS %MTYPES |
@DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS |
@DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS |
%alltags @tabcolors %fileinfo %tags @branchnames %nameprinted |
%alltags @tabcolors %fileinfo %tags @branchnames %nameprinted |
%symrev %revsym @allrevisions %date %author @revdisplayorder |
%symrev %revsym @allrevisions %date %author @revdisplayorder |
@revisions %state %difflines %log %branchpoint @revorder |
@revisions %state %difflines %log %branchpoint @revorder |
$prcgi @prcategories $prcategories $mancgi |
$prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword $mancgi |
$checkoutMagic $doCheckout $scriptname $scriptwhere |
$checkoutMagic $doCheckout $scriptname $scriptwhere |
$where $pathinfo $Browser $nofilelinks $maycompress @stickyvars |
$where $pathinfo $Browser $nofilelinks $maycompress @stickyvars |
%funcline_regexp $is_mod_perl |
%funcline_regexp $is_mod_perl |
$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 |
$mimetype $defaultTextPlain $defaultViewable $allow_compress |
$mimetype $charset $defaultTextPlain $defaultViewable |
$GZIPBIN $backicon $diricon $fileicon $fullname $newname |
$command_path %CMD $allow_compress |
$cvstreedefault $body_tag $body_tag_for_src |
$backicon $diricon $fileicon |
$logo $defaulttitle $address |
$fullname $newname $cvstreedefault |
|
$body_tag $body_tag_for_src $logo $defaulttitle $address |
$long_intro $short_instruction $shortLogLen |
$long_intro $short_instruction $shortLogLen |
$show_author $dirtable $tablepadding $columnHeaderColorDefault |
$show_author $dirtable $tablepadding $columnHeaderColorDefault |
$columnHeaderColorSorted $hr_breakable $showfunc $hr_ignwhite |
$columnHeaderColorSorted $hr_breakable $showfunc $hr_ignwhite |
|
|
$difffontsize $inputTextSize $mime_types $allow_annotate |
$difffontsize $inputTextSize $mime_types $allow_annotate |
$allow_markup $use_java_script $open_extern_window |
$allow_markup $use_java_script $open_extern_window |
$extern_window_width $extern_window_height $edit_option_form |
$extern_window_width $extern_window_height $edit_option_form |
$show_subdir_lastmod $show_log_in_markup $v |
$show_subdir_lastmod $show_log_in_markup $preformat_in_markup $v |
$navigationHeaderColor $tableBorderColor $markupLogColor |
$navigationHeaderColor $tableBorderColor $markupLogColor |
$tabstop $state $annTable $sel $curbranch @HideModules |
$tabstop $state $annTable $sel $curbranch @HideModules |
$module $use_descriptions %descriptions @mytz $dwhere $moddate |
$module $use_descriptions %descriptions @mytz $dwhere $moddate |
$use_moddate $has_zlib $gzip_open |
$use_moddate $has_zlib $gzip_open |
|
$allow_tar @tar_options @gzip_options @cvs_options |
$LOG_FILESEPARATOR $LOG_REVSEPARATOR |
$LOG_FILESEPARATOR $LOG_REVSEPARATOR |
); |
); |
|
|
|
|
sub fatal($$); |
sub fatal($$); |
sub redirect($); |
sub redirect($); |
sub safeglob($); |
sub safeglob($); |
|
sub search_path($); |
sub getMimeTypeFromSuffix($); |
sub getMimeTypeFromSuffix($); |
sub head($;$); |
sub head($;$); |
sub scan_directives(@); |
sub scan_directives(@); |
Line 122 sub toggleQuery($$); |
|
Line 129 sub toggleQuery($$); |
|
sub urlencode($); |
sub urlencode($); |
sub htmlquote($); |
sub htmlquote($); |
sub htmlunquote($); |
sub htmlunquote($); |
|
sub hrefquote($); |
sub http_header(;$); |
sub http_header(;$); |
sub html_header($); |
sub html_header($); |
sub html_footer(); |
sub html_footer(); |
Line 129 sub link_tags($); |
|
Line 137 sub link_tags($); |
|
sub forbidden_module($); |
sub forbidden_module($); |
|
|
##### Start of Configuration Area ######## |
##### Start of Configuration Area ######## |
use Cwd; |
delete $ENV{PATH}; |
|
|
|
$cvsweb_revision = '1.106' . '.' . (split(/ /, |
|
q$Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.70 2001/03/27 17:20:46 knu Exp $ |
|
))[2]; |
|
|
|
use File::Basename; |
|
|
|
($mydir) = (dirname($0) =~ /(.*)/); # untaint |
|
|
# == EDIT this == |
# == EDIT this == |
# Locations to search for user configuration, in order: |
# Locations to search for user configuration, in order: |
for ( |
for ( |
$ENV{CVSWEB_CONFIG}, |
"$mydir/cvsweb.conf", |
'/usr/local/etc/cvsweb.conf', |
'/usr/local/etc/cvsweb/cvsweb.conf' |
getcwd() . '/cvsweb.conf' |
|
) { |
) { |
$config = $_ if defined($_) && -r $_; |
if (defined($_) && -r $_) { |
|
$config = $_; |
|
last; |
|
} |
} |
} |
|
|
# == Configuration defaults == |
# == Configuration defaults == |
Line 150 $allow_version_select = 1; |
|
Line 168 $allow_version_select = 1; |
|
|
|
######## Configuration variables ######### |
######## Configuration variables ######### |
# These are defined to allow checking with perl -cw |
# These are defined to allow checking with perl -cw |
%CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES = |
@CVSrepositories = @CVSROOT = %CVSROOT = |
|
%MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES = |
%tags = %alltags = @tabcolors = (); |
%tags = %alltags = @tabcolors = (); |
$cvstreedefault = $body_tag = $body_tag_for_src = |
$cvstreedefault = $body_tag = $body_tag_for_src = |
$logo = $defaulttitle = $address = |
$logo = $defaulttitle = $address = |
|
|
$checkoutMagic = "~checkout~"; |
$checkoutMagic = "~checkout~"; |
$pathinfo = defined($ENV{PATH_INFO}) ? $ENV{PATH_INFO} : ''; |
$pathinfo = defined($ENV{PATH_INFO}) ? $ENV{PATH_INFO} : ''; |
$where = $pathinfo; |
$where = $pathinfo; |
$doCheckout = ($where =~ /^\/$checkoutMagic/); |
$doCheckout = ($where =~ m|^/$checkoutMagic/|); |
$where =~ s|^/($checkoutMagic)?||; |
$where =~ s|^/$checkoutMagic/|/|; |
$where =~ s|/+$||; |
$where =~ s|^/||; |
$scriptname = defined($ENV{SCRIPT_NAME}) ? $ENV{SCRIPT_NAME} : ''; |
$scriptname = defined($ENV{SCRIPT_NAME}) ? $ENV{SCRIPT_NAME} : ''; |
$scriptname =~ s|^/?|/|; |
$scriptname =~ s|^/*|/|; |
$scriptname =~ s|/+$||; |
|
$scriptwhere = $scriptname; |
# Let's workaround thttpd's stupidity.. |
if ($where) { |
if ($scriptname =~ m|/$|) { |
$scriptwhere .= '/' . urlencode($where); |
$pathinfo .= '/'; |
|
my $re = quotemeta $pathinfo; |
|
$scriptname =~ s/$re$//; |
} |
} |
|
|
|
$scriptwhere = $scriptname; |
|
$scriptwhere .= '/' . urlencode($where); |
|
$where = '/' if ($where eq ''); |
|
|
$is_mod_perl = defined($ENV{MOD_PERL}); |
$is_mod_perl = defined($ENV{MOD_PERL}); |
|
|
# in lynx, it it very annoying to have two links |
# in lynx, it it very annoying to have two links |
# per file, so disable the link at the icon |
# per file, so disable the link at the icon |
# in this case: |
# in this case: |
$Browser = $ENV{HTTP_USER_AGENT}; |
$Browser = $ENV{HTTP_USER_AGENT} || ''; |
$is_links = ($Browser =~ m`^Links `); |
$is_links = ($Browser =~ m`^Links `); |
$is_lynx = ($Browser =~ m`^Lynx/`i); |
$is_lynx = ($Browser =~ m`^Lynx/`i); |
$is_w3m = ($Browser =~ m`^w3m/`i); |
$is_w3m = ($Browser =~ m`^w3m/`i); |
Line 277 $maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING}) |
|
Line 302 $maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING}) |
|
@stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag); |
@stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag); |
|
|
if (-f $config) { |
if (-f $config) { |
do $config |
require $config |
|| &fatal("500 Internal Error", |
|| &fatal("500 Internal Error", |
sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>', |
sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>', |
$config, &htmlify($@))); |
$config, &htmlify($@))); |
} else { |
} else { |
&fatal("500 Internal Error", |
&fatal("500 Internal Error", |
'Configuration not found. Set the variable <code>$config</code> ' |
'Configuration not found. Set the variable <code>$config</code> ' |
. 'in cvsweb.cgi, or the environment variable ' |
. 'in cvsweb.cgi to your <b>cvsweb.conf</b> configuration file first.'); |
. '<code>CVSWEB_CONFIG</code>, to your <b>cvsweb.conf</b> ' |
|
. 'configuration file first.'); |
|
} |
} |
|
|
undef %input; |
undef %input; |
Line 294 $query = $ENV{QUERY_STRING}; |
|
Line 317 $query = $ENV{QUERY_STRING}; |
|
|
|
if (defined($query) && $query ne '') { |
if (defined($query) && $query ne '') { |
foreach (split(/&/, $query)) { |
foreach (split(/&/, $query)) { |
|
y/+/ /; |
s/%(..)/sprintf("%c", hex($1))/ge; # unquote %-quoted |
s/%(..)/sprintf("%c", hex($1))/ge; # unquote %-quoted |
if (/(\S+)=(.*)/) { |
if (/(\S+)=(.*)/) { |
$input{$1} = $2 if ($2 ne ""); |
$input{$1} = $2 if ($2 ne ""); |
|
|
} |
} |
undef @barequery; |
undef @barequery; |
|
|
|
if (defined($input{path})) { |
|
redirect("$scriptname/$input{path}$query"); |
|
} |
|
|
# get actual parameters |
# get actual parameters |
$sortby = $input{"sortby"}; |
$sortby = $input{"sortby"}; |
$bydate = 0; |
$bydate = 0; |
Line 379 $defaultDiffType = $input{'f'}; |
|
Line 407 $defaultDiffType = $input{'f'}; |
|
|
|
$logsort = $input{'logsort'}; |
$logsort = $input{'logsort'}; |
|
|
|
my @tmp = @CVSrepositories; |
|
my @pair; |
|
|
|
while (@pair = splice(@tmp, 0, 2)) { |
|
my($key, $val) = @pair; |
|
my($descr, $cvsroot) = @$val; |
|
|
|
next if !-d $cvsroot; |
|
|
|
$CVSROOTdescr{$key} = $descr; |
|
$CVSROOT{$key} = $cvsroot; |
|
push @CVSROOT, $key; |
|
} |
|
undef @tmp; |
|
undef @pair; |
|
|
## Default CVS-Tree |
## Default CVS-Tree |
if (!defined($CVSROOT{$cvstreedefault})) { |
if (!defined($CVSROOT{$cvstreedefault})) { |
&fatal("500 Internal Error", |
&fatal("500 Internal Error", |
Line 404 foreach $k (keys %ICONS) { |
|
Line 447 foreach $k (keys %ICONS) { |
|
my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}}; |
my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}}; |
if ($ipath) { |
if ($ipath) { |
${"${k}icon"} = sprintf('<IMG SRC="%s" ALT="%s" BORDER="0" WIDTH="%d" HEIGHT="%d">', |
${"${k}icon"} = sprintf('<IMG SRC="%s" ALT="%s" BORDER="0" WIDTH="%d" HEIGHT="%d">', |
htmlquote($ipath), htmlquote($itxt), $iwidth, $iheight) |
hrefquote($ipath), htmlquote($itxt), $iwidth, $iheight) |
} |
} |
else { |
else { |
${"${k}icon"} = $itxt; |
${"${k}icon"} = $itxt; |
Line 416 my $config_cvstree = "$config-$cvstree"; |
|
Line 459 my $config_cvstree = "$config-$cvstree"; |
|
|
|
# Do some special configuration for cvstrees |
# Do some special configuration for cvstrees |
if (-f $config_cvstree) { |
if (-f $config_cvstree) { |
do $config_cvstree |
require $config_cvstree |
|| &fatal("500 Internal Error", |
|| &fatal("500 Internal Error", |
sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>', |
sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>', |
$config_cvstree, &htmlify($@))); |
$config_cvstree, &htmlify($@))); |
} |
} |
undef $config_cvstree; |
undef $config_cvstree; |
|
|
$prcategories = '(?:' . join('|', @prcategories) . ')'; |
$re_prcategories = '(?:' . join('|', @prcategories) . ')' if @prcategories; |
|
$re_prkeyword = quotemeta($prkeyword) if defined($prkeyword); |
$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/; |
$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/; |
|
|
$fullname = $cvsroot . '/' . $where; |
$fullname = "$cvsroot/$where"; |
$mimetype = &getMimeTypeFromSuffix ($fullname); |
$mimetype = &getMimeTypeFromSuffix ($fullname); |
$defaultTextPlain = ($mimetype eq "text/plain"); |
$defaultTextPlain = ($mimetype eq "text/plain"); |
$defaultViewable = $allow_markup && viewable($mimetype); |
$defaultViewable = $allow_markup && viewable($mimetype); |
|
|
# search for GZIP if compression allowed |
my $rewrite = 0; |
# We've to find out if the GZIP-binary exists .. otherwise |
|
# ge get an Internal Server Error if we try to pipe the |
if ($pathinfo =~ m|//|) { |
# output through the nonexistent gzip .. |
$pathinfo =~ y|/|/|s; |
# any more elegant ways to prevent this are welcome! |
$rewrite = 1; |
if ($allow_compress && $maycompress && !$has_zlib) { |
|
foreach (split(/:/, $ENV{PATH})) { |
|
if (-x "$_/gzip") { |
|
$GZIPBIN = "$_/gzip"; |
|
last; |
|
} |
|
} |
|
} |
} |
|
|
if (-d $fullname) { |
if (-d $fullname && $pathinfo !~ m|/$|) { |
# |
$pathinfo .= '/'; |
# ensure, that directories always end with (exactly) one '/' |
$rewrite = 1; |
# to allow relative URL's. If they're not, make a redirect. |
|
## |
|
if (!($pathinfo =~ m|/$|) || ($pathinfo =~ m |/{2,}$|)) { |
|
redirect ($scriptwhere . '/' . $query); |
|
} |
|
else { |
|
$where .= '/'; |
|
$scriptwhere .= '/'; |
|
} |
|
} |
} |
|
|
|
if (!-d $fullname && $pathinfo =~ m|/$|) { |
|
chop $pathinfo; |
|
$rewrite = 1; |
|
} |
|
|
|
if ($rewrite) { |
|
redirect($scriptname . urlencode($pathinfo) . $query); |
|
} |
|
|
|
undef $rewrite; |
|
|
if (!-d $cvsroot) { |
if (!-d $cvsroot) { |
&fatal("500 Internal Error",'$CVSROOT not found!<P>The server on which the CVS tree lives is probably down. Please try again in a few minutes.'); |
&fatal("500 Internal Error",'$CVSROOT not found!<P>The server on which the CVS tree lives is probably down. Please try again in a few minutes.'); |
} |
} |
|
|
if ($module && &forbidden_module($module)) { |
if ($module && &forbidden_module($module)) { |
&fatal("403 Forbidden", "Access to $where forbidden."); |
&fatal("403 Forbidden", "Access to $where forbidden."); |
} |
} |
|
|
|
# |
|
# Handle tarball downloads before any headers are output. |
|
# |
|
if ($input{tarball}) { |
|
&fatal("403 Forbidden", "Downloading tarballs is prohibited.") |
|
unless $allow_tar; |
|
my($module) = ($where =~ m,^/?(.*),); # untaint |
|
$module =~ s,/[^/]*$,,; |
|
my($basedir) = ($module =~ m,([^/]+)$,); |
|
|
|
if ($basedir eq '' || $module eq '') { |
|
&fatal("500 Internal Error", "You cannot download the top level directory."); |
|
} |
|
|
|
my $tmpdir = "/tmp/.cvsweb.$$." . int(time); |
|
|
|
mkdir($tmpdir, 0700) |
|
or &fatal("500 Internal Error", "Unable to make temporary directory: $!"); |
|
|
|
my $fatal = ''; |
|
|
|
while (1) { |
|
my $tag = (exists $input{only_with_tag} && length $input{only_with_tag}) |
|
? $input{only_with_tag} : "HEAD"; |
|
|
|
system $CMD{cvs}, @cvs_options, '-Qd', $cvsroot, 'export', '-r', $tag, '-d', "$tmpdir/$basedir", $module |
|
and $fatal = "500 Internal Error","cvs co failure: $!: $module" |
|
&& last; |
|
|
|
$| = 1; # Essential to get the buffering right. |
|
|
|
print "Content-type: application/x-gzip\r\n\r\n"; |
|
|
|
system "$CMD{tar} @tar_options -cf - -C $tmpdir $basedir | $CMD{gzip} @gzip_options -c" |
|
and $fatal = "500 Internal Error","tar zc failure: $!: $basedir" |
|
&& last; |
|
|
|
last; |
|
} |
|
|
|
system $CMD{rm}, '-rf', $tmpdir if -d $tmpdir; |
|
|
|
&fatal($fatal) if $fatal; |
|
|
|
exit; |
|
} |
|
|
############################## |
############################## |
# View a directory |
# View a directory |
############################### |
############################### |
elsif (-d $fullname) { |
if (-d $fullname) { |
my $dh = do {local(*DH);}; |
my $dh = do {local(*DH);}; |
opendir($dh, $fullname) || &fatal("404 Not Found","$where: $!"); |
opendir($dh, $fullname) || &fatal("404 Not Found","$where: $!"); |
my @dir = readdir($dh); |
my @dir = readdir($dh); |
Line 649 elsif (-d $fullname) { |
|
Line 736 elsif (-d $fullname) { |
|
|
|
if ($_ eq '..' || -d "$fullname/$_") { |
if ($_ eq '..' || -d "$fullname/$_") { |
next if ($_ eq '..' && $where eq '/'); |
next if ($_ eq '..' && $where eq '/'); |
my ($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}} |
my ($rev,$date,$log,$author,$filename); |
|
($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}} |
if (defined($fileinfo{$_})); |
if (defined($fileinfo{$_})); |
printf '<tr bgcolor="%s"><td>', $tabcolors[$dirrow % 2] if $dirtable; |
printf '<tr bgcolor="%s"><td>', $tabcolors[$dirrow % 2] if $dirtable; |
if ($_ eq '..') { |
if ($_ eq '..') { |
Line 663 elsif (-d $fullname) { |
|
Line 751 elsif (-d $fullname) { |
|
print " ", &link("Previous Directory", $url); |
print " ", &link("Previous Directory", $url); |
} |
} |
else { |
else { |
$url = urlencode($_) . "/$query"; |
$url = './' . urlencode($_) . "/$query"; |
print "<A NAME=\"$_\"></A>"; |
print "<A NAME=\"$_\"></A>"; |
if ($nofilelinks) { |
if ($nofilelinks) { |
print $diricon; |
print $diricon; |
Line 726 elsif (-d $fullname) { |
|
Line 814 elsif (-d $fullname) { |
|
} |
} |
elsif (s/,v$//) { |
elsif (s/,v$//) { |
$fileurl = ($attic ? "Attic/" : "") . urlencode($_); |
$fileurl = ($attic ? "Attic/" : "") . urlencode($_); |
$url = $fileurl . $query; |
$url = './' . $fileurl . $query; |
my $rev = ''; |
my $rev = ''; |
my $date = ''; |
my $date = ''; |
my $log = ''; |
my $log = ''; |
Line 809 elsif (-d $fullname) { |
|
Line 897 elsif (-d $fullname) { |
|
">$tag\n"; |
">$tag\n"; |
} |
} |
print "</SELECT>\n"; |
print "</SELECT>\n"; |
|
print " Module path or alias:\n"; |
|
printf "<INPUT TYPE=TEXT NAME=\"path\" VALUE=\"%s\" SIZE=15>\n", htmlquote($where); |
print "<INPUT TYPE=SUBMIT VALUE=\"Go\">\n"; |
print "<INPUT TYPE=SUBMIT VALUE=\"Go\">\n"; |
print "</FORM>\n"; |
print "</FORM>\n"; |
} |
} |
|
|
|
if ($allow_tar) { |
|
my($basefile) = ($where =~ m,(?:.*/)?([^/]+),); |
|
|
|
if (defined($basefile) && $basefile ne '') { |
|
print "<HR NOSHADE>\n", |
|
"<DIV align=center>", |
|
&link("Download this directory in tarball", |
|
# Mangle the filename so browsers show a reasonable |
|
# filename to download. |
|
"./$basefile.tar.gz$query". |
|
($query ? "&" : "?")."tarball=1"), |
|
"</DIV>"; |
|
} |
|
} |
|
|
my $formwhere = $scriptwhere; |
my $formwhere = $scriptwhere; |
$formwhere =~ s|Attic/?$|| if ($input{'hideattic'}); |
$formwhere =~ s|Attic/?$|| if ($input{'hideattic'}); |
|
|
Line 895 elsif (-d $fullname) { |
|
Line 1001 elsif (-d $fullname) { |
|
# The file has been removed and is in the Attic. |
# The file has been removed and is in the Attic. |
# Send a redirect pointing to the file in the Attic. |
# Send a redirect pointing to the file in the Attic. |
(my $newplace = $scriptwhere) =~ s|/([^/]+)$|/Attic/$1|; |
(my $newplace = $scriptwhere) =~ s|/([^/]+)$|/Attic/$1|; |
&redirect($newplace); |
redirect("$newplace$query"); |
exit; |
exit; |
} |
} |
elsif (0 && (my @files = &safeglob($fullname . ",v"))) { |
elsif (0 && (my @files = &safeglob($fullname . ",v"))) { |
Line 909 elsif (-d $fullname) { |
|
Line 1015 elsif (-d $fullname) { |
|
my $fh = do {local(*FH);}; |
my $fh = do {local(*FH);}; |
my ($xtra, $module); |
my ($xtra, $module); |
# Assume it's a module name with a potential path following it. |
# Assume it's a module name with a potential path following it. |
$xtra = $& if (($module = $where) =~ s|/.*||); |
$xtra = (($module = $where) =~ s|/.*||) ? $& : ''; |
# Is there an indexed version of modules? |
# Is there an indexed version of modules? |
if (open($fh, "$cvsroot/CVSROOT/modules")) { |
if (open($fh, "< $cvsroot/CVSROOT/modules")) { |
while (<$fh>) { |
while (<$fh>) { |
if (/^(\S+)\s+(\S+)/o && $module eq $1 |
if (/^(\S+)\s+(\S+)/o && $module eq $1 |
&& -d "${cvsroot}/$2" && $module ne $2) { |
&& -d "$cvsroot/$2" && $module ne $2) { |
&redirect($scriptname . '/' . $2 . $xtra); |
redirect("$scriptname/$2$xtra$query"); |
} |
} |
} |
} |
} |
} |
Line 1036 sub htmlify($;$) { |
|
Line 1142 sub htmlify($;$) { |
|
|
|
if ($extra) { |
if ($extra) { |
# get PR #'s as link: "PR#nnnn" "PR: nnnn, ..." "PR nnnn, ..." "bin/nnnn" |
# get PR #'s as link: "PR#nnnn" "PR: nnnn, ..." "PR nnnn, ..." "bin/nnnn" |
if (defined($prcgi)) { |
if (defined($prcgi) && defined($re_prcategories) && defined($re_prkeyword)) { |
my $prev; |
my $prev; |
|
|
do { |
do { |
Line 1044 sub htmlify($;$) { |
|
Line 1150 sub htmlify($;$) { |
|
|
|
$_ = htmlify_sub { |
$_ = htmlify_sub { |
s{ |
s{ |
(\bPR[:\#]?\s* |
(\b$re_prkeyword[:\#]?\s* |
(?: |
(?: |
\#? |
\#? |
\d+[,\s]\s* |
\d+[,\s]\s* |
Line 1052 sub htmlify($;$) { |
|
Line 1158 sub htmlify($;$) { |
|
\#?) |
\#?) |
(\d+)\b |
(\d+)\b |
}{ |
}{ |
$1 . &link($2, sprintf($prcgi, $2)) . $3 |
$1 . &link($2, sprintf($prcgi, $2)) |
}egix; |
}egix; |
} $_; |
} $_; |
} while ($_ ne $prev); |
} while ($_ ne $prev); |
|
|
$_ = htmlify_sub { |
$_ = htmlify_sub { |
s{ |
s{ |
(\b$prcategories/(\d+)\b) |
(\b$re_prcategories/(\d+)\b) |
}{ |
}{ |
&link($1, sprintf($prcgi, $2)) . $3 |
&link($1, sprintf($prcgi, $2)) |
}egox; |
}egox; |
} $_; |
} $_; |
} |
} |
Line 1070 sub htmlify($;$) { |
|
Line 1176 sub htmlify($;$) { |
|
if (defined($mancgi)) { |
if (defined($mancgi)) { |
$_ = htmlify_sub { |
$_ = htmlify_sub { |
s{ |
s{ |
(\b([a-zA-Z][\w_.]+) |
(\b([a-zA-Z][\w.]+) |
(?: |
(?: |
\( ([0-9n]) \)\B |
\( ([0-9n]) \)\B |
| |
| |
Line 1078 sub htmlify($;$) { |
|
Line 1184 sub htmlify($;$) { |
|
) |
) |
) |
) |
}{ |
}{ |
&link($1, sprintf($mancgi, $3 ne '' ? $3 : $4, $2)) . $5 |
&link($1, sprintf($mancgi, defined($3) ? $3 : $4, $2)) |
}egx; |
}egx; |
} $_; |
} $_; |
} |
} |
Line 1118 sub spacedHtmlText($;$) { |
|
Line 1224 sub spacedHtmlText($;$) { |
|
} |
} |
|
|
sub link($$) { |
sub link($$) { |
my($name, $where) = @_; |
my($name, $url) = @_; |
|
|
sprintf '<A HREF="%s">%s</A>', htmlquote($where), $name; |
$url =~ s/:/sprintf("%%%02x", ord($&))/eg if $url =~ /^[^a-z]/; # relative |
|
|
|
sprintf '<A HREF="%s">%s</A>', hrefquote($url), $name; |
} |
} |
|
|
sub revcmp($$) { |
sub revcmp($$) { |
Line 1197 sub safeglob($) { |
|
Line 1305 sub safeglob($) { |
|
push(@results, "$dirname/" .$_); |
push(@results, "$dirname/" .$_); |
} |
} |
} |
} |
|
closedir($dh); |
} |
} |
|
|
@results; |
@results; |
} |
} |
|
|
|
sub search_path($) { |
|
my($command) = @_; |
|
my $d; |
|
|
|
for $d (split(/:/, $command_path)) { |
|
return "$d/$command" if -x "$d/$command"; |
|
} |
|
|
|
$command; |
|
} |
|
|
sub getMimeTypeFromSuffix($) { |
sub getMimeTypeFromSuffix($) { |
my ($fullname) = @_; |
my ($fullname) = @_; |
my ($mimetype, $suffix); |
my ($mimetype, $suffix); |
Line 1275 sub doAnnotate($$) { |
|
Line 1395 sub doAnnotate($$) { |
|
my $reader = do {local(*FH);}; |
my $reader = do {local(*FH);}; |
my $writer = do {local(*FH);}; |
my $writer = do {local(*FH);}; |
|
|
# make sure the revisions a wellformed, for security |
# make sure the revisions are wellformed, for security |
# reasons .. |
# reasons .. |
if ($rev =~ /[^\w.]/) { |
if ($rev =~ /[^\w.]/) { |
&fatal("404 Not Found", |
&fatal("404 Not Found", |
Line 1294 sub doAnnotate($$) { |
|
Line 1414 sub doAnnotate($$) { |
|
# the public domain. |
# the public domain. |
# we could abandon the use of rlog, rcsdiff and co using |
# we could abandon the use of rlog, rcsdiff and co using |
# the cvsserver in a similiar way one day (..after rewrite) |
# the cvsserver in a similiar way one day (..after rewrite) |
$pid = open2($reader, $writer, "cvs -Rl server") || fatal ("500 Internal Error", |
$pid = open2($reader, $writer, $CMD{cvs}, @cvs_options, "server") |
"Fatal Error - unable to open cvs for annotation"); |
|| fatal ("500 Internal Error", "Fatal Error - unable to open cvs for annotation"); |
|
|
# OK, first send the request to the server. A simplified example is: |
# OK, first send the request to the server. A simplified example is: |
# Root /home/kingdon/zwork/cvsroot |
# Root /home/kingdon/zwork/cvsroot |
Line 1486 sub doCheckout($$) { |
|
Line 1606 sub doCheckout($$) { |
|
# |
# |
# Safely for a child process to read from. |
# Safely for a child process to read from. |
if (! open($fh, "-|")) { # child |
if (! open($fh, "-|")) { # child |
open(STDERR, ">&STDOUT"); # Redirect stderr to stdout |
open(STDERR, ">&STDOUT"); # Redirect stderr to stdout |
exec("cvs", "-Rld", $cvsroot, "co", "-p", $revopt, $where); |
exec($CMD{cvs}, @cvs_options, '-d', $cvsroot, 'co', '-p', $revopt, $where); |
} |
} |
|
|
|
if (eof($fh)) { |
|
&fatal("404 Not Found", |
|
"$where is not (any longer) pertinent"); |
|
} |
#=================================================================== |
#=================================================================== |
#Checking out squid/src/ftp.c |
#Checking out squid/src/ftp.c |
#RCS: /usr/src/CVS/squid/src/ftp.c,v |
#RCS: /usr/src/CVS/squid/src/ftp.c,v |
Line 1508 sub doCheckout($$) { |
|
Line 1633 sub doCheckout($$) { |
|
} |
} |
if ($filename ne $where) { |
if ($filename ne $where) { |
&fatal("500 Internal Error", |
&fatal("500 Internal Error", |
"Unexpected output from cvs co: $cvsheader" |
"Unexpected output from cvs co: $cvsheader"); |
. "<p><b>Check whether the directory $cvsroot/CVSROOT exists " |
|
. "and the script has write-access to the CVSROOT/history " |
|
. "file if it exists." |
|
. "<br>The script needs to place lock files in the " |
|
. "directory the file is in as well.</b>"); |
|
} |
} |
$| = 1; |
$| = 1; |
|
|
Line 1564 sub cvswebMarkup($$$) { |
|
Line 1684 sub cvswebMarkup($$$) { |
|
my $url = download_url($fileurl, $revision, $mimetype); |
my $url = download_url($fileurl, $revision, $mimetype); |
print "<HR noshade>"; |
print "<HR noshade>"; |
if ($mimetype =~ /^image/) { |
if ($mimetype =~ /^image/) { |
printf '<IMG SRC="%s"><BR>', htmlquote("$url$barequery"); |
printf '<IMG SRC="%s"><BR>', hrefquote("$url$barequery"); |
} |
} |
elsif ($mimetype =~ m%^application/pdf%) { |
elsif ($mimetype =~ m%^application/pdf%) { |
printf '<EMBED SRC="%s" WIDTH="100%"><BR>', htmlquote("$url$barequery"); |
printf '<EMBED SRC="%s" WIDTH="100%"><BR>', hrefquote("$url$barequery"); |
} |
} |
else { |
elsif ($preformat_in_markup) { |
print "<PRE>"; |
print "<PRE>"; |
|
|
# prefetch several lines |
# prefetch several lines |
Line 1584 sub cvswebMarkup($$$) { |
|
Line 1704 sub cvswebMarkup($$$) { |
|
} |
} |
print "</PRE>"; |
print "</PRE>"; |
} |
} |
|
else { |
|
print "<PRE>"; |
|
while (<$filehandle>) { |
|
print htmlquote($_); |
|
} |
|
print "</PRE>"; |
|
} |
} |
} |
|
|
sub viewable($) { |
sub viewable($) { |
Line 1664 sub doDiff($$$$$$) { |
|
Line 1791 sub doDiff($$$$$$) { |
|
} |
} |
if (! open($fh, "-|")) { # child |
if (! open($fh, "-|")) { # child |
open(STDERR, ">&STDOUT"); # Redirect stderr to stdout |
open(STDERR, ">&STDOUT"); # Redirect stderr to stdout |
exec("rcsdiff",@difftype,"-r$rev1","-r$rev2",$fullname); |
exec($CMD{rcsdiff}, @difftype, "-r$rev1", "-r$rev2", $fullname); |
} |
} |
if ($human_readable) { |
if ($human_readable) { |
http_header(); |
http_header(); |
Line 1745 sub getDirLogs($$@) { |
|
Line 1872 sub getDirLogs($$@) { |
|
return; |
return; |
} |
} |
|
|
if ($tag) { |
if (defined($tag)) { |
#can't use -r<tag> as - is allowed in tagnames, but misinterpreated by rlog.. |
#can't use -r<tag> as - is allowed in tagnames, but misinterpreated by rlog.. |
if (! open($fh, "-|")) { |
if (! open($fh, "-|")) { |
open(STDERR, '>/dev/null'); # rlog may complain; ignore. |
open(STDERR, '>/dev/null'); # rlog may complain; ignore. |
exec('rlog', @files); |
exec($CMD{rlog}, @files); |
} |
} |
} |
} |
else { |
else { |
my $kidpid = open($fh, "-|"); |
if (! open($fh, "-|")) { |
if (! $kidpid) { |
open(STDERR, '>/dev/null'); # rlog may complain; ignore. |
open(STDERR, '>/dev/null'); # rlog may complain; ignore. |
exec($CMD{rlog}, '-r', @files); |
exec('rlog', '-r', @files); |
|
} |
} |
} |
} |
$state = "start"; |
$state = "start"; |
while (<$fh>) { |
while (<$fh>) { |
if ($state eq "start") { |
if ($state eq "start") { |
#Next file. Initialize file variables |
#Next file. Initialize file variables |
$rev = undef; |
$rev = ''; |
$revwanted = undef; |
$revwanted = ''; |
$branch = undef; |
$branch = ''; |
$branchpoint = undef; |
$branchpoint = ''; |
$filename = undef; |
$filename = ''; |
$log = undef; |
$log = ''; |
$revision = undef; |
$revision = ''; |
$branch = undef; |
|
%symrev = (); |
%symrev = (); |
@filetags = (); |
@filetags = (); |
#jump to head state |
#jump to head state |
Line 1780 sub getDirLogs($$@) { |
|
Line 1905 sub getDirLogs($$@) { |
|
again: |
again: |
if ($state eq "head") { |
if ($state eq "head") { |
#$rcsfile = $1 if (/^RCS file: (.+)$/); #not used (yet) |
#$rcsfile = $1 if (/^RCS file: (.+)$/); #not used (yet) |
$filename = $1 if (/^Working file: (.+)$/); |
|
$head = $1 if (/^head: (.+)$/); |
if (/^Working file: (.+)$/) { |
$branch = $1 if (/^branch: (.+)$/); |
$filename = $1; |
} |
} elsif (/^head: (.+)$/) { |
if ($state eq "head" && /^symbolic names/) { |
$head = $1; |
$state = "tags"; |
} elsif (/^branch: (.+)$/) { |
($branch = $head) =~ s/\.\d+$// if (!defined($branch)); |
$branch = $1 |
$branch =~ s/(\.?)(\d+)$/${1}0.$2/; |
} elsif (/^symbolic names:/) { |
$symrev{MAIN} = $branch; |
$state = "tags"; |
$symrev{HEAD} = $branch; |
($branch = $head) =~ s/\.\d+$// if $branch eq ''; |
$alltags{MAIN} = 1; |
$branch =~ s/(\d+)$/0.$1/; |
$alltags{HEAD} = 1; |
$symrev{MAIN} = $branch; |
push (@filetags, "MAIN", "HEAD"); |
$symrev{HEAD} = $branch; |
|
$alltags{MAIN} = 1; |
|
$alltags{HEAD} = 1; |
|
push (@filetags, "MAIN", "HEAD"); |
|
} elsif (/$LOG_REVSEPARATOR/o) { |
|
$state = "log"; |
|
$rev = ''; |
|
$date = ''; |
|
$log = ''; |
|
# Try to reconstruct the relative filename if RCS spits out a full path |
|
$filename =~ s%^\Q$DirName\E/%%; |
|
} |
next; |
next; |
} |
} |
if ($state eq "tags" && |
if ($state eq "tags") { |
/^\s+(.+):\s+([\d\.]+)\s+$/) { |
if (/^\s+(.+):\s+([\d\.]+)\s+$/) { |
push (@filetags, $1); |
push (@filetags, $1); |
$symrev{$1} = $2; |
$symrev{$1} = $2; |
$alltags{$1} = 1; |
$alltags{$1} = 1; |
next; |
|
} |
|
if ($state eq "tags" && /^\S/) { |
|
if (defined($tag) && (defined($symrev{$tag}) || $tag eq "HEAD")) { |
|
$revwanted = $tag eq "HEAD" ? $symrev{"MAIN"} : $symrev{$tag}; |
|
($branch = $revwanted) =~ s/\.0\././; |
|
($branchpoint = $branch) =~ s/\.?\d+$//; |
|
$revwanted = undef if ($revwanted ne $branch); |
|
} |
|
elsif (defined($tag) && $tag ne "HEAD") { |
|
print "Tag not found, skip this file" if ($verbose); |
|
$state = "skip"; |
|
next; |
next; |
|
} elsif (/^\S/) { |
|
if (defined($tag)) { |
|
if(defined($symrev{$tag}) || $tag eq "HEAD") { |
|
$revwanted = $symrev{$tag eq "HEAD" ? "MAIN" : $tag}; |
|
($branch = $revwanted) =~ s/\b0\.//; |
|
($branchpoint = $branch) =~ s/\.?\d+$//; |
|
$revwanted = '' if ($revwanted ne $branch); |
|
} elsif ($tag ne "HEAD") { |
|
print "Tag not found, skip this file" if ($verbose); |
|
$state = "skip"; |
|
next; |
|
} |
|
} |
|
foreach my $tagfound (@filetags) { |
|
$tags{$tagfound} = 1; |
|
} |
|
$state = "head"; |
|
goto again; |
} |
} |
foreach my $tagfound (@filetags) { |
|
$tags{$tagfound} = 1; |
|
} |
|
$state = "head"; |
|
goto again; |
|
} |
} |
if ($state eq "head" && /$LOG_REVSEPARATOR/o) { |
|
$state = "log"; |
|
$rev = undef; |
|
$date = undef; |
|
$log = ""; |
|
# Try to reconstruct the relative filename if RCS spits out a full path |
|
$filename =~ s%^\Q$DirName\E/%%; |
|
next; |
|
} |
|
if ($state eq "log") { |
if ($state eq "log") { |
if (/$LOG_REVSEPARATOR/o || /$LOG_FILESEPARATOR/o) { |
if (/$LOG_REVSEPARATOR/o || /$LOG_FILESEPARATOR/o) { |
# End of a log entry. |
# End of a log entry. |
my $revbranch; |
my $revbranch = $rev; |
($revbranch = $rev) =~ s/\.\d+$//; |
$revbranch =~ s/\.\d+$//; |
print "$filename $rev Wanted: $revwanted ", |
print "$filename $rev Wanted: $revwanted ", |
"Revbranch: $revbranch Branch: $branch ", |
"Revbranch: $revbranch Branch: $branch ", |
"Branchpoint: $branchpoint\n" if ($verbose); |
"Branchpoint: $branchpoint\n" if ($verbose); |
if (!defined($revwanted) && defined($branch) |
if ($revwanted eq '' && $branch ne '' |
&& $branch eq $revbranch || !defined($tag)) { |
&& $branch eq $revbranch || !defined($tag)) { |
print "File revision $rev found for branch $branch\n" |
print "File revision $rev found for branch $branch\n" |
if ($verbose); |
if ($verbose); |
$revwanted = $rev; |
$revwanted = $rev; |
} |
} |
if (defined($revwanted) ? $rev eq $revwanted : |
if ($revwanted ne '' ? $rev eq $revwanted : |
defined($branchpoint) ? $rev eq $branchpoint : |
$branchpoint ne '' ? $rev eq $branchpoint : |
0 && ($rev eq $head)) { # Don't think head is needed here.. |
0 && ($rev eq $head)) { # Don't think head is needed here.. |
print "File info $rev found for $filename\n" if ($verbose); |
print "File info $rev found for $filename\n" if ($verbose); |
my @finfo = ($rev,$date,$log,$author,$filename); |
my @finfo = ($rev,$date,$log,$author,$filename); |
|
|
$fileinfo{$name} = [ @finfo ]; |
$fileinfo{$name} = [ @finfo ]; |
$state = "done" if ($rev eq $revwanted); |
$state = "done" if ($rev eq $revwanted); |
} |
} |
$rev = undef; |
$rev = ''; |
$date = undef; |
$date = ''; |
$log = ""; |
$log = ''; |
} |
} |
elsif (!defined($date) && m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);|) { |
elsif ($date eq '' && m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);|) { |
my $yr = $1; |
my $yr = $1; |
# damn 2-digit year routines :-) |
# damn 2-digit year routines :-) |
if ($yr > 100) { |
if ($yr > 100) { |
|
|
$log = ''; |
$log = ''; |
next; |
next; |
} |
} |
elsif (!defined($rev) && m/^revision (.*)$/) { |
elsif ($rev eq '' && /^revision (.*)$/) { |
$rev = $1; |
$rev = $1; |
next; |
next; |
} |
} |
|
|
} |
} |
if ($. == 0) { |
if ($. == 0) { |
fatal("500 Internal Error", |
fatal("500 Internal Error", |
"Failed to spawn GNU rlog on <em>'".join(", ", @files)."'</em><p>did you set the <b>\$ENV{PATH}</b> in your configuration file correctly ?"); |
"Failed to spawn GNU rlog on <em>'".join(", ", @files)."'</em><p>Did you set the <b>\$command_path</b> in your configuration file correctly ? (Currently '$command_path'"); |
} |
} |
close($fh); |
close($fh); |
} |
} |
Line 1912 sub readLog($;$) { |
|
Line 2040 sub readLog($;$) { |
|
|
|
print("Going to rlog '$fullname'\n") if ($verbose); |
print("Going to rlog '$fullname'\n") if ($verbose); |
if (! open($fh, "-|")) { # child |
if (! open($fh, "-|")) { # child |
if ($revision ne '') { |
if ($revision ne '') { |
exec("rlog",$revision,$fullname); |
exec($CMD{rlog}, $revision, $fullname); |
} |
} |
else { |
else { |
exec("rlog",$fullname); |
exec($CMD{rlog}, $fullname); |
} |
} |
} |
} |
while (<$fh>) { |
while (<$fh>) { |
print if ($verbose); |
print if ($verbose); |
Line 2011 sub readLog($;$) { |
|
Line 2139 sub readLog($;$) { |
|
# is the first commit listed on the appropriate branch. |
# is the first commit listed on the appropriate branch. |
# This is not neccesary the same revision as marked as head in the RCS file. |
# This is not neccesary the same revision as marked as head in the RCS file. |
my $headrev = $curbranch || "1"; |
my $headrev = $curbranch || "1"; |
($symrev{"MAIN"} = $headrev) =~ s/(\.?)(\d+)$/${1}0.$2/; |
($symrev{"MAIN"} = $headrev) =~ s/(\d+)$/0.$1/; |
revision: |
|
foreach $rev (@revorder) { |
foreach $rev (@revorder) { |
if ($rev =~ /^(\S*)\.\d+$/ && $headrev eq $1) { |
if ($rev =~ /^(\S*)\.\d+$/ && $headrev eq $1) { |
$symrev{"HEAD"} = $rev; |
$symrev{"HEAD"} = $rev; |
last revision; |
last; |
} |
} |
} |
} |
($symrev{"HEAD"} = $headrev) =~ s/\.\d+$// |
($symrev{"HEAD"} = $headrev) =~ s/\.\d+$// |
Line 2034 sub readLog($;$) { |
|
Line 2161 sub readLog($;$) { |
|
|
|
foreach (reverse sort keys %symrev) { |
foreach (reverse sort keys %symrev) { |
$rev = $symrev{$_}; |
$rev = $symrev{$_}; |
if ($rev =~ /^((.*)\.)0\.(\d+)$/) { |
if ($rev =~ /^((.*)\.)?\b0\.(\d+)$/) { |
push(@branchnames, $_); |
push(@branchnames, $_); |
# |
# |
# A revision number of A.B.0.D really translates into |
# A revision number of A.B.0.D really translates into |
Line 2048 sub readLog($;$) { |
|
Line 2175 sub readLog($;$) { |
|
# it has no head to translate to if there is nothing on |
# it has no head to translate to if there is nothing on |
# the branch, but I guess this can never happen? |
# the branch, but I guess this can never happen? |
# |
# |
# Since some stupid people actually import/check in |
# (the code below gracefully forgets about the branch |
# files with version 0.X we assume that the above cannot |
# if it should happen) |
# happen, and regard 0.X(.*) as a revision and not a branch. |
|
# |
# |
$head = defined($2) ? $2 : ""; |
$head = defined($2) ? $2 : ""; |
$branch = $3; |
$branch = $3; |
$branchrev = $head . ($head ne "" ? "." : "") . $branch; |
$branchrev = $head . ($head ne "" ? "." : "") . $branch; |
my $regex; |
my $regex; |
($regex = $branchrev) =~ s/\./\\./g; |
$regex = quotemeta $branchrev; |
$rev = $head; |
$rev = $head; |
|
|
revision: |
|
foreach my $r (@revorder) { |
foreach my $r (@revorder) { |
if ($r =~ /^${regex}\b/) { |
if ($r =~ /^${regex}\b/) { |
$rev = $branchrev; |
$rev = $branchrev; |
last revision; |
last; |
} |
} |
} |
} |
next if ($rev eq ""); |
next if ($rev eq ""); |
Line 2081 sub readLog($;$) { |
|
Line 2206 sub readLog($;$) { |
|
my ($onlyonbranch, $onlybranchpoint); |
my ($onlyonbranch, $onlybranchpoint); |
if ($onlyonbranch = $input{'only_with_tag'}) { |
if ($onlyonbranch = $input{'only_with_tag'}) { |
$onlyonbranch = $symrev{$onlyonbranch}; |
$onlyonbranch = $symrev{$onlyonbranch}; |
if ($onlyonbranch =~ s/\.0\././) { |
if ($onlyonbranch =~ s/\b0\.//) { |
($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//; |
($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//; |
} |
} |
else { |
else { |
Line 2280 sub printLog($;$) { |
|
Line 2405 sub printLog($;$) { |
|
if (/^\d+\.\d+\.\d+/ && !/^1\.1\.1\.\d+$/) { |
if (/^\d+\.\d+\.\d+/ && !/^1\.1\.1\.\d+$/) { |
my ($i,$nextmain); |
my ($i,$nextmain); |
for ($i = 0; $i < $#revorder && $revorder[$i] ne $_; $i++){} |
for ($i = 0; $i < $#revorder && $revorder[$i] ne $_; $i++){} |
my (@tmp2) = split(/\./, $_); |
my @tmp2 = split(/\./, $_); |
for ($nextmain = ""; $i > 0; $i--) { |
for ($nextmain = ""; $i > 0; $i--) { |
my ($next) = $revorder[$i-1]; |
my $next = $revorder[$i-1]; |
my (@tmp1) = split(/\./, $next); |
my @tmp1 = split(/\./, $next); |
if ($#tmp1 < $#tmp2) { |
if (@tmp1 < @tmp2) { |
$nextmain = $next; |
$nextmain = $next; |
last; |
last; |
} |
} |
# Only the highest version on a branch should have |
# Only the highest version on a branch should have |
# a diff for the "next main". |
# a diff for the "next main". |
last if (join(".",@tmp1[0..$#tmp1-1]) |
last if (@tmp1 - 1 <= @tmp2 && |
eq join(".",@tmp2[0..$#tmp1-1])); |
join(".",@tmp1[0..$#tmp1-1]) eq join(".",@tmp2[0..$#tmp1-1])); |
} |
} |
if (!defined($diffrev{$nextmain})) { |
if (!defined($diffrev{$nextmain})) { |
$diffrev{$nextmain} = 1; |
$diffrev{$nextmain} = 1; |
Line 2520 sub human_readable_diff($){ |
|
Line 2645 sub human_readable_diff($){ |
|
print "<br>Tag: $sym2\n" if ($sym1); |
print "<br>Tag: $sym2\n" if ($sym1); |
print "</th>\n"; |
print "</th>\n"; |
|
|
my $fs = "<font face=\"$difffontface\" size=\"$difffontsize\">"; |
my $fs = "<font face=\"$difffontface\" size=\"$difffontsize\"><tt>"; |
my $fe = "</font>"; |
my $fe = "</tt></font>"; |
|
|
my $leftRow = 0; |
my $leftRow = 0; |
my $rightRow = 0; |
my $rightRow = 0; |
Line 2637 sub human_readable_diff($){ |
|
Line 2762 sub human_readable_diff($){ |
|
sub navigateHeader($$$$$) { |
sub navigateHeader($$$$$) { |
my ($swhere,$path,$filename,$rev,$title) = @_; |
my ($swhere,$path,$filename,$rev,$title) = @_; |
$swhere = "" if ($swhere eq $scriptwhere); |
$swhere = "" if ($swhere eq $scriptwhere); |
$swhere = urlencode($filename) if ($swhere eq ""); |
$swhere = './', urlencode($filename) if ($swhere eq ""); |
print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">"; |
|
print "<HTML>\n<HEAD>\n"; |
print <<EOF; |
print '<!-- CVSweb $zRevision: 1.104 $ $kRevision: 1.39 $ -->'; |
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> |
print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n"; |
<HTML> |
print "$body_tag_for_src\n"; |
<HEAD> |
print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">"; |
<META name="robots" content="nofollow"> |
print "<tr valign=bottom><td>"; |
<!-- knu-cvsweb $cvsweb_revision --> |
|
<TITLE>$path$filename - $title - $rev</TITLE></HEAD> |
|
$body_tag_for_src |
|
<table width="100%" border=0 cellspacing=0 cellpadding=1 bgcolor="$navigationHeaderColor"> |
|
<tr valign=bottom><td> |
|
EOF |
|
|
print &link($backicon, "$swhere$query#rev$rev"); |
print &link($backicon, "$swhere$query#rev$rev"); |
print "</a> <b>Return to ", &link("$filename","$swhere$query#rev$rev")," CVS log"; |
print "<b>Return to ", &link($filename,"$swhere$query#rev$rev")," CVS log"; |
print "</b> $fileicon</td>"; |
print "</b> $fileicon</td>"; |
|
|
print "<td align=right>$diricon <b>Up to ", &clickablePath($path, 1), "</b></td>"; |
print "<td align=right>$diricon <b>Up to ", &clickablePath($path, 1), "</b></td>"; |
Line 2754 sub clickablePath($$) { |
|
Line 2885 sub clickablePath($$) { |
|
} |
} |
|
|
sub chooseCVSRoot() { |
sub chooseCVSRoot() { |
my @foo; |
if (2 <= @CVSROOT) { |
foreach (sort keys %CVSROOT) { |
|
if (-d $CVSROOT{$_}) { |
|
push(@foo, $_); |
|
} |
|
} |
|
if (@foo > 1) { |
|
my ($k); |
my ($k); |
print "<form method=\"GET\" action=\"${scriptwhere}\">\n"; |
print "<form method=\"GET\" action=\"${scriptwhere}\">\n"; |
foreach $k (keys %input) { |
foreach $k (keys %input) { |
Line 2775 sub chooseCVSRoot() { |
|
Line 2900 sub chooseCVSRoot() { |
|
print "<td>\n<select name=\"cvsroot\""; |
print "<td>\n<select name=\"cvsroot\""; |
print " onchange=\"submit()\"" if ($use_java_script); |
print " onchange=\"submit()\"" if ($use_java_script); |
print ">\n"; |
print ">\n"; |
foreach $k (@foo) { |
foreach $k (@CVSROOT) { |
print "<option value=\"$k\""; |
print "<option value=\"$k\""; |
print " selected" if ($k eq $cvstree); |
print " selected" if ($k eq $cvstree); |
print ">", ($CVSROOTdescr{$k} ? $CVSROOTdescr{$k} : $k), "</option>\n"; |
print ">", ($CVSROOTdescr{$k} ? $CVSROOTdescr{$k} : $k), "</option>\n"; |
} |
} |
print "</select>\n</td>"; |
print "</select>\n</td>"; |
print "<td><input type=submit value=\"Go\"></td>"; |
print "<td>"; |
print "</tr></table></form>"; |
|
} |
} |
else { |
else { |
# no choice .. |
# no choice .. |
print "CVS Root: <b>[$cvstree]</b>"; |
print "CVS Root: <b>[$cvstree]</b>"; |
} |
} |
|
|
|
print " Module path or alias:\n"; |
|
print "<INPUT TYPE=TEXT NAME=\"path\" VALUE=\"\" SIZE=15>\n"; |
|
print "<input type=submit value=\"Go\">"; |
|
|
|
if (2 <= @CVSROOT) { |
|
print "</td></tr></table></form>"; |
|
} |
} |
} |
|
|
sub chooseMirror() { |
sub chooseMirror() { |
Line 2843 sub fileSortCmp() { |
|
Line 2975 sub fileSortCmp() { |
|
sub download_url($$;$) { |
sub download_url($$;$) { |
my ($url,$revision,$mimetype) = @_; |
my ($url,$revision,$mimetype) = @_; |
|
|
$revision =~ s/\.0\././; |
$revision =~ s/\b0\.//; |
|
|
if (defined($checkoutMagic) |
if (defined($checkoutMagic) |
&& (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) { |
&& (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) { |
Line 2863 sub download_link($$$;$) { |
|
Line 2995 sub download_link($$$;$) { |
|
my ($url, $revision, $textlink, $mimetype) = @_; |
my ($url, $revision, $textlink, $mimetype) = @_; |
my ($fullurl) = download_url($url, $revision, $mimetype); |
my ($fullurl) = download_url($url, $revision, $mimetype); |
|
|
printf '<A HREF="%s"', htmlquote("$fullurl$barequery"); |
$fullurl =~ s/:/sprintf("%%%02x", ord($&))/eg; |
|
|
|
printf '<A HREF="%s"', hrefquote("$fullurl$barequery"); |
|
|
if ($open_extern_window && (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) { |
if ($open_extern_window && (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) { |
print ' target="cvs_checkout"'; |
print ' target="cvs_checkout"'; |
# we should have |
# we should have |
Line 2897 sub download_link($$$;$) { |
|
Line 3031 sub download_link($$$;$) { |
|
if (defined($extern_window_height)); |
if (defined($extern_window_height)); |
|
|
printf q` onClick="window.open('%s','cvs_checkout','%s');"`, |
printf q` onClick="window.open('%s','cvs_checkout','%s');"`, |
htmlquote($fullurl), join(',', @attr); |
hrefquote($fullurl), join(',', @attr); |
} |
} |
} |
} |
print "><b>$textlink</b></A>"; |
print "><b>$textlink</b></A>"; |
Line 2937 sub urlencode($) { |
|
Line 3071 sub urlencode($) { |
|
|
|
s/[\000-+{-\377]/sprintf("%%%02x", ord($&))/ge; |
s/[\000-+{-\377]/sprintf("%%%02x", ord($&))/ge; |
|
|
|
$_; |
$_; |
|
} |
} |
|
|
sub htmlquote($) { |
sub htmlquote($) { |
Line 2965 sub htmlunquote($) { |
|
Line 3098 sub htmlunquote($) { |
|
$_; |
$_; |
} |
} |
|
|
|
sub hrefquote($) { |
|
local($_) = @_; |
|
|
|
y/ /+/; |
|
|
|
htmlquote($_) |
|
} |
|
|
sub http_header(;$) { |
sub http_header(;$) { |
my $content_type = shift || "text/html"; |
my $content_type = shift || "text/html"; |
|
|
|
$content_type .= "; charset=$charset" |
|
if $content_type =~ m,^text/, && defined($charset) && $charset; |
|
|
if (defined($moddate)) { |
if (defined($moddate)) { |
if ($is_mod_perl) { |
if ($is_mod_perl) { |
Apache->request->header_out("Last-Modified" => scalar gmtime($moddate) . " GMT"); |
Apache->request->header_out("Last-Modified" => scalar gmtime($moddate) . " GMT"); |
Line 2982 sub http_header(;$) { |
|
Line 3127 sub http_header(;$) { |
|
print "Content-type: $content_type\r\n"; |
print "Content-type: $content_type\r\n"; |
} |
} |
if ($allow_compress && $maycompress) { |
if ($allow_compress && $maycompress) { |
if ($has_zlib || (defined($GZIPBIN) && open(GZIP, "|$GZIPBIN -1 -c"))) { |
if ($has_zlib || (defined($CMD{gzip}) && open(GZIP, "| $CMD{gzip} -1 -c"))) { |
if ($is_mod_perl) { |
if ($is_mod_perl) { |
Apache->request->content_encoding("x-gzip"); |
Apache->request->content_encoding("x-gzip"); |
Apache->request->header_out(Vary => "Accept-Encoding"); |
Apache->request->header_out(Vary => "Accept-Encoding"); |
Line 2999 sub http_header(;$) { |
|
Line 3144 sub http_header(;$) { |
|
} |
} |
select(GZIP); |
select(GZIP); |
$gzip_open = 1; |
$gzip_open = 1; |
# print "<!-- gzipped -->" if ($content_type eq "text/html"); |
# print "<!-- gzipped -->" if ($content_type =~ m|^text/html\b|); |
} |
} |
else { |
else { |
if ($is_mod_perl) { |
if ($is_mod_perl) { |
Line 3008 sub http_header(;$) { |
|
Line 3153 sub http_header(;$) { |
|
else { |
else { |
print "\r\n"; # Close headers |
print "\r\n"; # Close headers |
} |
} |
print "<font size=-1>Unable to find gzip binary in the \$PATH to compress output</font><br>"; |
print "<font size=-1>Unable to find gzip binary in the <b>\$command_path</b> ($command_path) to compress output</font><br>"; |
} |
} |
} |
} |
else { |
else { |
Line 3023 sub http_header(;$) { |
|
Line 3168 sub http_header(;$) { |
|
|
|
sub html_header($) { |
sub html_header($) { |
my ($title) = @_; |
my ($title) = @_; |
my $version = '$zRevision: 1.104 $ $kRevision: 1.39 $'; #' |
http_header("text/html"); |
http_header(); |
|
print <<EOH; |
print <<EOH; |
<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" |
<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" |
"http://www.w3.org/TR/REC-html40/loose.dtd"> |
"http://www.w3.org/TR/REC-html40/loose.dtd"> |
<html> |
<html> |
|
<head> |
|
<meta name="robots" content="nofollow"> |
<title>$title</title> |
<title>$title</title> |
<!-- CVSweb $version --> |
<!-- knu-cvsweb $cvsweb_revision --> |
</head> |
</head> |
$body_tag |
$body_tag |
$logo <h1 align="center">$title</h1> |
$logo <h1 align="center">$title</h1> |
Line 3047 sub link_tags($) { |
|
Line 3193 sub link_tags($) { |
|
my ($fileurl,$filename); |
my ($fileurl,$filename); |
|
|
($filename = $where) =~ s/^.*\///; |
($filename = $where) =~ s/^.*\///; |
$fileurl = urlencode($filename); |
$fileurl = './' . urlencode($filename); |
|
|
foreach my $sym (split(", ", $tags)) { |
foreach my $sym (split(", ", $tags)) { |
$ret .= ",\n" if ($ret ne ""); |
$ret .= ",\n" if ($ret ne ""); |