=================================================================== RCS file: /cvs/cvsweb/cvsweb.cgi,v retrieving revision 1.22 retrieving revision 1.33 diff -u -p -r1.22 -r1.33 --- cvsweb/cvsweb.cgi 1998/08/13 10:35:26 1.22 +++ cvsweb/cvsweb.cgi 1999/09/06 07:02:40 1.33 @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $fId: cvsweb.cgi,v 1.21 1998/07/23 09:42:40 wosch Exp $ +# $FreeBSD$ # @@ -62,15 +62,20 @@ require 'cgi-style.pl'; %CVSROOT = ( 'freebsd', '/home/ncvs', 'learn', '/c/learncvs', - 'mozilla', '/a/mozilla-cvs', ); %CVSROOTdescr = ( 'freebsd', 'FreeBSD', 'learn', 'Learn', - 'mozilla', 'Mozilla FreeBSD', ); +%mirrors = ( + 'Germany', 'http://www.de.freebsd.org/cgi/cvsweb.cgi', + 'Spain', 'http://www.es.freebsd.org/cgi/cvsweb.cgi', + 'California', 'http://www.freebsd.org/cgi/cvsweb.cgi', + 'Japan', 'http://www.jp.freebsd.org/cgi/cvsweb.cgi', + ); + $cvstreedefault = 'freebsd'; $cvstree = $cvstreedefault; $cvsroot = $CVSROOT{"$cvstree"} || "/home/ncvs"; @@ -144,13 +149,13 @@ if (!-d $cvsroot) { { local(@foo, $i); local($scriptname) = $ENV{'SCRIPT_NAME'}; - foreach (keys %CVSROOT) { + foreach (sort keys %CVSROOT) { if (-d $CVSROOT{$_}) { push(@foo, $_); } } if ($#foo > 1) { - $intro .= "
\nThis script support the following CVS trees:\n"; + $intro .= "
\nThis script supports the following CVS trees:\n";
for($i = 0; $i <= $#foo; $i++) {
$intro .= qq{} .
($CVSROOTdescr{$foo[$i]} ?
@@ -161,6 +166,20 @@ if (!-d $cvsroot) {
}
+{
+ local(@mirrors) = sort keys %mirrors;;
+ if ($#mirrors >= 0) {
+ $intro .= " \nThis script is mirrored in:\n";
+ local($m);
+ for($m = 0; $m <= $#mirrors; $m++) {
+ $intro .= qq($mirrors[$m]);
+ $intro .= ',' if $m != $#mirrors;
+ $intro .= "\n";
+ }
+ }
+}
+
+
if (-d $fullname) {
opendir(DIR, $fullname) || &fatal("404 Not Found","$where: $!");
@dir = readdir(DIR);
@@ -310,7 +329,7 @@ sub htmlify {
$string =~ s/>/>/g;
if ($pr) {
- $string =~ s|\bpr(\W+[a-z]+/\W*)(\d+)|$&|ig;
+ $string =~ s!\b((pr[:#]?\s*#?)|((bin|conf|docs|gnu|i386|kern|misc|ports)\/))(\d+)\b!$&!ig;
}
$string;
@@ -410,7 +429,9 @@ sub checkout {
"Unexpected output from co: $_");
}
$_ =
CVS Tags: $revsym{$_}";
}