version 1.1.1.13, 2000/12/07 12:45:50 |
version 1.1.1.19, 2001/01/02 12:41:38 |
|
|
#!/usr/bin/perl5 -ws |
#!/usr/bin/perl -wT |
# |
# |
# cvsweb - a CGI interface to CVS trees. |
# cvsweb - a CGI interface to CVS trees. |
# |
# |
|
|
# SUCH DAMAGE. |
# SUCH DAMAGE. |
# |
# |
# $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $ |
# $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $ |
# $kId: cvsweb.cgi,v 1.41 2000/12/06 18:19:12 knu Exp $ |
# $kId: cvsweb.cgi,v 1.55 2001/01/02 12:23:20 knu Exp $ |
# |
# |
### |
### |
|
|
|
require 5.000; |
|
|
use strict; |
use strict; |
|
|
use vars qw ( |
use vars qw ( |
|
|
%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 |
|
|
$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 @cvs_options |
$LOG_FILESEPARATOR $LOG_REVSEPARATOR |
$LOG_FILESEPARATOR $LOG_REVSEPARATOR |
); |
); |
|
|
Line 122 sub toggleQuery($$); |
|
Line 124 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 132 sub link_tags($); |
|
sub forbidden_module($); |
sub forbidden_module($); |
|
|
##### Start of Configuration Area ######## |
##### Start of Configuration Area ######## |
use Cwd; |
use File::Basename; |
|
|
# == 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}, |
(dirname $0) . '/cvsweb.conf', |
'/usr/local/etc/cvsweb.conf', |
'/usr/local/etc/cvsweb.conf' |
getcwd() . '/cvsweb.conf' |
|
) { |
) { |
$config = $_ if defined($_) && -r $_; |
if (defined($_) && -r $_) { |
|
($config) = /(.*)/; # untaint |
|
last; |
|
} |
} |
} |
|
|
# == Configuration defaults == |
# == Configuration defaults == |
|
|
$checkoutMagic = "~checkout~"; |
$checkoutMagic = "~checkout~"; |
$pathinfo = defined($ENV{PATH_INFO}) ? $ENV{PATH_INFO} : ''; |
$pathinfo = defined($ENV{PATH_INFO}) ? $ENV{PATH_INFO} : ''; |
$where = $pathinfo; |
$where = $pathinfo; |
|
$where =~ tr|/|/|s; |
$doCheckout = ($where =~ /^\/$checkoutMagic/); |
$doCheckout = ($where =~ /^\/$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|/+$||; |
$scriptname =~ s|/+$||; |
Line 244 $is_mod_perl = defined($ENV{MOD_PERL}); |
|
Line 250 $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 283 $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($@))); |
Line 294 $query = $ENV{QUERY_STRING}; |
|
Line 300 $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 ""); |
Line 404 foreach $k (keys %ICONS) { |
|
Line 411 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 423 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); |
|
|
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 "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 "tar", @tar_options, "-zcf", "-", "-C", $tmpdir, $basedir |
|
and $fatal = "500 Internal Error","tar zc failure: $!: $basedir" |
|
&& last; |
|
|
|
last; |
|
} |
|
|
|
system "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 812 elsif (-d $fullname) { |
|
Line 868 elsif (-d $fullname) { |
|
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 ($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 909 elsif (-d $fullname) { |
|
Line 981 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"); |
} |
} |
} |
} |
} |
} |
Line 1036 sub htmlify($;$) { |
|
Line 1108 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 1116 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 1124 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 1142 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 1150 sub htmlify($;$) { |
|
) |
) |
) |
) |
}{ |
}{ |
&link($1, sprintf($mancgi, $3 ne '' ? $3 : $4, $2)) . $5 |
&link($1, sprintf($mancgi, defined($3) ? $3 : $4, $2)) |
}egx; |
}egx; |
} $_; |
} $_; |
} |
} |
Line 1120 sub spacedHtmlText($;$) { |
|
Line 1192 sub spacedHtmlText($;$) { |
|
sub link($$) { |
sub link($$) { |
my($name, $where) = @_; |
my($name, $where) = @_; |
|
|
sprintf '<A HREF="%s">%s</A>', htmlquote($where), $name; |
sprintf '<A HREF="%s">%s</A>', hrefquote($where), $name; |
} |
} |
|
|
sub revcmp($$) { |
sub revcmp($$) { |
Line 1294 sub doAnnotate($$) { |
|
Line 1366 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, "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 1487 sub doCheckout($$) { |
|
Line 1559 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("cvs", @cvs_options, "-d", $cvsroot, "co", "-p", $revopt, $where); |
} |
} |
|
|
if (eof($fh)) { |
if (eof($fh)) { |
Line 1564 sub cvswebMarkup($$$) { |
|
Line 1636 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 1656 sub cvswebMarkup($$$) { |
|
} |
} |
print "</PRE>"; |
print "</PRE>"; |
} |
} |
|
else { |
|
print "<PLAINTEXT>\n", <$filehandle>; |
|
} |
} |
} |
|
|
sub viewable($) { |
sub viewable($) { |
Line 1745 sub getDirLogs($$@) { |
|
Line 1820 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. |
Line 1763 sub getDirLogs($$@) { |
|
Line 1838 sub getDirLogs($$@) { |
|
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 |
|
|
$branch = $1 |
$branch = $1 |
} elsif (/^symbolic names:/) { |
} elsif (/^symbolic names:/) { |
$state = "tags"; |
$state = "tags"; |
($branch = $head) =~ s/\.\d+$// if (!defined($branch)); |
($branch = $head) =~ s/\.\d+$// if $branch eq ''; |
$branch =~ s/(\.?)(\d+)$/${1}0.$2/; |
$branch =~ s/(\d+)$/0.$1/; |
$symrev{MAIN} = $branch; |
$symrev{MAIN} = $branch; |
$symrev{HEAD} = $branch; |
$symrev{HEAD} = $branch; |
$alltags{MAIN} = 1; |
$alltags{MAIN} = 1; |
|
|
push (@filetags, "MAIN", "HEAD"); |
push (@filetags, "MAIN", "HEAD"); |
} elsif (/$LOG_REVSEPARATOR/o) { |
} elsif (/$LOG_REVSEPARATOR/o) { |
$state = "log"; |
$state = "log"; |
$rev = undef; |
$rev = ''; |
$date = undef; |
$date = ''; |
$log = ""; |
$log = ''; |
# Try to reconstruct the relative filename if RCS spits out a full path |
# Try to reconstruct the relative filename if RCS spits out a full path |
$filename =~ s%^\Q$DirName\E/%%; |
$filename =~ s%^\Q$DirName\E/%%; |
} |
} |
|
|
if (defined($tag)) { |
if (defined($tag)) { |
if(defined($symrev{$tag}) || $tag eq "HEAD") { |
if(defined($symrev{$tag}) || $tag eq "HEAD") { |
$revwanted = $symrev{$tag eq "HEAD" ? "MAIN" : $tag}; |
$revwanted = $symrev{$tag eq "HEAD" ? "MAIN" : $tag}; |
($branch = $revwanted) =~ s/\.0\././; |
($branch = $revwanted) =~ s/\b0\.//; |
($branchpoint = $branch) =~ s/\.?\d+$//; |
($branchpoint = $branch) =~ s/\.?\d+$//; |
$revwanted = undef if ($revwanted ne $branch); |
$revwanted = '' if ($revwanted ne $branch); |
#print "\n[revwanted=$revwanted]"; |
|
} elsif ($tag ne "HEAD") { |
} elsif ($tag ne "HEAD") { |
print "Tag not found, skip this file" if ($verbose); |
print "Tag not found, skip this file" if ($verbose); |
$state = "skip"; |
$state = "skip"; |
|
|
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; |
} |
} |
Line 2015 sub readLog($;$) { |
|
Line 2088 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/; |
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; |
Line 2037 sub readLog($;$) { |
|
Line 2110 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 2051 sub readLog($;$) { |
|
Line 2124 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; |
Line 2083 sub readLog($;$) { |
|
Line 2155 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 2282 sub printLog($;$) { |
|
Line 2354 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 2640 sub navigateHeader($$$$$) { |
|
Line 2712 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 qq`<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">`; |
print "<HTML>\n<HEAD>\n"; |
print "<HTML>\n<HEAD>\n"; |
print '<!-- CVSweb $zRevision: 1.104 $ $kRevision: 1.41 $ -->'; |
print qq`<META name="robots" content="nofollow">\n`; |
|
print '<!-- CVSweb $zRevision: 1.104 $ $kRevision: 1.55 $ -->'; |
print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n"; |
print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n"; |
print "$body_tag_for_src\n"; |
print "$body_tag_for_src\n"; |
print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">"; |
print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">"; |
Line 2845 sub fileSortCmp() { |
|
Line 2918 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 2865 sub download_link($$$;$) { |
|
Line 2938 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"); |
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"'; |
Line 2899 sub download_link($$$;$) { |
|
Line 2972 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 2939 sub urlencode($) { |
|
Line 3012 sub urlencode($) { |
|
|
|
s/[\000-+{-\377]/sprintf("%%%02x", ord($&))/ge; |
s/[\000-+{-\377]/sprintf("%%%02x", ord($&))/ge; |
|
|
|
$_; |
$_; |
|
} |
} |
|
|
sub htmlquote($) { |
sub htmlquote($) { |
Line 2967 sub htmlunquote($) { |
|
Line 3039 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 3025 sub http_header(;$) { |
|
Line 3109 sub http_header(;$) { |
|
|
|
sub html_header($) { |
sub html_header($) { |
my ($title) = @_; |
my ($title) = @_; |
my $version = '$zRevision: 1.104 $ $kRevision: 1.41 $'; #' |
my $version = '$zRevision: 1.104 $ $kRevision: 1.55 $'; #' |
http_header($charset ne "" ? "text/html; charset=$charset" : "text/html"); |
http_header("text/html"); |
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> |
<head> |
|
<meta name="robots" content="nofollow"> |
<title>$title</title> |
<title>$title</title> |
<!-- CVSweb $version --> |
<!-- CVSweb $version --> |
</head> |
</head> |