%s ',
$config_cvstree, &htmlify($@)));
}
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/;
-$fullname = $cvsroot . '/' . $where;
+$fullname = "$cvsroot/$where";
$mimetype = &getMimeTypeFromSuffix ($fullname);
$defaultTextPlain = ($mimetype eq "text/plain");
$defaultViewable = $allow_markup && viewable($mimetype);
@@ -451,7 +480,7 @@ if (-d $fullname) {
# to allow relative URL's. If they're not, make a redirect.
##
if (!($pathinfo =~ m|/$|) || ($pathinfo =~ m |/{2,}$|)) {
- redirect ($scriptwhere . '/' . $query);
+ redirect("$scriptwhere/$query");
}
else {
$where .= '/';
@@ -471,10 +500,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 "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
###############################
-elsif (-d $fullname) {
+if (-d $fullname) {
my $dh = do {local(*DH);};
opendir($dh, $fullname) || &fatal("404 Not Found","$where: $!");
my @dir = readdir($dh);
@@ -809,9 +886,27 @@ elsif (-d $fullname) {
">$tag\n";
}
print "\n";
+ print " Module path or alias:\n";
+ printf "\n", htmlquote($where);
print "\n";
print "\n";
}
+
+ if ($allow_tar) {
+ my($basefile) = ($where =~ m,(?:.*/)?([^/]+),);
+
+ if (defined($basefile) && $basefile ne '') {
+ print "\n",
+ "
",
+ &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 +990,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 +1004,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")) {
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 +1131,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 +1139,7 @@ sub htmlify($;$) {
$_ = htmlify_sub {
s{
- (\bPR[:\#]?\s*
+ (\b$re_prkeyword[:\#]?\s*
(?:
\#?
\d+[,\s]\s*
@@ -1052,16 +1147,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 +1165,7 @@ sub htmlify($;$) {
if (defined($mancgi)) {
$_ = htmlify_sub {
s{
- (\b([a-zA-Z][\w_.]+)
+ (\b([a-zA-Z][\w.]+)
(?:
\( ([0-9n]) \)\B
|
@@ -1078,7 +1173,7 @@ sub htmlify($;$) {
)
)
}{
- &link($1, sprintf($mancgi, $3 ne '' ? $3 : $4, $2)) . $5
+ &link($1, sprintf($mancgi, defined($3) ? $3 : $4, $2))
}egx;
} $_;
}
@@ -1120,7 +1215,7 @@ sub spacedHtmlText($;$) {
sub link($$) {
my($name, $where) = @_;
- sprintf '%s', htmlquote($where), $name;
+ sprintf '%s', hrefquote($where), $name;
}
sub revcmp($$) {
@@ -1294,8 +1389,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, "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
@@ -1487,7 +1582,7 @@ 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);
+ exec("cvs", @cvs_options, "-d", $cvsroot, "co", "-p", $revopt, $where);
}
if (eof($fh)) {
@@ -1564,12 +1659,12 @@ sub cvswebMarkup($$$) {
my $url = download_url($fileurl, $revision, $mimetype);
print "";
if ($mimetype =~ /^image/) {
- printf ' ', htmlquote("$url$barequery");
+ printf ' ', hrefquote("$url$barequery");
}
elsif ($mimetype =~ m%^application/pdf%) {
- printf '