\n",
$tabcolors[$dirrow % 2] if $dirtable;
- if ($_ eq '..') {
+ if ($file eq '..') {
$url = "../$query";
if ($nofilelinks) {
print $backicon;
@@ -866,17 +849,17 @@ if (-d $fullname) {
}
print ' ', &link("Parent Directory", $url);
} else {
- $url = './' . urlencode($_) . "/$query";
- print "";
+ $url = './' . urlencode($file) . "/$query";
+ print "";
if ($nofilelinks) {
print $diricon;
} else {
print &link($diricon, $url);
}
- print ' ', &link("$_/", $url), $attic;
+ print ' ', &link("$file/", $url), $attic;
- if ($_ eq "Attic") {
+ if ($file eq "Attic") {
print " ";
print &link(
"[Don't hide]",
@@ -919,7 +902,7 @@ if (-d $fullname) {
}
} else {
my ($dwhere) =
- ($where ne "/" ? $where : "") . $_;
+ ($where ne "/" ? $where : "") . $file;
if ($use_descriptions
&& defined $descriptions{$dwhere})
@@ -946,33 +929,29 @@ if (-d $fullname) {
print "
\n";
}
$dirrow++;
- } elsif (s/,v$//) {
+ } elsif ($file =~ s/,v$//) {
# Skip forbidden files now so we'll give no hint
# about their existence. This should probably have
# been done earlier, but it's straightforward here.
- next if forbidden_file("$fullname/$_");
+ next if forbidden_file("$fullname/$file");
- $fileurl = ($attic ? "Attic/" : "") . urlencode($_);
+ $fileurl = ($attic ? "Attic/" : "") . urlencode($file);
$url = './' . $fileurl . $query;
- my $rev = '';
- my $date = '';
- my $log = '';
- my $author = '';
$filesexists++;
- next if (!defined($fileinfo{$_}));
- ($rev, $date, $log, $author) = @{$fileinfo{$_}};
+ next if (!defined($fileinfo{$file}));
+ my ($rev, $date, $log, $author) = @{$fileinfo{$file}};
$filesfound++;
printf " |
\n| ",
$tabcolors[$dirrow % 2] if $dirtable;
- print "";
+ print "";
if ($nofilelinks) {
print $fileicon;
} else {
print &link($fileicon, $url);
}
- print ' ', &link($_, $url), $attic;
+ print ' ', &link(htmlquote($file), $url), $attic;
print " | \n " if ($dirtable);
download_link($fileurl, $rev, $rev,
$defaultViewable ? "text/x-cvsweb-markup" :
@@ -1426,6 +1405,7 @@ sub spacedHtmlText($;$) {
return $_;
}
+# Note that this doesn't htmlquote the first argument...
sub link($$) {
my ($name, $url) = @_;
@@ -1627,16 +1607,27 @@ sub doAnnotate($$) {
$| = 1;
$| = 0; # Flush
+ # Work around a mod_perl bug (?) in order to make open2() work.
+ # Search for "untie STDIN" in mod_perl mailing list archives.
+ my $old_stdin;
+ if ($is_mod_perl && ($old_stdin = tied *STDIN)) {
+ local $^W = undef;
+ untie *STDIN;
+ }
+
# this annotate version is based on the
# cvs annotate-demo Perl script by Cyclic Software
# It was written by Cyclic Software, http://www.cyclic.com/, and is in
# 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, $CMD{cvs}, @cvs_options, "server")
+ $pid = open2($reader, $writer, $CMD{cvs}, @annotate_options, 'server')
or fatal("500 Internal Error",
'Fatal Error - unable to open cvs for annotation');
+ # Re-tie STDIN if we fiddled around with it earlier, just to be sure.
+ tie(*STDIN, ref($old_stdin), $old_stdin) if ($old_stdin && !tied(*STDIN));
+
# OK, first send the request to the server. A simplified example is:
# Root /home/kingdon/zwork/cvsroot
# Argument foo/xx
@@ -1780,6 +1771,8 @@ sub doAnnotate($$) {
} else {
print "";
}
+ html_footer();
+
close($reader) or warn "cannot close: $!";
wait;
}
@@ -2122,7 +2115,7 @@ sub getDirLogs($$@) {
push (@files, &safeglob("$DirName/*,v"));
push (@files, &safeglob("$DirName/Attic/*,v"))
if (!$input{'hideattic'});
- foreach $file (@otherFiles) {
+ foreach my $file (@otherFiles) {
push (@files, "$DirName/$file");
}
@@ -3632,21 +3625,20 @@ sub http_header(;$) {
sub html_header($) {
my ($title) = @_;
http_header("text/html");
-
- (my $header = &cgi_style::html_header) =~ s,\A.*\n,,s;
-
print <
$title
$HTML_META
-$header
+$body_tag
+$logo $title
EOH
}
sub html_footer() {
- return &cgi_style::html_footer;
+ print "
\n$address\n" if $address;
+ print " |