===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.4
retrieving revision 1.10
diff -u -p -r1.4 -r1.10
--- cvsweb/cvsweb.cgi	1997/02/03 20:47:12	1.4
+++ cvsweb/cvsweb.cgi	1997/11/14 17:36:47	1.10
@@ -31,7 +31,17 @@ require 'ctime.pl';
 $hsty_base = "";
 require 'cgi-style.pl';
 
-$cvsroot = '/home/ncvs';
+%CVSROOT = (
+	    'freebsd', '/home/ncvs',
+	    'openbsd', '/home/OpenBSD/cvs',
+	    'learn', '/c/learncvs',
+	    );
+
+$cvstreedefault = 'freebsd';
+$cvstree = $cvstreedefault;
+$cvsroot = $CVSROOT{"$cvstree"} || "/home/ncvs";
+
+
 $intro = "
 This is a WWW interface to the FreeBSD CVS tree.
 You can browse the file hierarchy by picking directories
@@ -44,8 +54,12 @@ diffs between that revision and the previous one, and
 a form at the bottom of the page that allows you to
 display diffs between arbitrary revisions.
 <p>
+If you would like to use this CGI script on your own web server and
+CVS tree, see <A HREF=\"http://www.freebsd.org/~fenner/cvsweb/\">
+the CVSWeb distribution site</A>.
+<p>
 Please send any suggestions, comments, etc. to
-<A HREF=\"mailto:fenner@freebsd.org\">Bill Fenner &lt;fenner@freebsd.org&gt;</A>
+<A HREF=\"mailto:fenner\@freebsd.org\">Bill Fenner &lt;fenner\@freebsd.org&gt;</A>
 ";
 $shortinstr = "
 Click on a directory to enter that directory. Click on a file to display
@@ -56,22 +70,40 @@ chance to display diffs between revisions. 
 $verbose = $v;
 ($where = $ENV{'PATH_INFO'}) =~ s|^/||;
 $where =~ s|/$||;
-$fullname = $cvsroot . '/' . $where;
 ($scriptname = $ENV{'SCRIPT_NAME'}) =~ s|^/?|/|;
 $scriptname =~ s|/$||;
 $scriptwhere = $scriptname . '/' . $where;
 $scriptwhere =~ s|/$||;
 
+
+if ($query = $ENV{'QUERY_STRING'}) {
+    foreach (split(/&/, $query)) {
+	s/%(..)/sprintf("%c", hex($1))/ge;	# unquote %-quoted
+	if (/(\S+)=(.*)/) {
+	    $input{$1} = $2;
+	} else {
+	    $input{$_}++;
+	}
+    }
+    $query = "?" . $query;
+}
+
+
+
+if ($input{'cvsroot'}) {
+    if ($CVSROOT{$input{'cvsroot'}}) {
+	$cvstree = $input{'cvsroot'};
+	$cvsroot = $CVSROOT{"$cvstree"};
+    }
+}
+
+$fullname = $cvsroot . '/' . $where;
 if (!-d $cvsroot) {
 	&fatal("500 Internal Error",'$CVSROOT not found!');
 }
