";
- }
- print
- "\n";
+ print "\n";
$infocols++;
- printf '',
+ printf " \n",
$byfile ? $columnHeaderColorSorted :
$columnHeaderColorDefault;
@@ -677,13 +702,13 @@ if (-d $fullname) {
)
);
}
- print " ";
+ print "\n";
# do not display the other column-headers, if we do not have any files
# with revision information:
if (scalar(%fileinfo)) {
$infocols++;
- printf '',
+ printf ' ',
$byrev ? $columnHeaderColorSorted :
$columnHeaderColorDefault;
@@ -698,9 +723,9 @@ if (-d $fullname) {
)
);
}
- print " ";
+ print "\n";
$infocols++;
- printf '',
+ printf ' ',
$bydate ? $columnHeaderColorSorted :
$columnHeaderColorDefault;
@@ -715,11 +740,11 @@ if (-d $fullname) {
)
);
}
- print " ";
+ print "\n";
if ($show_author) {
$infocols++;
- printf '',
+ printf ' ',
$byauthor ? $columnHeaderColorSorted :
$columnHeaderColorDefault;
@@ -737,10 +762,10 @@ if (-d $fullname) {
)
);
}
- print " ";
+ print "\n";
}
$infocols++;
- printf '',
+ printf ' ',
$bylog ? $columnHeaderColorSorted :
$columnHeaderColorDefault;
@@ -755,11 +780,11 @@ if (-d $fullname) {
)
);
}
- print " ";
+ print "\n";
} elsif ($use_descriptions) {
- printf '',
+ printf ' ',
$columnHeaderColorDefault;
- print "Description";
+ print "Description \n";
$infocols++;
}
print " \n";
@@ -825,8 +850,8 @@ if (-d $fullname) {
($rev, $date, $log, $author, $filename) =
@{$fileinfo{$_}}
if (defined($fileinfo{$_}));
- printf '', $tabcolors[$dirrow % 2]
- if $dirtable;
+ printf " \n",
+ $tabcolors[$dirrow % 2] if $dirtable;
if ($_ eq '..') {
$url = "../$query";
@@ -835,7 +860,7 @@ if (-d $fullname) {
} else {
print &link($backicon, $url);
}
- print " ", &link("Parent Directory", $url);
+ print ' ', &link("Parent Directory", $url);
} else {
$url = './' . urlencode($_) . "/$query";
print " "
+ print " \n \n "
if ($dirtable);
if ($date) {
print " ",
@@ -871,22 +896,22 @@ if (-d $fullname) {
}
if ($show_author) {
- print " " if ($dirtable);
+ print " \n " if ($dirtable);
print $author;
}
- print " " if ($dirtable);
+ print " \n " if ($dirtable);
$filename =~ s%^[^/]+/%%;
print "$filename/$rev";
print "",
+ print " ",
&htmlify(
- substr($log, 0, $shortLogLen));
+ substr($log, 0, $shortLogLen), $allow_dir_extra);
if (length $log > 80) {
print "...";
}
- print " ";
+ print "";
}
} else {
my ($dwhere) =
@@ -905,14 +930,14 @@ if (-d $fullname) {
# columns, so that the vertical seperators are visible
my ($cols) = $infocols;
while ($cols > 1) {
- print " ";
+ print " \n ";
$cols--;
}
}
}
if ($dirtable) {
- print " \n";
+ print "\n\n";
} else {
print "', $tabcolors[$dirrow % 2]
- if $dirtable;
+ printf " \n",
+ $tabcolors[$dirrow % 2] if $dirtable;
print " " if ($dirtable);
+ print ' ', &link($_, $url), $attic;
+ print " \n " if ($dirtable);
download_link($fileurl, $rev, $rev,
$defaultViewable ? "text/x-cvsweb-markup" :
undef);
- print " " if ($dirtable);
+ print " \n " if ($dirtable);
if ($date) {
print " ", readableTime(time() - $date, 0),
" ";
}
if ($show_author) {
- print " " if ($dirtable);
+ print " \n " if ($dirtable);
print $author;
}
- print " " if ($dirtable);
+ print " \n " if ($dirtable);
if ($log) {
- print " ",
- &htmlify(substr($log, 0, $shortLogLen));
+ print " ",
+ &htmlify(substr($log, 0, $shortLogLen), $allow_dir_extra);
if (length $log > 80) {
print "...";
}
- print " ";
+ print "";
}
- print " " if ($dirtable);
+ print "\n" if ($dirtable);
print(($dirtable) ? " " : "
\n" : "\n");
- if ($dirtable && defined($tableBorderColor)) {
- print "
";
- }
-
if ($filesexists && !$filesfound) {
print
"NOTE: There are $filesexists files, but none matches the current tag ($input{only_with_tag}).
\n";
@@ -987,7 +1008,7 @@ if (-d $fullname) {
if (scalar %tags || $input{only_with_tag} || $edit_option_form
|| defined($input{"options"}))
{
- print "';
+ print ">\n";
local $_;
for (@DIFFTYPES) {
- printf('%s ', $_,
+ printf("%s \n", $_,
$f eq $_ ? ' selected' : '', "\u$DIFFTYPES{$_}{'descr'}");
}
@@ -1196,11 +1221,11 @@ sub printLogSortSelect($) {
print '';
+ print ">\n";
local $_;
for (@LOGSORTKEYS) {
- printf('%s ', $_,
+ printf("%s \n", $_,
$logsort eq $_ ? ' selected' : '',
"\u$LOGSORTKEYS{$_}{'descr'}");
}
@@ -1222,7 +1247,7 @@ sub findLastModifiedSubdirs(@) {
my ($lastmodtime) = undef;
my $dh = do { local (*DH); };
- opendir($dh, $dir) || next;
+ opendir($dh, $dir) or next;
my (@filenames) = readdir($dh);
closedir($dh);
@@ -1283,8 +1308,7 @@ sub htmlify($;$) {
if ($extra) {
# get PR #'s as link: "PR#nnnn" "PR: nnnn, ..." "PR nnnn, ..." "bin/nnnn"
- if (defined($prcgi) && defined($re_prcategories)
- && defined($re_prkeyword))
+ if (defined($prcgi) && defined($re_prkeyword))
{
my $prev;
@@ -1307,14 +1331,16 @@ sub htmlify($;$) {
$_;
} while ($_ ne $prev);
- $_ = htmlify_sub {
- s{
- (\b$re_prcategories/(\d+)\b)
- }{
- &link($1, sprintf($prcgi, $2))
- }egox;
- }
- $_;
+ if (defined($re_prcategories)) {
+ $_ = htmlify_sub {
+ s{
+ (\b$re_prcategories/(\d+)\b)
+ }{
+ &link($1, sprintf($prcgi, $2))
+ }egox;
+ }
+ $_;
+ }
}
# get manpage specs as link: "foo.1" "foo(1)"
@@ -1363,7 +1389,7 @@ sub spacedHtmlText($;$) {
s/ /\001nbsp;/g;
}
- $_ = htmlify($_);
+ $_ = htmlify($_, $allow_source_extra);
# unescape
y/\001/&/;
@@ -1400,16 +1426,18 @@ sub revcmp($$) {
return 0;
}
-sub fatal($$) {
- my ($errcode, $errmsg) = @_;
+sub fatal($$@) {
+ my ($errcode, $format, @args) = @_;
if ($is_mod_perl) {
Apache->request->status((split (/ /, $errcode))[0]);
} else {
print "Status: $errcode\r\n";
}
html_header("Error");
- print "Error: " . htmlquote($errmsg) . "\n";
- print &html_footer;
+ print "Error: ",
+ sprintf($format, map(htmlquote($_), @args)),
+ "
\n";
+ html_footer();
exit(1);
}
@@ -1423,8 +1451,8 @@ sub redirect($) {
print "Location: $url\r\n";
}
html_header("Moved");
- print "This document is located ", &link('here', $url), "\n";
- print &html_footer;
+ print "This document is located ", &link('here', $url), "
\n";
+ html_footer();
exit(1);
}
@@ -1538,13 +1566,11 @@ sub scan_directives(@) {
sub openOutputFilter() {
return if !defined($output_filter) || $output_filter eq '';
- open(STDOUT, "|-") && return;
+ open(STDOUT, "|-") and return;
# child of child
open(STDERR, '>/dev/null');
- exec($output_filter);
-
- exit -1;
+ exec($output_filter) or exit -1;
}
###############################
@@ -1560,14 +1586,14 @@ sub doAnnotate($$) {
# make sure the revisions are wellformed, for security
# reasons ..
if ($rev =~ /[^\w.]/) {
- &fatal("404 Not Found",
- "Malformed query \"$ENV{QUERY_STRING}\"");
+ fatal("404 Not Found",
+ 'Malformed query "%s"',
+ $ENV{QUERY_STRING});
}
if (&forbidden_file($fullname)) {
- &fatal("403 Forbidden",
- "Access forbidden. This file is mentioned in \@ForbiddenFiles"
- );
+ fatal("403 Forbidden",
+ 'Access forbidden. This file is mentioned in @ForbiddenFiles');
return;
}
@@ -1585,8 +1611,8 @@ sub doAnnotate($$) {
# 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")
- || fatal("500 Internal Error",
- "Fatal Error - unable to open cvs for annotation");
+ or 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
@@ -1641,13 +1667,13 @@ sub doAnnotate($$) {
# OK, we've sent our command to the server. Thing to do is to
# close the writer side and get all the responses. If "cvs server"
# were nicer about buffering, then we could just leave it open, I think.
- close($writer) || die "cannot close: $!";
+ close($writer) or die "cannot close: $!";
http_header();
navigateHeader($scriptwhere, $pathname, $filename, $rev, "annotate");
print
- "Annotation of $pathname$filename, Revision $rev \n";
+ "Annotation of $pathname$filename, Revision $rev \n";
# Ready to get the responses from the server.
# For example:
@@ -1660,7 +1686,7 @@ sub doAnnotate($$) {
my ($revprint, $usrprint);
if ($annTable) {
- print "\n";
+ print "\n";
} else {
print "";
}
@@ -1721,7 +1747,8 @@ sub doAnnotate($$) {
# CVS command line client. But for simplicity, we don't.
} elsif ($words[0] eq "error") {
fatal("500 Internal Error",
- "Error occured during annotate: $_ ");
+ 'Error occured during annotate: %s ',
+ $_);
}
}
@@ -1730,7 +1757,7 @@ sub doAnnotate($$) {
} else {
print " ";
}
- close($reader) || warn "cannot close: $!";
+ close($reader) or warn "cannot close: $!";
wait;
}
@@ -1749,14 +1776,14 @@ sub doCheckout($$) {
# make sure the revisions a wellformed, for security
# reasons ..
if (defined($rev) && $rev =~ /[^\w.]/) {
- &fatal("404 Not Found",
- "Malformed query \"$ENV{QUERY_STRING}\"");
+ fatal("404 Not Found",
+ 'Malformed query "%s"',
+ $ENV{QUERY_STRING});
}
if (&forbidden_file($fullname)) {
- &fatal("403 Forbidden",
- "Access forbidden. This file is mentioned in \@ForbiddenFiles"
- );
+ fatal("403 Forbidden",
+ 'Access forbidden. This file is mentioned in @ForbiddenFiles');
return;
}
@@ -1794,12 +1821,19 @@ sub doCheckout($$) {
# chdir to $tmpdir before to avoid non-readable cgi-bin directories
chdir($tmpdir);
open(STDERR, ">&STDOUT"); # Redirect stderr to stdout
- exec($CMD{cvs}, @cvs_options, '-d', $cvsroot, 'co', '-p',
- $revopt, $where);
+
+ # work around a bug of cvs -p; expand symlinks
+ use Cwd 'abs_path';
+ exec($CMD{cvs}, @cvs_options,
+ '-d', abs_path($cvsroot),
+ 'co', '-p',
+ $revopt, $where) or exit -1;
}
if (eof($fh)) {
- &fatal("404 Not Found", "$where is not (any longer) pertinent");
+ fatal("404 Not Found",
+ '%s is not (any longer) pertinent',
+ $where);
}
#===================================================================
@@ -1823,8 +1857,9 @@ sub doCheckout($$) {
}
if ($filename ne $where) {
- &fatal("500 Internal Error",
- "Unexpected output from cvs co: $cvsheader");
+ fatal("500 Internal Error",
+ 'Unexpected output from cvs co: %s',
+ $cvsheader);
}
$| = 1;
@@ -1849,7 +1884,7 @@ sub cvswebMarkup($$$) {
navigateHeader($scriptwhere, $pathname, $filename, $revision, "view");
print "";
+ print "\n\n";
print "File: ", &clickablePath($where, 1);
print " (";
&download_link($fileurl, $revision, "download");
@@ -1870,7 +1905,7 @@ sub cvswebMarkup($$$) {
print "Tag: ", $input{only_with_tag}, "
";
+ print " \n
";
my $url = download_url($fileurl, $revision, $mimetype);
print "'"
- . join (", ", @files)
- . "' Did you set the \$command_path in your configuration file correctly ? (Currently '$command_path'"
- );
+ fatal("500 Internal Error",
+ 'Failed to spawn GNU rlog on "%s" .
Did you set the $command_path in your configuration file correctly ? (Currently "%s"',
+ join (", ", @files), $command_path);
}
close($fh);
}
@@ -2286,10 +2323,10 @@ sub readLog($;$) {
if (!open($fh, "-|")) { # child
if ($revision ne '') {
openOutputFilter();
- exec($CMD{rlog}, $revision, $fullname);
+ exec($CMD{rlog}, $revision, $fullname) or exit -1;
} else {
openOutputFilter();
- exec($CMD{rlog}, $fullname);
+ exec($CMD{rlog}, $fullname) or exit -1;
}
}
@@ -2319,13 +2356,18 @@ sub readLog($;$) {
# date: 1995/11/29 22:15:52; author: fenner; state: Exp; lines: +5 -3
# log info
# ----------------------------
+
+ # For a locked revision, the first line after the separator
+ # becomes smth like
+ # revision 9.19 locked by: vassilii;
+
logentry:
while (!/$LOG_FILESEPARATOR/o) {
$_ = <$fh>;
last logentry if (!defined($_)); # EOF
print "R:", $_ if ($verbose);
- if (/^revision ([\d\.]+)/) {
+ if (/^revision (\d+(?:\.\d+)+)/) {
$rev = $1;
unshift (@allrevisions, $rev);
} elsif (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o) {
@@ -2340,8 +2382,6 @@ sub readLog($;$) {
# these lines since we don't know what revision they go with
# any more.
next logentry;
-
- # &fatal("500 Internal Error","Error parsing RCS output: $_");
}
$_ = <$fh>;
print "D:", $_ if ($verbose);
@@ -2361,8 +2401,9 @@ sub readLog($;$) {
$state{$rev} = $8;
$difflines{$rev} = $10;
} else {
- &fatal("500 Internal Error",
- "Error parsing RCS output: $_");
+ fatal("500 Internal Error",
+ 'Error parsing RCS output: %s',
+ $_);
}
line:
@@ -2469,7 +2510,8 @@ sub readLog($;$) {
if (!defined($onlyonbranch) || $onlybranchpoint eq "") {
fatal("404 Tag not found",
- "Tag $input{'only_with_tag'} not defined");
+ 'Tag %s not defined',
+ $input{'only_with_tag'});
}
}
@@ -2528,6 +2570,7 @@ sub printLog($;$) {
$link = 1 if (!defined($link));
$isDead = ($state{$_} eq "dead");
+ print "
\n";
if ($link && !$isDead) {
my ($filename);
($filename = $where) =~ s/^.*\///;
@@ -2649,7 +2692,8 @@ sub printLog($;$) {
my %diffrev = ();
$diffrev{$_} = 1;
$diffrev{""} = 1;
- print "
\n";
- print &htmlify($log{$_}, 1);
+ print "\n\n\n";
+ print &htmlify($log{$_}, $allow_log_extra);
print " \n";
}
@@ -2749,11 +2799,14 @@ sub doLog($) {
($upwhere = $where) =~ s|(Attic/)?[^/]+$||;
($filename = $where) =~ s|^.*/||;
$backurl = $scriptname . "/" . urlencode($upwhere) . $query;
+ print "\n ";
print &link($backicon, "$backurl#$filename"), " Up to ",
- &clickablePath($upwhere, 1), "
\n";
+ &clickablePath($upwhere, 1), "\n
\n";
+ print "\n ";
print &link('Request diff between arbitrary revisions', '#diff');
- print '
\n";
if ($curbranch) {
print "Default branch: ", ($revsym{$curbranch} || $curbranch);
} else {
@@ -2764,21 +2817,22 @@ sub doLog($) {
if ($input{only_with_tag}) {
print "Current tag: $input{only_with_tag}
\n";
undef %nameprinted;
for (my $i = 0 ; $i <= $#revdisplayorder ; $i++) {
- print "\n";
print "\n";
print "This form allows you to request diff's between any two\n";
print "revisions of a file. You may select a symbolic revision\n";
print "name using the selection box or you may type in a numeric\n";
print "name using the type-in text box.\n";
- print "
\n";
+ print "\n
\n";
print
"
\n";
- print "";
-
- print "";
+ print "
\n";
+ print "\n";
}
sub navigateHeader($$$$$) {
@@ -3083,16 +3125,54 @@ sub navigateHeader($$$$$) {
$swhere = "" if ($swhere eq $scriptwhere);
$swhere = './' . urlencode($filename) if ($swhere eq "");
+ # TODO: this should be moved into external CSS file.
+ my $css = '';
+ if ($title eq 'diff') {
+ $css = "
+";
+ }
+
print <
+$HTML_DOCTYPE
$path$filename - $title - $rev
+$path$filename - $title - $rev $css
$body_tag_for_src
-
+
EOF
@@ -3207,9 +3287,10 @@ sub clickablePath($$) {
}
sub chooseCVSRoot() {
+
+ print "";
+ print "\n";
}
sub chooseMirror() {
@@ -3511,7 +3594,7 @@ sub http_header(;$) {
print "\r\n"; # Close headers
}
print
- "Unable to find gzip binary in the \$command_path ($command_path) to compress output Unable to find gzip binary in the \$command_path ($command_path) to compress output
-$header
+$HTML_DOCTYPE
+
+
+$title
+
+$header
EOH
}
diff --git a/en/cgi/cvsweb.conf b/en/cgi/cvsweb.conf
index a4448fbfa6..128bb0c610 100644
--- a/en/cgi/cvsweb.conf
+++ b/en/cgi/cvsweb.conf
@@ -7,9 +7,9 @@
# 2000-2002 A. MUSHA
# based on work by Bill Fenner
#
-# $Id: cvsweb.conf,v 1.26 2002-04-10 20:13:19 knu Exp $
+# $Id: cvsweb.conf,v 1.27 2002-05-22 08:31:06 knu Exp $
# $Idaemons: /home/cvs/cvsweb/cvsweb.conf,v 1.27 2001/08/01 09:48:39 knu Exp $
-# $FreeBSD: www/en/cgi/cvsweb.conf,v 1.25 2002/03/09 20:55:39 wosch Exp $
+# $FreeBSD: www/en/cgi/cvsweb.conf,v 1.26 2002/04/10 20:13:19 knu Exp $
#
###
@@ -42,7 +42,7 @@ chomp($uname = `$CMD{uname}`);
# 'symbolic_name' => ['name_to_display', 'path_to_the_actual_repository']
# Listed in the order specified:
@CVSrepositories = (
- 'freebsd' => ['FreeBSD', '/c/ncvs'],
+ 'freebsd' => ['FreeBSD', '/home/ncvs'],
'openbsd' => ['OpenBSD', '/usr/local/www/cvsroot/OpenBSD'],
'netbsd' => ['NetBSD', '/usr/local/www/cvsroot/NetBSD'],
'44bsdlite' => ['4.4BSD-Lite', '/e/4.4BSD-Lite/4.4BSD-Lite-CVS'],
@@ -408,6 +408,15 @@ $allow_annotate = 1;
# allow pretty-printed version of files
$allow_markup = 1;
+# allow extra hlink formatting (such as PR xrefs) in logs
+$allow_log_extra = 1; # default: enabled
+
+# allow extra hlink formatting (such as PR xrefs) in directories
+$allow_dir_extra = 1;
+
+# allow extra hlink formatting in source code/formatted diff views
+$allow_source_extra = 1;
+
# allow compression with gzip
# of output if the Browser accepts
# it (HTTP_ACCEPT_ENCODING=gzip)
diff --git a/en/cgi/cvsweb.conf-netbsd b/en/cgi/cvsweb.conf-netbsd
index 961c8c9b1d..1c1ef3486d 100644
--- a/en/cgi/cvsweb.conf-netbsd
+++ b/en/cgi/cvsweb.conf-netbsd
@@ -3,10 +3,10 @@
# Set up for NetBSD repo options.
#
# $Idaemons: /home/cvs/cvsweb/cvsweb.conf-netbsd,v 1.5 2001/08/01 09:32:22 knu Exp $
-# $FreeBSD: www/en/cgi/cvsweb.conf-netbsd,v 1.10 2001/11/07 21:25:16 knu Exp $
+# $FreeBSD: www/en/cgi/cvsweb.conf-netbsd,v 1.11 2002/04/10 20:13:19 knu Exp $
if ($uname eq 'FreeBSD') {
- $ENV{'RCSLOCALID'} = 'NetBSD=CVSHeader';
+ $ENV{'RCSLOCALID'} = 'NetBSD=Id';
$ENV{'RCSINCEXC'} = 'iNetBSD';
} else {
$ENV{'RCSLOCALID'} = 'NetBSD';
diff --git a/en/cgi/cvsweb.conf-openbsd b/en/cgi/cvsweb.conf-openbsd
index 6376e79be5..e2d847f934 100644
--- a/en/cgi/cvsweb.conf-openbsd
+++ b/en/cgi/cvsweb.conf-openbsd
@@ -3,10 +3,10 @@
# Set up for OpenBSD repo options.
#
# $Idaemons: /home/cvs/cvsweb/cvsweb.conf-openbsd,v 1.5 2001/08/01 09:32:22 knu Exp $
-# $FreeBSD: www/en/cgi/cvsweb.conf-openbsd,v 1.8 2001/11/07 21:25:16 knu Exp $
+# $FreeBSD: www/en/cgi/cvsweb.conf-openbsd,v 1.9 2002/04/10 20:13:19 knu Exp $
if ($uname eq 'FreeBSD') {
- $ENV{'RCSLOCALID'} = 'OpenBSD=CVSHeader';
+ $ENV{'RCSLOCALID'} = 'OpenBSD=Id';
$ENV{'RCSINCEXC'} = 'iOpenBSD';
} else {
$ENV{'RCSLOCALID'} = 'OpenBSD';