===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.18
retrieving revision 1.23
diff -u -p -r1.18 -r1.23
--- cvsweb/cvsweb.cgi	1998/05/08 10:14:10	1.18
+++ cvsweb/cvsweb.cgi	1998/08/15 09:59:11	1.23
@@ -3,8 +3,35 @@
 # cvsweb - a CGI interface to the CVS tree.
 #
 # Written by Bill Fenner <fenner@parc.xerox.com> on his own time.
-# Insert BSD copyright here.
 #
+# Copyright (c) 1996-1998 Bill Fenner
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $fId: cvsweb.cgi,v 1.22 1998/08/13 10:35:26 wosch Exp $
+#
+
+
 #HTTP_USER_AGENT: Mozilla/1.1N (X11; I; SunOS 4.1.3_U1 sun4m) via proxy gateway CERN-HTTPD/3.0 libwww/2.17
 #SERVER_NAME: www.freebsd.org
 #QUERY_STRING: baz
@@ -34,14 +61,12 @@ require 'cgi-style.pl';
 
 %CVSROOT = (
 	    'freebsd', '/home/ncvs',
-	    'openbsd', '/home/OpenBSD/cvs',
 	    'learn', '/c/learncvs',
 	    'mozilla', '/a/mozilla-cvs',
 	    );
 
 %CVSROOTdescr = (
 	    'freebsd', 'FreeBSD',
-	    'openbsd', 'OpenBSD',
 	    'learn', 'Learn',
 	    'mozilla', 'Mozilla FreeBSD',
 	    );
@@ -119,7 +144,7 @@ if (!-d $cvsroot) {
 {
     local(@foo, $i);
     local($scriptname) = $ENV{'SCRIPT_NAME'};
-    foreach (keys %CVSROOT) {
+    foreach (sort keys %CVSROOT) {
 	if (-d $CVSROOT{$_}) {
 	    push(@foo, $_);
 	}
@@ -148,8 +173,9 @@ if (-d $fullname) {
 	    print $shortinstr;
 	}
 	print "<p>";
-	print "Current CVS tree: <b>$cvstree</b><br>\n"
-	    if $cvstree ne $cvstreedefault;
+	print "Current CVS tree: <b>",
+		($CVSROOTdescr{"$cvstree"} ? $CVSROOTdescr{"$cvstree"} :
+			$cvstree), "</b><br>\n";
 	print "Current directory: <b>/$where</b>\n";
 	print "<P><HR NOSHADE>\n";
 	# Using <MENU> in this manner violates the HTML2.0 spec but
@@ -174,7 +200,8 @@ if (-d $fullname) {
 	    if ($_ eq '.') {
 		next;
 	    }
-	    next if $_ eq '#cvs.lock';
+	    # ignore CVS lock and stale NFS files
+	    next if /^#cvs\.|^,|^\.nfs/;
 
 	    if (s|^Attic/||) {
 		$attic = " (in the Attic)";