The server on which the CVS tree lives is probably down. Please try again in a few minutes.');
}
@@ -471,10 +510,58 @@ $module = $1;
if ($module && &forbidden_module($module)) {
&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
###############################
-elsif (-d $fullname) {
+if (-d $fullname) {
my $dh = do {local(*DH);};
opendir($dh, $fullname) || &fatal("404 Not Found","$where: $!");
my @dir = readdir($dh);
@@ -649,7 +736,8 @@ elsif (-d $fullname) {
if ($_ eq '..' || -d "$fullname/$_") {
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{$_}));
printf '
', $tabcolors[$dirrow % 2] if $dirtable;
if ($_ eq '..') {
@@ -663,7 +751,7 @@ elsif (-d $fullname) {
print " ", &link("Previous Directory", $url);
}
else {
- $url = urlencode($_) . "/$query";
+ $url = './' . urlencode($_) . "/$query";
print "",
+ &link("Download this directory in tarball",
+ # Mangle the filename so browsers show a reasonable
+ # filename to download.
+ "./$basefile.tar.gz$query".
+ ($query ? "&" : "?")."tarball=1"),
+ "
";
+ }
+ }
+
my $formwhere = $scriptwhere;
$formwhere =~ s|Attic/?$|| if ($input{'hideattic'});
@@ -895,7 +1001,7 @@ elsif (-d $fullname) {
# The file has been removed and is in the Attic.
# Send a redirect pointing to the file in the Attic.
(my $newplace = $scriptwhere) =~ s|/([^/]+)$|/Attic/$1|;
- &redirect($newplace);
+ redirect("$newplace$query");
exit;
}
elsif (0 && (my @files = &safeglob($fullname . ",v"))) {
@@ -909,13 +1015,13 @@ elsif (-d $fullname) {
my $fh = do {local(*FH);};
my ($xtra, $module);
# 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?
- if (open($fh, "$cvsroot/CVSROOT/modules")) {
+ if (open($fh, "< $cvsroot/CVSROOT/modules")) {
while (<$fh>) {
if (/^(\S+)\s+(\S+)/o && $module eq $1
- && -d "${cvsroot}/$2" && $module ne $2) {
- &redirect($scriptname . '/' . $2 . $xtra);
+ && -d "$cvsroot/$2" && $module ne $2) {
+ redirect("$scriptname/$2$xtra$query");
}
}
}
@@ -1036,7 +1142,7 @@ sub htmlify($;$) {
if ($extra) {
# 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;
do {
@@ -1044,7 +1150,7 @@ sub htmlify($;$) {
$_ = htmlify_sub {
s{
- (\bPR[:\#]?\s*
+ (\b$re_prkeyword[:\#]?\s*
(?:
\#?
\d+[,\s]\s*
@@ -1052,16 +1158,16 @@ sub htmlify($;$) {
\#?)
(\d+)\b
}{
- $1 . &link($2, sprintf($prcgi, $2)) . $3
+ $1 . &link($2, sprintf($prcgi, $2))
}egix;
} $_;
} while ($_ ne $prev);
$_ = htmlify_sub {
s{
- (\b$prcategories/(\d+)\b)
+ (\b$re_prcategories/(\d+)\b)
}{
- &link($1, sprintf($prcgi, $2)) . $3
+ &link($1, sprintf($prcgi, $2))
}egox;
} $_;
}
@@ -1070,7 +1176,7 @@ sub htmlify($;$) {
if (defined($mancgi)) {
$_ = htmlify_sub {
s{
- (\b([a-zA-Z][\w_.]+)
+ (\b([a-zA-Z][\w.]+)
(?:
\( ([0-9n]) \)\B
|
@@ -1078,7 +1184,7 @@ sub htmlify($;$) {
)
)
}{
- &link($1, sprintf($mancgi, $3 ne '' ? $3 : $4, $2)) . $5
+ &link($1, sprintf($mancgi, defined($3) ? $3 : $4, $2))
}egx;
} $_;
}
@@ -1118,9 +1224,11 @@ sub spacedHtmlText($;$) {
}
sub link($$) {
- my($name, $where) = @_;
+ my($name, $url) = @_;
- sprintf '%s ', htmlquote($where), $name;
+ $url =~ s/:/sprintf("%%%02x", ord($&))/eg if $url =~ /^[^a-z]/; # relative
+
+ sprintf '%s ', hrefquote($url), $name;
}
sub revcmp($$) {
@@ -1197,11 +1305,23 @@ sub safeglob($) {
push(@results, "$dirname/" .$_);
}
}
+ closedir($dh);
}
@results;
}
+sub search_path($) {
+ my($command) = @_;
+ my $d;
+
+ for $d (split(/:/, $command_path)) {
+ return "$d/$command" if -x "$d/$command";
+ }
+
+ $command;
+}
+
sub getMimeTypeFromSuffix($) {
my ($fullname) = @_;
my ($mimetype, $suffix);
@@ -1275,7 +1395,7 @@ sub doAnnotate($$) {
my $reader = 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 ..
if ($rev =~ /[^\w.]/) {
&fatal("404 Not Found",
@@ -1294,8 +1414,8 @@ sub doAnnotate($$) {
# the public domain.
# we could abandon the use of rlog, rcsdiff and co using
# the cvsserver in a similiar way one day (..after rewrite)
- $pid = open2($reader, $writer, "cvs -Rl server") || fatal ("500 Internal Error",
- "Fatal Error - unable to open cvs for annotation");
+ $pid = open2($reader, $writer, $CMD{cvs}, @cvs_options, "server")
+ || fatal ("500 Internal Error", "Fatal Error - unable to open cvs for annotation");
# OK, first send the request to the server. A simplified example is:
# Root /home/kingdon/zwork/cvsroot
@@ -1486,9 +1606,14 @@ sub doCheckout($$) {
#
# Safely for a child process to read from.
if (! open($fh, "-|")) { # child
- open(STDERR, ">&STDOUT"); # Redirect stderr to stdout
- exec("cvs", "-Rld", $cvsroot, "co", "-p", $revopt, $where);
+ open(STDERR, ">&STDOUT"); # Redirect stderr to stdout
+ 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
#RCS: /usr/src/CVS/squid/src/ftp.c,v
@@ -1508,12 +1633,7 @@ sub doCheckout($$) {
}
if ($filename ne $where) {
&fatal("500 Internal Error",
- "Unexpected output from cvs co: $cvsheader"
- . "Check whether the directory $cvsroot/CVSROOT exists "
- . "and the script has write-access to the CVSROOT/history "
- . "file if it exists."
- . " ");
+ "Unexpected output from cvs co: $cvsheader");
}
$| = 1;
@@ -1564,12 +1684,12 @@ sub cvswebMarkup($$$) {
my $url = download_url($fileurl, $revision, $mimetype);
print "
";
# prefetch several lines
@@ -1584,6 +1704,13 @@ sub cvswebMarkup($$$) {
}
print " ";
}
+ else {
+ print "";
+ while (<$filehandle>) {
+ print htmlquote($_);
+ }
+ print " ";
+ }
}
sub viewable($) {
@@ -1664,7 +1791,7 @@ sub doDiff($$$$$$) {
}
if (! open($fh, "-|")) { # child
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) {
http_header();
@@ -1745,32 +1872,30 @@ sub getDirLogs($$@) {
return;
}
- if ($tag) {
+ if (defined($tag)) {
#can't use -r as - is allowed in tagnames, but misinterpreated by rlog..
if (! open($fh, "-|")) {
- open(STDERR, '>/dev/null'); # rlog may complain; ignore.
- exec('rlog', @files);
+ open(STDERR, '>/dev/null'); # rlog may complain; ignore.
+ exec($CMD{rlog}, @files);
}
}
else {
- my $kidpid = open($fh, "-|");
- if (! $kidpid) {
- open(STDERR, '>/dev/null'); # rlog may complain; ignore.
- exec('rlog', '-r', @files);
+ if (! open($fh, "-|")) {
+ open(STDERR, '>/dev/null'); # rlog may complain; ignore.
+ exec($CMD{rlog}, '-r', @files);
}
}
$state = "start";
while (<$fh>) {
if ($state eq "start") {
#Next file. Initialize file variables
- $rev = undef;
- $revwanted = undef;
- $branch = undef;
- $branchpoint = undef;
- $filename = undef;
- $log = undef;
- $revision = undef;
- $branch = undef;
+ $rev = '';
+ $revwanted = '';
+ $branch = '';
+ $branchpoint = '';
+ $filename = '';
+ $log = '';
+ $revision = '';
%symrev = ();
@filetags = ();
#jump to head state
@@ -1780,71 +1905,74 @@ sub getDirLogs($$@) {
again:
if ($state eq "head") {
#$rcsfile = $1 if (/^RCS file: (.+)$/); #not used (yet)
- $filename = $1 if (/^Working file: (.+)$/);
- $head = $1 if (/^head: (.+)$/);
- $branch = $1 if (/^branch: (.+)$/);
- }
- if ($state eq "head" && /^symbolic names/) {
- $state = "tags";
- ($branch = $head) =~ s/\.\d+$// if (!defined($branch));
- $branch =~ s/(\.?)(\d+)$/${1}0.$2/;
- $symrev{MAIN} = $branch;
- $symrev{HEAD} = $branch;
- $alltags{MAIN} = 1;
- $alltags{HEAD} = 1;
- push (@filetags, "MAIN", "HEAD");
+
+ if (/^Working file: (.+)$/) {
+ $filename = $1;
+ } elsif (/^head: (.+)$/) {
+ $head = $1;
+ } elsif (/^branch: (.+)$/) {
+ $branch = $1
+ } elsif (/^symbolic names:/) {
+ $state = "tags";
+ ($branch = $head) =~ s/\.\d+$// if $branch eq '';
+ $branch =~ s/(\d+)$/0.$1/;
+ $symrev{MAIN} = $branch;
+ $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;
}
- if ($state eq "tags" &&
- /^\s+(.+):\s+([\d\.]+)\s+$/) {
- push (@filetags, $1);
- $symrev{$1} = $2;
- $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";
+ if ($state eq "tags") {
+ if (/^\s+(.+):\s+([\d\.]+)\s+$/) {
+ push (@filetags, $1);
+ $symrev{$1} = $2;
+ $alltags{$1} = 1;
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 (/$LOG_REVSEPARATOR/o || /$LOG_FILESEPARATOR/o) {
# End of a log entry.
- my $revbranch;
- ($revbranch = $rev) =~ s/\.\d+$//;
+ my $revbranch = $rev;
+ $revbranch =~ s/\.\d+$//;
print "$filename $rev Wanted: $revwanted ",
"Revbranch: $revbranch Branch: $branch ",
"Branchpoint: $branchpoint\n" if ($verbose);
- if (!defined($revwanted) && defined($branch)
+ if ($revwanted eq '' && $branch ne ''
&& $branch eq $revbranch || !defined($tag)) {
print "File revision $rev found for branch $branch\n"
if ($verbose);
$revwanted = $rev;
}
- if (defined($revwanted) ? $rev eq $revwanted :
- defined($branchpoint) ? $rev eq $branchpoint :
+ if ($revwanted ne '' ? $rev eq $revwanted :
+ $branchpoint ne '' ? $rev eq $branchpoint :
0 && ($rev eq $head)) { # Don't think head is needed here..
print "File info $rev found for $filename\n" if ($verbose);
my @finfo = ($rev,$date,$log,$author,$filename);
@@ -1853,11 +1981,11 @@ again:
$fileinfo{$name} = [ @finfo ];
$state = "done" if ($rev eq $revwanted);
}
- $rev = undef;
- $date = undef;
- $log = "";
+ $rev = '';
+ $date = '';
+ $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;
# damn 2-digit year routines :-)
if ($yr > 100) {
@@ -1869,7 +1997,7 @@ again:
$log = '';
next;
}
- elsif (!defined($rev) && m/^revision (.*)$/) {
+ elsif ($rev eq '' && /^revision (.*)$/) {
$rev = $1;
next;
}
@@ -1884,7 +2012,7 @@ again:
}
if ($. == 0) {
fatal("500 Internal Error",
- "Failed to spawn GNU rlog on '".join(", ", @files)."' did you set the \$ENV{PATH} in your configuration file correctly ?");
+ "Failed to spawn GNU rlog on '".join(", ", @files)."'
Did you set the \$command_path in your configuration file correctly ? (Currently '$command_path'");
}
close($fh);
}
@@ -1912,12 +2040,12 @@ sub readLog($;$) {
print("Going to rlog '$fullname'\n") if ($verbose);
if (! open($fh, "-|")) { # child
- if ($revision ne '') {
- exec("rlog",$revision,$fullname);
- }
- else {
- exec("rlog",$fullname);
- }
+ if ($revision ne '') {
+ exec($CMD{rlog}, $revision, $fullname);
+ }
+ else {
+ exec($CMD{rlog}, $fullname);
+ }
}
while (<$fh>) {
print if ($verbose);
@@ -2011,12 +2139,11 @@ sub readLog($;$) {
# is the first commit listed on the appropriate branch.
# This is not neccesary the same revision as marked as head in the RCS file.
my $headrev = $curbranch || "1";
- ($symrev{"MAIN"} = $headrev) =~ s/(\.?)(\d+)$/${1}0.$2/;
- revision:
+ ($symrev{"MAIN"} = $headrev) =~ s/(\d+)$/0.$1/;
foreach $rev (@revorder) {
if ($rev =~ /^(\S*)\.\d+$/ && $headrev eq $1) {
$symrev{"HEAD"} = $rev;
- last revision;
+ last;
}
}
($symrev{"HEAD"} = $headrev) =~ s/\.\d+$//
@@ -2034,7 +2161,7 @@ sub readLog($;$) {
foreach (reverse sort keys %symrev) {
$rev = $symrev{$_};
- if ($rev =~ /^((.*)\.)0\.(\d+)$/) {
+ if ($rev =~ /^((.*)\.)?\b0\.(\d+)$/) {
push(@branchnames, $_);
#
# A revision number of A.B.0.D really translates into
@@ -2048,22 +2175,20 @@ sub readLog($;$) {
# it has no head to translate to if there is nothing on
# the branch, but I guess this can never happen?
#
- # Since some stupid people actually import/check in
- # files with version 0.X we assume that the above cannot
- # happen, and regard 0.X(.*) as a revision and not a branch.
+ # (the code below gracefully forgets about the branch
+ # if it should happen)
#
$head = defined($2) ? $2 : "";
$branch = $3;
$branchrev = $head . ($head ne "" ? "." : "") . $branch;
my $regex;
- ($regex = $branchrev) =~ s/\./\\./g;
+ $regex = quotemeta $branchrev;
$rev = $head;
- revision:
foreach my $r (@revorder) {
if ($r =~ /^${regex}\b/) {
$rev = $branchrev;
- last revision;
+ last;
}
}
next if ($rev eq "");
@@ -2081,7 +2206,7 @@ sub readLog($;$) {
my ($onlyonbranch, $onlybranchpoint);
if ($onlyonbranch = $input{'only_with_tag'}) {
$onlyonbranch = $symrev{$onlyonbranch};
- if ($onlyonbranch =~ s/\.0\././) {
+ if ($onlyonbranch =~ s/\b0\.//) {
($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//;
}
else {
@@ -2280,18 +2405,18 @@ sub printLog($;$) {
if (/^\d+\.\d+\.\d+/ && !/^1\.1\.1\.\d+$/) {
my ($i,$nextmain);
for ($i = 0; $i < $#revorder && $revorder[$i] ne $_; $i++){}
- my (@tmp2) = split(/\./, $_);
+ my @tmp2 = split(/\./, $_);
for ($nextmain = ""; $i > 0; $i--) {
- my ($next) = $revorder[$i-1];
- my (@tmp1) = split(/\./, $next);
- if ($#tmp1 < $#tmp2) {
+ my $next = $revorder[$i-1];
+ my @tmp1 = split(/\./, $next);
+ if (@tmp1 < @tmp2) {
$nextmain = $next;
last;
}
# Only the highest version on a branch should have
# a diff for the "next main".
- last if (join(".",@tmp1[0..$#tmp1-1])
- eq join(".",@tmp2[0..$#tmp1-1]));
+ last if (@tmp1 - 1 <= @tmp2 &&
+ join(".",@tmp1[0..$#tmp1-1]) eq join(".",@tmp2[0..$#tmp1-1]));
}
if (!defined($diffrev{$nextmain})) {
$diffrev{$nextmain} = 1;
@@ -2520,8 +2645,8 @@ sub human_readable_diff($){
print "";
- my $fe = " ";
+ my $fs = "";
+ my $fe = "
\n";
- print '';
- print "\n$path$filename - $title - $rev \n";
- print "$body_tag_for_src\n";
- print "";
- print "";
+ $swhere = './', urlencode($filename) if ($swhere eq "");
+
+ print <
+
+
+$path$filename - $title - $rev
+$body_tag_for_src
+
+
+EOF
+
print &link($backicon, "$swhere$query#rev$rev");
- print " Return to ", &link("$filename","$swhere$query#rev$rev")," CVS log";
+ print "Return to ", &link($filename,"$swhere$query#rev$rev")," CVS log";
print " $fileicon ";
print "$diricon Up to ", &clickablePath($path, 1), " ";
@@ -2754,13 +2885,7 @@ sub clickablePath($$) {
}
sub chooseCVSRoot() {
- my @foo;
- foreach (sort keys %CVSROOT) {
- if (-d $CVSROOT{$_}) {
- push(@foo, $_);
- }
- }
- if (@foo > 1) {
+ if (2 <= @CVSROOT) {
my ($k);
print "
";
+ print "";
}
else {
# no choice ..
print "CVS Root: [$cvstree] ";
}
+
+ print " Module path or alias:\n";
+ print "
";
+ }
}
sub chooseMirror() {
@@ -2843,7 +2975,7 @@ sub fileSortCmp() {
sub download_url($$;$) {
my ($url,$revision,$mimetype) = @_;
- $revision =~ s/\.0\././;
+ $revision =~ s/\b0\.//;
if (defined($checkoutMagic)
&& (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) {
@@ -2863,8 +2995,10 @@ sub download_link($$$;$) {
my ($url, $revision, $textlink, $mimetype) = @_;
my ($fullurl) = download_url($url, $revision, $mimetype);
- printf '$textlink Unable to find gzip binary in the \$PATH to compress output Unable to find gzip binary in the \$command_path ($command_path) to compress output
+
+$title
-
+
$body_tag
$logo $title
@@ -3047,7 +3193,7 @@ sub link_tags($) {
my ($fileurl,$filename);
($filename = $where) =~ s/^.*\///;
- $fileurl = urlencode($filename);
+ $fileurl = './' . urlencode($filename);
foreach my $sym (split(", ", $tags)) {
$ret .= ",\n" if ($ret ne "");