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

Grr... Pass me a pointy hat. Fix bogus flaw in merger and the @INC

Browse source 
problem under -T option.
This commit is contained in:
Akinori MUSHA 2001-01-03 07:40:09 +00:00
parent 7a68490f44
commit 7ba234363e
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/www/; revision=8632
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
en/cgi/cvsweb.cgi
View file

@ -43,8 +43,8 @@
# SUCH DAMAGE. # SUCH DAMAGE.
# #
# $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $ # $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $
# $Id: cvsweb.cgi,v 1.65 2001-01-03 03:46:29 knu Exp $ # $Id: cvsweb.cgi,v 1.66 2001-01-03 07:40:09 knu Exp $
# $FreeBSD: www/en/cgi/cvsweb.cgi,v 1.64 2001/01/02 12:45:29 knu Exp $ # $FreeBSD: www/en/cgi/cvsweb.cgi,v 1.65 2001/01/03 03:46:29 knu Exp $
# #
### ###
@ -53,7 +53,7 @@ require 5.000;
use strict; use strict;
use vars qw ( use vars qw (
$config $allow_version_select $verbose $mydir $config $allow_version_select $verbose
@CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr @CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr
%MIRRORS %DEFAULTVALUE %ICONS %MTYPES %MIRRORS %DEFAULTVALUE %ICONS %MTYPES
@DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS
@ -136,14 +136,16 @@ sub forbidden_module($);
##### Start of Configuration Area ######## ##### Start of Configuration Area ########
use File::Basename; use File::Basename;
($mydir) = (dirname($0) =~ /(.*)/); # untaint
# == EDIT this == # == EDIT this ==
# Locations to search for user configuration, in order: # Locations to search for user configuration, in order:
for ( for (
(dirname $0) . '/cvsweb.conf', "$mydir/cvsweb.conf",
'/usr/local/etc/cvsweb/cvsweb.conf' '/usr/local/etc/cvsweb/cvsweb.conf'
) { ) {
if (defined($_) && -r $_) { if (defined($_) && -r $_) {
($config) = /(.*)/; # untaint $config = $_;
last; last;
} }
} }
@ -222,7 +224,7 @@ $LOG_REVSEPARATOR = q/^-{28}$/;
##### End of configuration variables ##### ##### End of configuration variables #####
$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.64 2001/01/02 12:45:29 knu Exp $; $_ = q$FreeBSD: www/en/cgi/cvsweb.cgi,v 1.65 2001/01/03 03:46:29 knu Exp $;
@_ = split; @_ = split;
$cgi_style::hsty_date = "@_[3,4]"; $cgi_style::hsty_date = "@_[3,4]";
@ -230,7 +232,7 @@ $cgi_style::hsty_date = "@_[3,4]";
0 if $cgi_style::hsty_base ne $cgi_style::hsty_date; 0 if $cgi_style::hsty_base ne $cgi_style::hsty_date;
package cgi_style; package cgi_style;
require 'cgi-style.pl'; require "$main::mydir/cgi-style.pl";
package main; package main;
##### End of configuration variables ##### ##### End of configuration variables #####
@ -2752,7 +2754,7 @@ sub navigateHeader($$$$$) {
print qq`<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">`; print qq`<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">`;
print "<HTML>\n<HEAD>\n"; print "<HTML>\n<HEAD>\n";
print qq`<META name="robots" content="nofollow">\n`; print qq`<META name="robots" content="nofollow">\n`;
print '<!-- CVSweb $zRevision: 1.104 $ $Revision: 1.65 $ -->'; print '<!-- CVSweb $zRevision: 1.104 $ $Revision: 1.66 $ -->';
print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n"; print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n";
print "$body_tag_for_src\n"; print "$body_tag_for_src\n";
print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">"; print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">";
@ -3147,7 +3149,7 @@ sub http_header(;$) {
sub html_header($) { sub html_header($) {
my ($title) = @_; my ($title) = @_;
my $version = '$zRevision: 1.104 $ $Revision: 1.65 $'; #' my $version = '$zRevision: 1.104 $ $Revision: 1.66 $'; #'
http_header(defined($charset) ? "text/html; charset=$charset" : "text/html"); http_header(defined($charset) ? "text/html; charset=$charset" : "text/html");
(my $header = &cgi_style::html_header) =~ s/^.*\n\n//; # remove HTTP response header (my $header = &cgi_style::html_header) =~ s/^.*\n\n//; # remove HTTP response header

8
en/cgi/cvsweb.conf
View file

@ -7,8 +7,8 @@
# 2000 A. MUSHA <knu@FreeBSD.org> # 2000 A. MUSHA <knu@FreeBSD.org>
# based on work by Bill Fenner <fenner@FreeBSD.org> # based on work by Bill Fenner <fenner@FreeBSD.org>
# $zId: cvsweb.conf,v 1.27 2000/07/27 10:16:39 kcoar Exp $ # $zId: cvsweb.conf,v 1.27 2000/07/27 10:16:39 kcoar Exp $
# $Id: cvsweb.conf,v 1.13 2001-01-03 03:46:29 knu Exp $ # $Id: cvsweb.conf,v 1.14 2001-01-03 07:40:09 knu Exp $
# $FreeBSD: www/en/cgi/cvsweb.conf,v 1.12 2001/01/02 12:45:29 knu Exp $ # $FreeBSD: www/en/cgi/cvsweb.conf,v 1.13 2001/01/03 03:46:29 knu Exp $
# #
### ###
@ -36,7 +36,7 @@
# This tree is enabled by default when # This tree is enabled by default when
# you enter the page # you enter the page
$cvstreedefault = 'freebsd'; $cvstreedefault = $CVSrepositories[2 * 0]; # The first one
############## ##############
# Mirror Sites # Mirror Sites
@ -49,8 +49,6 @@ $cvstreedefault = 'freebsd';
'USA, California' => 'http://www.FreeBSD.org/cgi/cvsweb.cgi', 'USA, California' => 'http://www.FreeBSD.org/cgi/cvsweb.cgi',
'Japan' => 'http://www.jp.FreeBSD.org/cgi/cvsweb.cgi', 'Japan' => 'http://www.jp.FreeBSD.org/cgi/cvsweb.cgi',
); );
=======
$cvstreedefault = $CVSrepositories[2 * 0]; # The first one
############## ##############
# Bug tracking system options # Bug tracking system options