os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge from FreeBSD-CVSweb 2.0.6 (really).

Browse source
This commit is contained in:
Ville Skyttä 2002-09-30 20:14:06 +00:00
parent 90a5b58b31
commit aab19e1844
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/www/; revision=14442
5 changed files with 65 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

91
en/cgi/cvsweb.cgi
View file

@ -45,10 +45,9 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE. # SUCH DAMAGE.
# #
# FreeBSD: projects/cvsweb/cvsweb.cgi,v 1.119 2002/07/23 13:58:32 scop Exp # $Id: cvsweb.cgi,v 1.87 2002-09-30 20:14:06 scop Exp $
# $Id: cvsweb.cgi,v 1.86 2002-09-26 22:18:25 scop Exp $
# $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.84 2001/10/07 20:50:10 knu Exp $ # $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.84 2001/10/07 20:50:10 knu Exp $
# $FreeBSD: www/en/cgi/cvsweb.cgi,v 1.1.1.34 2002/09/26 22:09:02 scop Exp $ # $FreeBSD: www/en/cgi/cvsweb.cgi,v 1.1.1.36 2002/09/30 19:48:52 scop Exp $
# #
### ###
@ -94,7 +93,7 @@ use vars qw (
$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 @gzip_options @zip_options @cvs_options $allow_tar @tar_options @gzip_options @zip_options @cvs_options
$LOG_FILESEPARATOR $LOG_REVSEPARATOR @annotate_options $LOG_FILESEPARATOR $LOG_REVSEPARATOR
$tmpdir $HTML_DOCTYPE $HTML_META $tmpdir $HTML_DOCTYPE $HTML_META
); );
@ -150,7 +149,7 @@ sub forbidden_module($);
##### Start of Configuration Area ######## ##### Start of Configuration Area ########
delete $ENV{PATH}; delete $ENV{PATH};
$cvsweb_revision = '2.0.5'; $cvsweb_revision = '2.0.6';
use File::Basename (); use File::Basename ();
@ -237,7 +236,7 @@ $LOG_REVSEPARATOR = q/^-{28}$/;
); );
$cgi_style::hsty_base = 'http://www.FreeBSD.org'; $cgi_style::hsty_base = 'http://www.FreeBSD.org';
$_ = q$FreeBSD: www/en/cgi/cvsweb.cgi,v 1.1.1.34 2002/09/26 22:09:02 scop Exp $; $_ = q$FreeBSD: www/en/cgi/cvsweb.cgi,v 1.86 2002/09/26 22:18:25 scop Exp $;
@_ = split; @_ = split;
$cgi_style::hsty_date = "@_[3,4]"; $cgi_style::hsty_date = "@_[3,4]";
@ -481,8 +480,7 @@ if ($input{'cvsroot'} && $CVSROOT{$input{'cvsroot'}}) {
$cvsroot = $CVSROOT{$cvstree}; $cvsroot = $CVSROOT{$cvstree};
# create icons out of description # create icons out of description
my $k; foreach my $k (keys %ICONS) {
foreach $k (keys %ICONS) {
no strict 'refs'; no strict 'refs';
my ($itxt, $ipath, $iwidth, $iheight) = @{$ICONS{$k}}; my ($itxt, $ipath, $iwidth, $iheight) = @{$ICONS{$k}};
if ($ipath) { if ($ipath) {
@ -494,7 +492,6 @@ foreach $k (keys %ICONS) {
${"${k}icon"} = $itxt; ${"${k}icon"} = $itxt;
} }
} }
undef $k;
my $config_cvstree = "$config-$cvstree"; my $config_cvstree = "$config-$cvstree";
@ -825,39 +822,37 @@ if (-d $fullname) {
my $filesexists; my $filesexists;
my $filesfound; my $filesfound;
foreach (sort { &fileSortCmp } @dir) { foreach my $file (sort { &fileSortCmp } @dir) {
if ($_ eq '.') {
next; next if ($file eq '.');
}
# ignore CVS lock and stale NFS files # ignore CVS lock and stale NFS files
next if (/^#cvs\.|^,|^\.nfs/); next if ($file =~ /^#cvs\.|^,|^\.nfs/);
# Check whether to show the CVSROOT path # Check whether to show the CVSROOT path
next if ($input{'hidecvsroot'} && ($_ eq 'CVSROOT')); next if ($input{'hidecvsroot'} && $file eq 'CVSROOT');
# Check whether the module is in the restricted list # Check whether the module is in the restricted list
next if ($_ && &forbidden_module($_)); next if ($file && &forbidden_module($file));
# Ignore non-readable files # Ignore non-readable files
next if ($input{'hidenonreadable'} && !(-r "$fullname/$_")); next if ($input{'hidenonreadable'} && !(-r "$fullname/$file"));
if (s|^Attic/||) { if ($file =~ s|^Attic/||) {
$attic = " (in the Attic) " . $hideAtticToggleLink; $attic = " (in the Attic) " . $hideAtticToggleLink;
} else { } else {
$attic = ""; $attic = "";
} }
if ($_ eq '..' || -d "$fullname/$_") { if ($file eq '..' || -d "$fullname/$file") {
next if ($_ eq '..' && $where eq '/'); next if ($file eq '..' && $where eq '/');
my ($rev, $date, $log, $author, $filename); my ($rev, $date, $log, $author, $filename) =
($rev, $date, $log, $author, $filename) = @{$fileinfo{$file}}
@{$fileinfo{$_}} if (defined($fileinfo{$file}));
if (defined($fileinfo{$_}));
printf "<tr style=\"background-color: %s\">\n<td>", printf "<tr style=\"background-color: %s\">\n<td>",
$tabcolors[$dirrow % 2] if $dirtable; $tabcolors[$dirrow % 2] if $dirtable;
if ($_ eq '..') { if ($file eq '..') {
$url = "../$query"; $url = "../$query";
if ($nofilelinks) { if ($nofilelinks) {
print $backicon; print $backicon;
@ -866,17 +861,17 @@ if (-d $fullname) {
} }
print '&nbsp;', &link("Parent Directory", $url); print '&nbsp;', &link("Parent Directory", $url);
} else { } else {
$url = './' . urlencode($_) . "/$query"; $url = './' . urlencode($file) . "/$query";
print "<a name=\"$_\"></a>"; print "<a name=\"$file\"></a>";
if ($nofilelinks) { if ($nofilelinks) {
print $diricon; print $diricon;
} else { } else {
print &link($diricon, $url); print &link($diricon, $url);
} }
print '&nbsp;', &link("$_/", $url), $attic; print '&nbsp;', &link("$file/", $url), $attic;
if ($_ eq "Attic") { if ($file eq "Attic") {
print "&nbsp; "; print "&nbsp; ";
print &link( print &link(
"[Don't hide]", "[Don't hide]",
@ -919,7 +914,7 @@ if (-d $fullname) {
} }
} else { } else {
my ($dwhere) = my ($dwhere) =
($where ne "/" ? $where : "") . $_; ($where ne "/" ? $where : "") . $file;
if ($use_descriptions if ($use_descriptions
&& defined $descriptions{$dwhere}) && defined $descriptions{$dwhere})
@ -946,33 +941,29 @@ if (-d $fullname) {
print "<br>\n"; print "<br>\n";
} }
$dirrow++; $dirrow++;
} elsif (s/,v$//) { } elsif ($file =~ s/,v$//) {
# Skip forbidden files now so we'll give no hint # Skip forbidden files now so we'll give no hint
# about their existence. This should probably have # about their existence. This should probably have
# been done earlier, but it's straightforward here. # 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; $url = './' . $fileurl . $query;
my $rev = '';
my $date = '';
my $log = '';
my $author = '';
$filesexists++; $filesexists++;
next if (!defined($fileinfo{$_})); next if (!defined($fileinfo{$file}));
($rev, $date, $log, $author) = @{$fileinfo{$_}}; my ($rev, $date, $log, $author) = @{$fileinfo{$file}};
$filesfound++; $filesfound++;
printf "<tr style=\"background-color: %s\">\n<td>", printf "<tr style=\"background-color: %s\">\n<td>",
$tabcolors[$dirrow % 2] if $dirtable; $tabcolors[$dirrow % 2] if $dirtable;
print "<a name=\"$_\"></a>"; print "<a name=\"$file\"></a>";
if ($nofilelinks) { if ($nofilelinks) {
print $fileicon; print $fileicon;
} else { } else {
print &link($fileicon, $url); print &link($fileicon, $url);
} }
print '&nbsp;', &link($_, $url), $attic; print '&nbsp;', &link(htmlquote($file), $url), $attic;
print "</td>\n<td>&nbsp;" if ($dirtable); print "</td>\n<td>&nbsp;" if ($dirtable);
download_link($fileurl, $rev, $rev, download_link($fileurl, $rev, $rev,
$defaultViewable ? "text/x-cvsweb-markup" : $defaultViewable ? "text/x-cvsweb-markup" :
@ -1426,6 +1417,7 @@ sub spacedHtmlText($;$) {
return $_; return $_;
} }
# Note that this doesn't htmlquote the first argument...
sub link($$) { sub link($$) {
my ($name, $url) = @_; my ($name, $url) = @_;
@ -1627,16 +1619,27 @@ sub doAnnotate($$) {
$| = 1; $| = 1;
$| = 0; # Flush $| = 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 # this annotate version is based on the
# cvs annotate-demo Perl script by Cyclic Software # cvs annotate-demo Perl script by Cyclic Software
# It was written by Cyclic Software, http://www.cyclic.com/, and is in # It was written by Cyclic Software, http://www.cyclic.com/, and is in
# 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, $CMD{cvs}, @cvs_options, "server") $pid = open2($reader, $writer, $CMD{cvs}, @annotate_options, 'server')
or fatal("500 Internal Error", or fatal("500 Internal Error",
'Fatal Error - unable to open cvs for annotation'); '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: # OK, first send the request to the server. A simplified example is:
# Root /home/kingdon/zwork/cvsroot # Root /home/kingdon/zwork/cvsroot
# Argument foo/xx # Argument foo/xx
@ -1780,6 +1783,8 @@ sub doAnnotate($$) {
} else { } else {
print "</pre>"; print "</pre>";
} }
html_footer();
close($reader) or warn "cannot close: $!"; close($reader) or warn "cannot close: $!";
wait; wait;
} }
@ -2122,7 +2127,7 @@ sub getDirLogs($$@) {
push (@files, &safeglob("$DirName/*,v")); push (@files, &safeglob("$DirName/*,v"));
push (@files, &safeglob("$DirName/Attic/*,v")) push (@files, &safeglob("$DirName/Attic/*,v"))
if (!$input{'hideattic'}); if (!$input{'hideattic'});
foreach $file (@otherFiles) { foreach my $file (@otherFiles) {
push (@files, "$DirName/$file"); push (@files, "$DirName/$file");
} }

17
en/cgi/cvsweb.conf
View file

@ -8,10 +8,9 @@
# 2002 V. Skyttä <scop@FreeBSD.org> # 2002 V. Skyttä <scop@FreeBSD.org>
# based on work by Bill Fenner <fenner@FreeBSD.org> # based on work by Bill Fenner <fenner@FreeBSD.org>
# #
# FreeBSD: projects/cvsweb/cvsweb.conf,v 1.36 2002/07/10 15:30:56 scop Exp # $Id: cvsweb.conf,v 1.33 2002-09-30 20:14:06 scop Exp $
# $Id: cvsweb.conf,v 1.32 2002-09-26 22:18:25 scop Exp $
# $Idaemons: /home/cvs/cvsweb/cvsweb.conf,v 1.27 2001/08/01 09:48:39 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.1.1.21 2002/09/26 22:09:02 scop Exp $ # $FreeBSD: www/en/cgi/cvsweb.conf,v 1.1.1.23 2002/09/30 19:48:52 scop Exp $
# #
### ###
@ -507,12 +506,24 @@ $allow_tar = '';
# compression, or higher, for better compression. # compression, or higher, for better compression.
# Options to pass to cvs(1). # Options to pass to cvs(1).
# For cvs versions prior to 1.11, the '-l' option doesn't work; If you want
# working checkouts with an older cvs version, you'll have to make sure that
# the cvsweb user can read and write to CVSROOT/history.
@cvs_options = qw(-lf); @cvs_options = qw(-lf);
push @cvs_options, '-R' if ($uname eq 'FreeBSD' || $uname eq 'OpenBSD'); push @cvs_options, '-R' if ($uname eq 'FreeBSD' || $uname eq 'OpenBSD');
push @cvs_options, '-u' if ($uname eq 'NetBSD');
# Only FreeBSD's and OpenBSD's cvs(1) supports -R (read only access # Only FreeBSD's and OpenBSD's cvs(1) supports -R (read only access
# mode) option, which considerably speeds up checkouts over NFS. # mode) option, which considerably speeds up checkouts over NFS.
# A similar effect is provided by -u on NetBSD.
# Options to pass to the 'cvs annotate' command, usually the normal
# @cvs_options are good enough here.
@annotate_options = @cvs_options;
# To make annotate work against a read only repository, add -n, e.g.:
# @annotate_options = (@cvs_options, '-n');
1; 1;

2
en/cgi/cvsweb.conf-freebsd
View file

@ -3,7 +3,7 @@
# Set up for FreeBSD repo options. # Set up for FreeBSD repo options.
# #
# $Idaemons: /home/cvs/cvsweb/cvsweb.conf-freebsd,v 1.5 2001/08/01 09:32:22 knu Exp $ # $Idaemons: /home/cvs/cvsweb/cvsweb.conf-freebsd,v 1.5 2001/08/01 09:32:22 knu Exp $
# $FreeBSD: www/en/cgi/cvsweb.conf-freebsd,v 1.1.1.6 2002/09/26 22:09:02 scop Exp $ # $FreeBSD: www/en/cgi/cvsweb.conf-freebsd,v 1.1.1.8 2002/09/30 19:48:52 scop Exp $
if ($uname eq 'FreeBSD') { if ($uname eq 'FreeBSD') {
$ENV{'RCSLOCALID'} = 'FreeBSD=CVSHeader'; $ENV{'RCSLOCALID'} = 'FreeBSD=CVSHeader';

2
en/cgi/cvsweb.conf-netbsd
View file

@ -3,7 +3,7 @@
# Set up for NetBSD repo options. # Set up for NetBSD repo options.
# #
# $Idaemons: /home/cvs/cvsweb/cvsweb.conf-netbsd,v 1.5 2001/08/01 09:32:22 knu Exp $ # $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.1.1.7 2002/09/26 22:09:02 scop Exp $ # $FreeBSD: www/en/cgi/cvsweb.conf-netbsd,v 1.1.1.9 2002/09/30 19:48:52 scop Exp $
if ($uname eq 'FreeBSD') { if ($uname eq 'FreeBSD') {
$ENV{'RCSLOCALID'} = 'NetBSD=Id'; $ENV{'RCSLOCALID'} = 'NetBSD=Id';

2
en/cgi/cvsweb.conf-openbsd
View file

@ -3,7 +3,7 @@
# Set up for OpenBSD repo options. # Set up for OpenBSD repo options.
# #
# $Idaemons: /home/cvs/cvsweb/cvsweb.conf-openbsd,v 1.5 2001/08/01 09:32:22 knu Exp $ # $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.1.1.7 2002/09/26 22:09:02 scop Exp $ # $FreeBSD: www/en/cgi/cvsweb.conf-openbsd,v 1.1.1.9 2002/09/30 19:48:52 scop Exp $
if ($uname eq 'FreeBSD') { if ($uname eq 'FreeBSD') {
$ENV{'RCSLOCALID'} = 'OpenBSD=Id'; $ENV{'RCSLOCALID'} = 'OpenBSD=Id';