+
+
 if (-d $fullname) {
-# Something that would be nice to support, although I have no real
-# good idea of how, would be to get full directory diff's, using
-# symbolic names (revision numbers would be meaningless).
-# The problem is finding a list of symbolic names that is common
-# to all the files in the directory.
-#
 	opendir(DIR, $fullname) || &fatal("404 Not Found","$where: $!");
 	@dir = readdir(DIR);
 	closedir(DIR);
@@ -88,151 +120,87 @@ if (-d $fullname) {
 	# provides the results that I want in most browsers.  Another
 	# case of layout spooging up HTML.
 	print "<MENU>\n";
-	foreach (sort @dir) {
+	lookingforattic:
+	for ($i = 0; $i <= $#dir; $i++) {
+		if ($dir[$i] eq "Attic") {
+			last lookingforattic;
+		}
+	}
+	if (!$input{"showattic"} && ($i <= $#dir) &&
+				opendir(DIR, $fullname . "/Attic")) {
+		splice(@dir, $i, 1,
+			grep((s|^|Attic/|,!m|/\.|), readdir(DIR)));
+		closedir(DIR);
+	}
+	# Sort without the Attic/ pathname.
+	foreach (sort {($c=$a)=~s|.*/||;($d=$b)=~s|.*/||;($c cmp $d)} @dir) {
 	    if ($_ eq '.') {
 		next;
 	    }
+	    if (s|^Attic/||) {
+		$attic = " (in the Attic)";
+	    } else {
+		$attic = "";
+	    }
 	    if ($_ eq '..') {
 		next if ($where eq '');
 		($updir = $scriptwhere) =~ s|[^/]+$||;
 		print "<IMG SRC=\"/icons/back.gif\"> ",
-		    &link("Previous Directory",$updir), "<BR>";
+		    &link("Previous Directory",$updir . $query), "<BR>";
+#		print "<IMG SRC=???> ",
+#		    &link("Directory-wide diffs", $scriptwhere . '/*'), "<BR>";
 	    } elsif (-d $fullname . "/" . $_) {
 		print "<IMG SRC=\"/icons/dir.gif\"> ",
-		    &link($_ . "/", $scriptwhere . '/' . $_ . '/'), "<BR>";
+		    &link($_ . "/", $scriptwhere . '/' . $_ . '/' . $query), $attic, "<BR>";
 	    } elsif (s/,v$//) {
+# TODO: add date/time?  How about sorting?
 		print "<IMG SRC=\"/icons/text.gif\"> ",
-		    &link($_, $scriptwhere . '/' . $_), "<BR>";
+		    &link($_, $scriptwhere . '/' .
+			    ($attic ? "Attic/" : "") . $_ . $query),
+		    $attic, "<BR>";
 	    }
 	}
 	print "</MENU>\n";
+	if ($input{"only_on_branch"}) {
+	    print "<HR><FORM METHOD=\"GET\" ACTION=\"${scriptwhere}\">\n";
+	    print "Currently showing only branch $input{'only_on_branch'}.\n";
+	    $input{"only_on_branch"}="";
+	    foreach $k (keys %input) {
+		print "<INPUT TYPE=hidden NAME=$k VALUE=$input{$k}>\n" if $input{$k};
+	    }
+	    print "<INPUT TYPE=SUBMIT VALUE=\"Show all branches\">\n";
+	    print "</FORM>\n";
+	}
+	$formwhere = $scriptwhere;
+	$formwhere =~ s|Attic/?$|| if ($input{"showattic"});
+	print "<HR><FORM METHOD=\"GET\" ACTION=\"${formwhere}\">\n";
+	$input{"showattic"}=!$input{"showattic"};
+	foreach $k (keys %input) {
+	    print "<INPUT TYPE=hidden NAME=$k VALUE=$input{$k}>\n" if $input{$k};
+	}
+	print "<INPUT TYPE=SUBMIT VALUE=\"";
+	print ($input{"showattic"} ? "Show" : "Hide");
+	print " attic directories\">\n";
+	print "</FORM>\n";
 	print &html_footer;
 	print "</BODY></HTML>\n";
 } elsif (-f $fullname . ',v') {
-	if ($_ = $ENV{'QUERY_STRING'}) {
-	    s/%(..)/sprintf("%c", hex($1))/ge;	# unquote %-quoted
-	    if (/rev=([\d\.]+)/) {
-		$rev = $1;
-		open(RCS, "co -p$rev '$fullname' 2>&1 |") ||
-		    &fail("500 Internal Error", "Couldn't co: $!");
-# /home/ncvs/src/sys/netinet/igmp.c,v  -->  standard output
-# revision 1.1.1.2
-# /*
-		$_ = <RCS>;
-		if (/^$fullname,v\s+-->\s+standard output\s*$/o) {
-		    # As expected
-		} else {
-		    &fatal("500 Internal Error",
-			"Unexpected output from co: $_");
-		}
-		$_ = <RCS>;
-		if (/^revision\s+$rev\s*$/) {
-		    # As expected
-		} else {
-		    &fatal("500 Internal Error",
-			"Unexpected output from co: $_");
-		}
-		$| = 1;
-		print "Content-type: text/plain\n";
-		print "Content-encoding: x-gzip\n\n";
-		open(GZIP, "|gzip -1 -c");	# need lightweight compression
-		print GZIP <RCS>;
-		close(GZIP);
-		close(RCS);
+	if ($input{'rev'} =~ /^[\d\.]+$/) {
+		&checkout($fullname, $input{'rev'});
 		exit;
-	    }
-	    if (/r1=([^&:]+)(:([^&]+))?/) {
-		$rev1 = $1;
-		$sym1 = $3;
-	    }
-	    if ($rev1 eq 'text') {
-		if (/tr1=([^&]+)/) {
-		    $rev1 = $1;
-		}
-	    }
-	    if (/r2=([^&:]+)(:([^&]+))?/) {
-		$rev2 = $1;
-		$sym2 = $3;
-	    }
-	    if ($rev2 eq 'text') {
-		if (/tr2=([^&]+)/) {
-		    $rev2 = $1;
-		}
-	    }
-	    if (!($rev1 =~ /^[\d\.]+$/) || !($rev2 =~ /^[\d\.]+$/)) {
-		&fatal("404 Not Found",
-			"Malformed query \"$ENV{'QUERY_STRING'}\"");
-	    }
-#
-# rev1 and rev2 are now both numeric revisions.
-# Thus we do a DWIM here and swap them if rev1 is after rev2.
-# XXX should we warn about the fact that we do this?
-	    if (&revcmp($rev1,$rev2) > 0) {
-		($tmp1, $tmp2) = ($rev1, $sym1);
-		($rev1, $sym1) = ($rev2, $sym2);
-		($rev2, $sym2) = ($tmp1, $tmp2);
-	    }
-#
-	    $difftype = "-u";
-	    $diffname = "Unidiff";
-	    if (/f=([^&]+)/) {
-		if ($1 eq 'c') {
-		    $difftype = '-c';
-		    $diffname = "Context diff";
-		}
-	    }
-# XXX should this just be text/plain
-# or should it have an HTML header and then a <pre>
-	    print "Content-type: text/plain\n\n";
-	    open(RCSDIFF, "rcsdiff $difftype -r$rev1 -r$rev2 '$fullname' 2>&1 |") ||
-		&fail("500 Internal Error", "Couldn't rcsdiff: $!");
-#
-#===================================================================
-#RCS file: /home/ncvs/src/sys/netinet/tcp_output.c,v
-#retrieving revision 1.16
-#retrieving revision 1.17
-#diff -c -r1.16 -r1.17
-#*** /home/ncvs/src/sys/netinet/tcp_output.c     1995/11/03 22:08:08     1.16
-#--- /home/ncvs/src/sys/netinet/tcp_output.c     1995/12/05 17:46:35     1.17
-#
-# Ideas:
-# - nuke the stderr output if it's what we expect it to be
-# - Add "no differences found" if the diff command supplied no output.
-#
-#*** src/sys/netinet/tcp_output.c     1995/11/03 22:08:08     1.16
-#--- src/sys/netinet/tcp_output.c     1995/12/05 17:46:35     1.17 RELENG_2_1_0
-# (bogus example, but...)
-#
-	    if ($difftype eq '-u') {
-		$f1 = '---';
-		$f2 = '\+\+\+';
-	    } else {
-		$f1 = '\*\*\*';
-		$f2 = '---';
-	    }
-	    while (<RCSDIFF>) {
-		if (m|^$f1 $cvsroot|o) {
-		    s|$cvsroot/||o;
-		    if ($sym1) {
-			chop;
-			$_ .= " " . $sym1 . "\n";
-		    }
-		} elsif (m|^$f2 $cvsroot|o) {
-		    s|$cvsroot/||o;
-		    if ($sym2) {
-			chop;
-			$_ .= " " . $sym2 . "\n";
-		    }
-		}
-		print $_;
-	    }
-	    close(RCSDIFF);
-	    exit;
 	}
+	if ($input{'r1'} && $input{'r2'}) {
+		&dodiff($fullname, $input{'r1'}, $input{'tr1'},
+			$input{'r2'}, $input{'tr2'}, $input{'f'});
+		exit;
+	}
 	open(RCS, "rlog '$fullname'|") || &fatal("500 Internal Error",
 						"Failed to spawn rlog");
 	while (<RCS>) {
 	    print if ($verbose);
+	    if (/^branch:\s+([\d\.]+)/) {
+		$curbranch = $1;
+	    }
 	    if ($symnames) {
 		if (/^\s+([^:]+):\s+([\d\.]+)/) {
 		    $symrev{$1} = $2;
@@ -249,6 +217,12 @@ if (-d $fullname) {
 		last;
 	    }
 	}
+
+	if ($onlyonbranch = $input{'only_on_branch'}) {
+	    ($onlyonbranch = $symrev{$onlyonbranch}) =~ s/\.0\././;
+	    ($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//;
+	}
+
 # each log entry is of the form:
 # ----------------------------
 # revision 3.7.1.1
@@ -268,7 +242,7 @@ if (-d $fullname) {
 	    }
 	    $_ = <RCS>;
 	    print "D:", $_ if ($verbose);
-	    if (m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);\s+author:\s+(\S+);|) {
+	    if (m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);\s+author:\s+(\S+);\s+state:\s+(\S+);|) {
 		$yr = $1;
 		# damn 2-digit year routines
 		if ($yr > 100) {
@@ -276,6 +250,7 @@ if (-d $fullname) {
 		}
 		$date{$rev} = &timelocal($6,$5,$4,$3,$2 - 1,$yr);
 		$author{$rev} = $7;
+		$state{$rev} = $8;
 	    } else {
 		&fatal("500 Internal Error", "Error parsing RCS output: $_");
 	    }
@@ -296,12 +271,13 @@ if (-d $fullname) {
 	print "Done sorting revisions\n" if ($verbose);
 #
 # HEAD is an artificial tag which is simply the highest tag number on the main
-# branch (I think!).  Find it by looking through @revorder; it should at least
-# be near the beginning (In fact, it *should* be the first commit listed on
-# the main branch.)
+# branch, unless there is a branch tag in the RCS file in which case it's the
+# highest revision on that branch.  Find it by looking through @revorder; it
+# is the first commit listed on the appropriate branch.
+	$headrev = $curbranch || "1";
 	revision:
 	for ($i = 0; $i <= $#revorder; $i++) {
-	    if ($revorder[$i] =~ /^\d+\.\d+$/) {
+	    if ($revorder[$i] =~ /^(\S*)\.\d+$/ && $headrev eq $1) {
 		if ($revsym{$revorder[$i]}) {
 		    $revsym{$revorder[$i]} .= ", ";
 		}
@@ -321,6 +297,7 @@ if (-d $fullname) {
 	foreach (sort keys %symrev) {
 	    $rev = $symrev{$_};
 	    if ($rev =~ /^(\d+(\.\d+)+)\.0\.(\d+)$/) {
+		push(@branchnames, $_);
 		#
 		# A revision number of A.B.0.D really translates into
 		# "the highest current revision on branch A.B.D".
@@ -328,8 +305,6 @@ if (-d $fullname) {
 		# If there is no branch A.B.D, then it translates into
 		# the head A.B .
 		#
-		# This is pure speculation.
-		#
 		$head = $1;
 		$branch = $3;
 		$regex = $head . "." . $branch;
@@ -347,16 +322,27 @@ if (-d $fullname) {
 		}
 		$revsym{$rev} .= ", " if ($revsym{$rev});
 		$revsym{$rev} .= $_;
+		if ($rev ne $head) {
+		    $branchpoint{$head} .= ", " if ($branchpoint{$head});
+		    $branchpoint{$head} .= $_;
+		}
 	    }
 	    $sel .= "<OPTION VALUE=\"${rev}:${_}\">$_\n";
 	}
 	print "Done associating revisions with branches\n" if ($verbose);
         print &html_header("CVS log for $where");
-	($upwhere = $where) =~ s|[^/]+$||;
-	print "Up to ", &link($upwhere,$scriptname . "/" . $upwhere);
+	($upwhere = $where) =~ s|(Attic/)?[^/]+$||;
+	print "Up to ", &link($upwhere,$scriptname . "/" . $upwhere . $query);
 	print "<BR>\n";
 	print "<A HREF=\"#diff\">Request diff between arbitrary revisions</A>\n";
 	print "<HR NOSHADE>\n";
+	if ($curbranch) {
+	    print "Default branch is ";
+	    print ($revsym{$curbranch} || $curbranch);
+	} else {
+	    print "No default branch";
+	}
+	print "<BR><HR NOSHADE>\n";
 # The other possible U.I. I can see is to have each revision be hot
 # and have the first one you click do ?r1=foo
 # and since there's no r2 it keeps going & the next one you click
@@ -366,11 +352,13 @@ if (-d $fullname) {
 
 	for ($i = 0; $i <= $#revorder; $i++) {
 	    $_ = $revorder[$i];
+	    ($br = $_) =~ s/\.\d+$//;
+	    next if ($onlyonbranch && $br ne $onlyonbranch &&
+					    $_ ne $onlybranchpoint);
 	    print "<a NAME=\"rev$_\"></a>";
 	    foreach $sym (split(", ", $revsym{$_})) {
 		print "<a NAME=\"$sym\"></a>";
 	    }
-	    ($br = $_) =~ s/\.\d+$//;
 	    if ($revsym{$br} && !$nameprinted{$br}) {
 		foreach $sym (split(", ", $revsym{$br})) {
 		    print "<a NAME=\"$sym\"></a>";
@@ -378,31 +366,33 @@ if (-d $fullname) {
 		$nameprinted{$br}++;
 	    }
 	    print "\n";
-#	    print "RCS revision <b>$_</b>\n";
-	    print "<A HREF=\"$scriptwhere?rev=$_\"><b>$_</b></A>";
+	    print "<A HREF=\"$scriptwhere?rev=$_" . 
+		&cvsroot . qq{"><b>$_</b></A>};
 	    if (/^1\.1\.1\.\d+$/) {
 		print " <i>(vendor branch)</i>";
 	    }
-#	    print "<BR>\n";
-#	    print "Checked in on <i>" . &ctime($date{$_}) . "</i> by ";
-#	    print "<i>" . $author{$_} . "</i><BR>\n";
 	    print " <i>" . &ctime($date{$_}) . "</i> by ";
 	    print "<i>" . $author{$_} . "</i>\n";
 	    if ($revsym{$_}) {
-#		print "CVS Tags: <b>$revsym{$_}</b><BR>\n";
 		print "<BR>CVS Tags: <b>$revsym{$_}</b>";
 	    }
 	    if ($revsym{$br})  {
-#		print "Branch: <b>$revsym{$br}</b><BR>\n";
 		if ($revsym{$_}) {
 		    print "; ";
 		} else {
 		    print "<BR>";
 		}
-		print "Branch: <b>$revsym{$br}</b>";
+		print "Branch: <b>$revsym{$br}</b>\n";
 	    }
+	    if ($branchpoint{$_}) {
+		if ($revsym{$br} || $revsym{$_}) {
+		    print "; ";
+		} else {
+		    print "<BR>";
+		}
+		print "Branch point for: <b>$branchpoint{$_}</b>\n";
+	    }
 	    # Find the previous revision on this branch.
-	    # I think this can be done algorithmically.
 	    @prevrev = split(/\./, $_);
 	    if (--$prevrev[$#prevrev] == 0) {
 		# If it was X.Y.Z.1, just make it X.Y
@@ -419,8 +409,8 @@ if (-d $fullname) {
 	    }
 	    if ($prevrev[$#prevrev] != 0) {
 		$prev = join(".", @prevrev);
-		print "<BR><A HREF=\"$scriptwhere?r1=$prev";
-		print "&r2=$_\">Diffs to $prev</A>\n";
+		print "<BR><A HREF=\"${scriptwhere}.diff?r1=$prev";
+		print "&r2=$_" . &cvsroot . qq{">Diffs to $prev</A>\n};
 		#
 		# Plus, if it's on a branch, and it's not a vendor branch,
 		# offer to diff with the immediately-preceding commit if it
@@ -433,14 +423,17 @@ if (-d $fullname) {
 		    @tmp1 = split(/\./, $revorder[$i+1]);
 		    @tmp2 = split(/\./, $_);
 		    if ($#tmp1 < $#tmp2) {
-			print "; <A HREF=\"$scriptwhere?r1=$revorder[$i+1]";
-			print "&r2=$_\">Diffs to $revorder[$i+1]</A>\n";
+			print "; <A HREF=\"${scriptwhere}.diff?r1=$revorder[$i+1]";
+			print "&r2=$_" . &cvsroot .
+                            qq{">Diffs to $revorder[$i+1]</A>\n};
 		    }
 		}
 	    }
-#	    print "Log message:<BR>\n";
+	    if ($state{$_} eq "dead") {
+		print "<BR><B><I>FILE REMOVED</I></B>\n";
+	    }
 	    print "<PRE>\n";
-	    print &htmlify($log{$_});
+	    print &htmlify($log{$_}, 1);
 	    print "</PRE><HR NOSHADE>\n";
 	}
 	print "<A NAME=diff>\n";
@@ -449,7 +442,9 @@ if (-d $fullname) {
 	print "name using the selection box or you may type in a numeric\n";
 	print "name using the type-in text box.\n";
 	print "</A><P>\n";
-	print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n";
+	print "<FORM METHOD=\"GET\" ACTION=\"${scriptwhere}.diff\">\n";
+        print qq{<input type=hidden name=cvsroot value=$cvstree>\n}
+             if &cvsroot;
 	print "Diffs between \n";
 	print "<SELECT NAME=\"r1\">\n";
 	print "<OPTION VALUE=\"text\" SELECTED>Use Text Field\n";
@@ -464,16 +459,64 @@ if (-d $fullname) {
 	print "<INPUT TYPE=\"TEXT\" NAME=\"tr2\" VALUE=\"$revorder[0]\">\n";
 	print "<BR><INPUT TYPE=RADIO NAME=\"f\" VALUE=u CHECKED>Unidiff<br>\n";
 	print "<INPUT TYPE=RADIO NAME=\"f\" VALUE=c>Context diff<br>\n";
+	print "<INPUT TYPE=RADIO NAME=\"f\" VALUE=s>Side-by-Side<br>\n";
 	print "<INPUT TYPE=SUBMIT VALUE=\"Get Diffs\">\n";
 	print "</FORM>\n";
+	print "<HR noshade>\n";
+	print "<A name=branch>\n";
+	print "You may select to see revision information from only\n";
+	print "a single branch.\n";
+	print "</A><P>\n";
+	print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n";
+        print qq{<input type=hidden name=cvsroot value=$cvstree>\n}
+             if &cvsroot;
+	print "Branch: \n";
+	print "<SELECT NAME=\"only_on_branch\">\n";
+	print "<OPTION VALUE=\"\"";
+	print " SELECTED" if ($input{"only_on_branch"} eq "");
+	print ">Show all branches\n";
+	foreach (sort @branchnames) {
+		print "<OPTION";
+		print " SELECTED" if ($input{"only_on_branch"} eq $_);
+		print ">${_}\n";
+	}
+	print "</SELECT>\n";
+	print "<INPUT TYPE=SUBMIT VALUE=\"View Branch\">\n";
+	print "</FORM>\n";
         print &html_footer;
 	print "</BODY></HTML>\n";
+} elsif ($fullname =~ s/\.diff$// && -f $fullname . ",v" &&
+				$input{'r1'} && $input{'r2'}) {
+	# Allow diffs using the ".diff" extension
+	# so that browsers that default to the URL
+	# for a save filename don't save diff's as
+	# e.g. foo.c
+	&dodiff($fullname, $input{'r1'}, $input{'tr1'},
+		$input{'r2'}, $input{'tr2'}, $input{'f'});
+	exit;
+} elsif (($newname = $fullname) =~ s|/([^/]+)$|/Attic/$1| &&
+				 -f $newname . ",v") {
+	# The file has been removed and is in the Attic.
+	# Send a redirect pointing to the file in the Attic.
+	($newplace = $scriptwhere) =~ s|/([^/]+)$|/Attic/$1|;
+	&redirect($newplace);
+	exit;
+} elsif (0 && (@files = &safeglob($fullname . ",v"))) {
+	print "Content-type: text/plain\n\n";
+	print "You matched the following files:\n";
+	print join("\n", @files);
+	# Find the tags from each file
+	# Display a form offering diffs between said tags
 } else {
+	# Assume it's a module name with a potential path following it.
+	($module = $where) =~ s|/.*||;
+	$xtra = $&;
 	# Is there an indexed version of modules?
 	if (open(MODULES, "$cvsroot/CVSROOT/modules")) {
 		while (<MODULES>) {
-			if (/^${where}\s+(\S+)/o && -d "${cvsroot}/$1") {
-				&redirect($scriptname . '/' . $1);
+			if (/^(\S+)\s+(\S+)/o && $module eq $1
+				&& -d "${cvsroot}/$2" && $module ne $2) {
+				&redirect($scriptname . '/' . $2 . $xtra);
 			}
 		}
 	}
@@ -481,12 +524,16 @@ if (-d $fullname) {
 }
 
 sub htmlify {
-	local($string) = @_;
+	local($string, $pr) = @_;
 
 	$string =~ s/&/&amp;/g;
 	$string =~ s/</&lt;/g;
 	$string =~ s/>/&gt;/g;
 
+	if ($pr) {
+		$string =~ s|\bpr(\W+[a-z]+/\W*)(\d+)|<A HREF=/cgi/query-pr.cgi?pr=$2>$&</A>|ig;
+	}
+
 	$string;
 }
 
@@ -502,7 +549,7 @@ sub revcmp {
 	local(@r2) = split(/\./, $rev2);
 	local($a,$b);
 
-	while (($a = pop(@r1)) && ($b = pop(@r2))) {
+	while (($a = shift(@r1)) && ($b = shift(@r2))) {
 	    if ($a != $b) {
 		return $a <=> $b;
 	    }
@@ -515,10 +562,13 @@ sub revcmp {
 sub fatal {
 	local($errcode, $errmsg) = @_;
 	print "Status: $errcode\n";
-	print "Content-type: text/html\n";
-	print "\n";
-	print "<HTML><HEAD><TITLE>Error</TITLE></HEAD>\n";
-	print "<BODY>Error: $errmsg</BODY></HTML>\n";
+	print &html_header("Error");
+#	print "Content-type: text/html\n";
+#	print "\n";
+#	print "<HTML><HEAD><TITLE>Error</TITLE></HEAD>\n";
+#	print "<BODY>Error: $errmsg</BODY></HTML>\n";
+	print "Error: $errmsg\n";
+	print &html_footer;
 	exit(1);
 }
 
@@ -526,8 +576,164 @@ sub redirect {
 	local($url) = @_;
 	print "Status: 301 Moved\n";
 	print "Location: $url\n";
-	print "\n";
-	print "<HTML><HEAD><TITLE>Moved</TITLE></HEAD>\n";
-	print "<BODY>This document is located <A HREF=$url>here</A>.</BODY></HTML>\n";
+	print &html_header("Moved");
+#	print "Content-type: text/html\n";
+#	print "\n";
+#	print "<HTML><HEAD><TITLE>Moved</TITLE></HEAD>\n";
+#	print "<BODY>This document is located <A HREF=$url>here</A>.</BODY></HTML>\n";
+	print "This document is located <A HREF=$url>here</A>.\n";
+	print &html_footer;
 	exit(1);
+}
+
+sub safeglob {
+	local($filename) = @_;
+	local($dirname);
+	local(@results);
+
+	($dirname = $filename) =~ s|/[^/]+$||;
+	$filename =~ s|.*/||;
+
+	if (opendir(DIR, $dirname)) {
+		$glob = $filename;
+	#	transform filename from glob to regex.  Deal with:
+	#	[, {, ?, * as glob chars
+	#	make sure to escape all other regex chars
+		$glob =~ s/([\.\(\)\|\+])/\\$1/g;
+		$glob =~ s/\*/.*/g;
+		$glob =~ s/\?/./g;
+		$glob =~ s/{([^}]+)}/($t = $1) =~ s-,-|-g; "($t)"/eg;
+		foreach (readdir(DIR)) {
+			if (/^${glob}$/) {
+				push(@results, $dirname . "/" .$_);
+			}
+		}
+	}
+
+	@results;
+}
+
+sub checkout {
+	local($fullname, $rev) = @_;
+
+	open(RCS, "co -p$rev '$fullname' 2>&1 |") ||
+	    &fail("500 Internal Error", "Couldn't co: $!");
+# /home/ncvs/src/sys/netinet/igmp.c,v  -->  standard output
+# or
+# /home/ncvs/src/sys/netinet/igmp.c,v  -->  stdout
+# revision 1.1.1.2
+# /*
+	$_ = <RCS>;
+	if (/^(\S+),v\s+-->\s+st(andar)?d ?out(put)?\s*$/o && $1 eq $fullname) {
+	    # As expected
+	} else {
+	    &fatal("500 Internal Error",
+		"Unexpected output from co: $_");
+	}
+	$_ = <RCS>;
+	if (/^revision\s+$rev\s*$/) {
+	    # As expected
+	} else {
+	    &fatal("500 Internal Error",
+		"Unexpected output from co: $_");
+	}
+	$| = 1;
+	print "Content-type: text/plain\n\n";
+	print <RCS>;
+	close(RCS);
+}
+
+sub dodiff {
+	local($fullname, $r1, $tr1, $r2, $tr2, $f) = @_;
+
+	if ($r1 =~ /([^:]+)(:(.+))?/) {
+	    $rev1 = $1;
+	    $sym1 = $3;
+	}
+	if ($rev1 eq 'text') {
+	    $rev1 = $tr1;
+	}
+	if ($r2 =~ /([^:]+)(:(.+))?/) {
+	    $rev2 = $1;
+	    $sym2 = $3;
+	}
+	if ($rev2 eq 'text') {
+	    $rev2 = $tr2;
+	}
+	if (!($rev1 =~ /^[\d\.]+$/) || !($rev2 =~ /^[\d\.]+$/)) {
+	    &fatal("404 Not Found",
+		    "Malformed query \"$ENV{'QUERY_STRING'}\"");
+	}
+#
+# rev1 and rev2 are now both numeric revisions.
+# Thus we do a DWIM here and swap them if rev1 is after rev2.
+# XXX should we warn about the fact that we do this?
+	if (&revcmp($rev1,$rev2) > 0) {
+	    ($tmp1, $tmp2) = ($rev1, $sym1);
+	    ($rev1, $sym1) = ($rev2, $sym2);
+	    ($rev2, $sym2) = ($tmp1, $tmp2);
+	}
+#
+#	XXX Putting '-p' here is a personal preference
+	if ($f eq 'c') {
+	    $difftype = '-p -c';
+	    $diffname = "Context diff";
+	} elsif ($f eq 's') {
+	    $difftype = '--side-by-side --width=164';
+	    $diffname = "Side by Side";
+	} else {
+	    $difftype = '-p -u';
+	    $diffname = "Unidiff";
+	}
+# XXX should this just be text/plain
+# or should it have an HTML header and then a <pre>
+	print "Content-type: text/plain\n\n";
+	open(RCSDIFF, "rcsdiff $difftype -r$rev1 -r$rev2 '$fullname' 2>&1 |") ||
+	    &fail("500 Internal Error", "Couldn't rcsdiff: $!");
+#
+#===================================================================
+#RCS file: /home/ncvs/src/sys/netinet/tcp_output.c,v
+#retrieving revision 1.16
+#retrieving revision 1.17
+#diff -c -r1.16 -r1.17
+#*** /home/ncvs/src/sys/netinet/tcp_output.c     1995/11/03 22:08:08     1.16
+#--- /home/ncvs/src/sys/netinet/tcp_output.c     1995/12/05 17:46:35     1.17
+#
+# Ideas:
+# - nuke the stderr output if it's what we expect it to be
+# - Add "no differences found" if the diff command supplied no output.
+#
+#*** src/sys/netinet/tcp_output.c     1995/11/03 22:08:08     1.16
+#--- src/sys/netinet/tcp_output.c     1995/12/05 17:46:35     1.17 RELENG_2_1_0
+# (bogus example, but...)
+#
+	if ($difftype eq '-u') {
+	    $f1 = '---';
+	    $f2 = '\+\+\+';
+	} else {
+	    $f1 = '\*\*\*';
+	    $f2 = '---';
+	}
+	while (<RCSDIFF>) {
+	    if (m|^$f1 $cvsroot|o) {
+		s|$cvsroot/||o;
+		if ($sym1) {
+		    chop;
+		    $_ .= " " . $sym1 . "\n";
+		}
+	    } elsif (m|^$f2 $cvsroot|o) {
+		s|$cvsroot/||o;
+		if ($sym2) {
+		    chop;
+		    $_ .= " " . $sym2 . "\n";
+		}
+	    }
+	    print $_;
+	}
+	close(RCSDIFF);
+}
+
+sub cvsroot {
+    return '' if $cvstree eq $cvstreedefault;
+    return "&cvsroot=" . $cvstree;
 }