version 1.11, 1997/11/15 16:48:07 |
version 1.33, 1999/09/06 07:02:40 |
|
|
# cvsweb - a CGI interface to the CVS tree. |
# cvsweb - a CGI interface to the CVS tree. |
# |
# |
# Written by Bill Fenner <fenner@parc.xerox.com> on his own time. |
# 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. |
|
# |
|
# $FreeBSD$ |
|
# |
|
|
|
|
#HTTP_USER_AGENT: Mozilla/1.1N (X11; I; SunOS 4.1.3_U1 sun4m) via proxy gateway CERN-HTTPD/3.0 libwww/2.17 |
#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 |
#SERVER_NAME: www.freebsd.org |
#QUERY_STRING: baz |
#QUERY_STRING: baz |
Line 34 require 'cgi-style.pl'; |
|
Line 61 require 'cgi-style.pl'; |
|
|
|
%CVSROOT = ( |
%CVSROOT = ( |
'freebsd', '/home/ncvs', |
'freebsd', '/home/ncvs', |
'openbsd', '/home/OpenBSD/cvs', |
|
'learn', '/c/learncvs', |
'learn', '/c/learncvs', |
); |
); |
|
|
|
%CVSROOTdescr = ( |
|
'freebsd', 'FreeBSD', |
|
'learn', 'Learn', |
|
); |
|
|
|
%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'; |
$cvstreedefault = 'freebsd'; |
$cvstree = $cvstreedefault; |
$cvstree = $cvstreedefault; |
$cvsroot = $CVSROOT{"$cvstree"} || "/home/ncvs"; |
$cvsroot = $CVSROOT{"$cvstree"} || "/home/ncvs"; |
Line 57 display diffs between arbitrary revisions. |
|
Line 95 display diffs between arbitrary revisions. |
|
<p> |
<p> |
If you would like to use this CGI script on your own web server and |
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/\"> |
CVS tree, see <A HREF=\"http://www.freebsd.org/~fenner/cvsweb/\"> |
the CVSWeb distribution site</A>. |
the CVSWeb distribution site</A> or the <a |
|
href=\"http://www.freebsd.org/cgi/cvsweb.cgi/www/data/cgi/cvsweb.cgi\">current</a> FreeBSD version. |
<p> |
<p> |
Please send any suggestions, comments, etc. to |
Please send any suggestions, comments, etc. to |
<A HREF=\"mailto:fenner\@freebsd.org\">Bill Fenner <fenner\@freebsd.org></A> |
<A HREF=\"mailto:fenner\@freebsd.org\">Bill Fenner <fenner\@freebsd.org></A> |
Line 76 $scriptname =~ s|/$||; |
|
Line 115 $scriptname =~ s|/$||; |
|
$scriptwhere = $scriptname . '/' . $where; |
$scriptwhere = $scriptname . '/' . $where; |
$scriptwhere =~ s|/$||; |
$scriptwhere =~ s|/$||; |
|
|
|
|
if ($query = $ENV{'QUERY_STRING'}) { |
if ($query = $ENV{'QUERY_STRING'}) { |
foreach (split(/&/, $query)) { |
foreach (split(/&/, $query)) { |
s/%(..)/sprintf("%c", hex($1))/ge; # unquote %-quoted |
s/%(..)/sprintf("%c", hex($1))/ge; # unquote %-quoted |
Line 102 if ($input{'cvsroot'}) { |
|
Line 140 if ($input{'cvsroot'}) { |
|
do "$config-$cvstree" if -f "$config-$cvstree"; |
do "$config-$cvstree" if -f "$config-$cvstree"; |
|
|
$fullname = $cvsroot . '/' . $where; |
$fullname = $cvsroot . '/' . $where; |
|
|
if (!-d $cvsroot) { |
if (!-d $cvsroot) { |
&fatal("500 Internal Error",'$CVSROOT not found!'); |
&fatal("500 Internal Error",'$CVSROOT not found!<P>The server on which the CVS tree lives is probably down. Please try again in a few minutes.'); |
} |
} |
|
|
|
|
|
{ |
|
local(@foo, $i); |
|
local($scriptname) = $ENV{'SCRIPT_NAME'}; |
|
foreach (sort keys %CVSROOT) { |
|
if (-d $CVSROOT{$_}) { |
|
push(@foo, $_); |
|
} |
|
} |
|
if ($#foo > 1) { |
|
$intro .= "<p>\nThis script supports the following CVS trees:\n"; |
|
for($i = 0; $i <= $#foo; $i++) { |
|
$intro .= qq{<a href="$scriptname?cvsroot=$foo[$i]">} . |
|
($CVSROOTdescr{$foo[$i]} ? |
|
$CVSROOTdescr{$foo[$i]} : $foo[$i]) . qq{</a>} . |
|
($i == $#foo ? ".\n" : ",\n"); |
|
} |
|
} |
|
} |
|
|
|
|
|
{ |
|
local(@mirrors) = sort keys %mirrors;; |
|
if ($#mirrors >= 0) { |
|
$intro .= "<p>\nThis script is mirrored in:\n"; |
|
local($m); |
|
for($m = 0; $m <= $#mirrors; $m++) { |
|
$intro .= qq(<a href="$mirrors{$mirrors[$m]}">$mirrors[$m]</a>); |
|
$intro .= ',' if $m != $#mirrors; |
|
$intro .= "\n"; |
|
} |
|
} |
|
} |
|
|
|
|
if (-d $fullname) { |
if (-d $fullname) { |
opendir(DIR, $fullname) || &fatal("404 Not Found","$where: $!"); |
opendir(DIR, $fullname) || &fatal("404 Not Found","$where: $!"); |
@dir = readdir(DIR); |
@dir = readdir(DIR); |
Line 118 if (-d $fullname) { |
|
Line 191 if (-d $fullname) { |
|
print &html_header("/$where"); |
print &html_header("/$where"); |
print $shortinstr; |
print $shortinstr; |
} |
} |
print "<p>Current directory: <b>/$where</b>\n"; |
print "<p>"; |
|
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"; |
print "<P><HR NOSHADE>\n"; |
# Using <MENU> in this manner violates the HTML2.0 spec but |
# Using <MENU> in this manner violates the HTML2.0 spec but |
# provides the results that I want in most browsers. Another |
# provides the results that I want in most browsers. Another |
Line 130 if (-d $fullname) { |
|
Line 207 if (-d $fullname) { |
|
last lookingforattic; |
last lookingforattic; |
} |
} |
} |
} |
|
$haveattic = 1 if ($i <= $#dir); |
if (!$input{"showattic"} && ($i <= $#dir) && |
if (!$input{"showattic"} && ($i <= $#dir) && |
opendir(DIR, $fullname . "/Attic")) { |
opendir(DIR, $fullname . "/Attic")) { |
splice(@dir, $i, 1, |
splice(@dir, $i, 1, |
Line 141 if (-d $fullname) { |
|
Line 219 if (-d $fullname) { |
|
if ($_ eq '.') { |
if ($_ eq '.') { |
next; |
next; |
} |
} |
|
# ignore CVS lock and stale NFS files |
|
next if /^#cvs\.|^,|^\.nfs/; |
|
|
if (s|^Attic/||) { |
if (s|^Attic/||) { |
$attic = " (in the Attic)"; |
$attic = " (in the Attic)"; |
} else { |
} else { |
Line 155 if (-d $fullname) { |
|
Line 236 if (-d $fullname) { |
|
# &link("Directory-wide diffs", $scriptwhere . '/*'), "<BR>"; |
# &link("Directory-wide diffs", $scriptwhere . '/*'), "<BR>"; |
} elsif (-d $fullname . "/" . $_) { |
} elsif (-d $fullname . "/" . $_) { |
print "<IMG SRC=\"/icons/dir.gif\"> ", |
print "<IMG SRC=\"/icons/dir.gif\"> ", |
&link($_ . "/", $scriptwhere . '/' . $_ . '/' . $query), $attic, "<BR>"; |
&link($_ . "/", $scriptwhere . '/' . $_ . '/' . $query), |
|
$attic, "<BR>"; |
} elsif (s/,v$//) { |
} elsif (s/,v$//) { |
# TODO: add date/time? How about sorting? |
# TODO: add date/time? How about sorting? |
print "<IMG SRC=\"/icons/text.gif\"> ", |
print "<IMG SRC=\"/icons/text.gif\"> ", |
&link($_, $scriptwhere . '/' . |
&link($_, $scriptwhere . '/' . |
($attic ? "Attic/" : "") . $_ . $query), |
($attic ? "Attic/" : "") . $_ . $query), |
$attic, "<BR>"; |
$attic, "<BR>"; |
} |
} |
} |
} |
print "</MENU>\n"; |
print "</MENU>\n"; |
Line 177 if (-d $fullname) { |
|
Line 259 if (-d $fullname) { |
|
} |
} |
$formwhere = $scriptwhere; |
$formwhere = $scriptwhere; |
$formwhere =~ s|Attic/?$|| if ($input{"showattic"}); |
$formwhere =~ s|Attic/?$|| if ($input{"showattic"}); |
print "<HR><FORM METHOD=\"GET\" ACTION=\"${formwhere}\">\n"; |
if ($haveattic) { |
$input{"showattic"}=!$input{"showattic"}; |
print "<HR><FORM METHOD=\"GET\" ACTION=\"${formwhere}\">\n"; |
foreach $k (keys %input) { |
$input{"showattic"}=!$input{"showattic"}; |
print "<INPUT TYPE=hidden NAME=$k VALUE=$input{$k}>\n" if $input{$k}; |
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 "<INPUT TYPE=SUBMIT VALUE=\""; |
|
print ($input{"showattic"} ? "Show" : "Hide"); |
|
print " attic directories\">\n"; |
|
print "</FORM>\n"; |
|
print &html_footer; |
print &html_footer; |
print "</BODY></HTML>\n"; |
print "</BODY></HTML>\n"; |
} elsif (-f $fullname . ',v') { |
} elsif (-f $fullname . ',v') { |
Line 198 if (-d $fullname) { |
|
Line 282 if (-d $fullname) { |
|
$input{'r2'}, $input{'tr2'}, $input{'f'}); |
$input{'r2'}, $input{'tr2'}, $input{'f'}); |
exit; |
exit; |
} |
} |
|
print("going to dolog($fullname)\n") if ($verbose); |
|
&dolog($fullname); |
|
} 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. |
|
$xtra = $& if (($module = $where) =~ s|/.*||); |
|
# Is there an indexed version of modules? |
|
if (open(MODULES, "$cvsroot/CVSROOT/modules")) { |
|
while (<MODULES>) { |
|
if (/^(\S+)\s+(\S+)/o && $module eq $1 |
|
&& -d "${cvsroot}/$2" && $module ne $2) { |
|
&redirect($scriptname . '/' . $2 . $xtra); |
|
} |
|
} |
|
} |
|
&fatal("404 Not Found","$where: no such file or directory"); |
|
} |
|
|
|
sub htmlify { |
|
local($string, $pr) = @_; |
|
|
|
$string =~ s/&/&/g; |
|
$string =~ s/</</g; |
|
$string =~ s/>/>/g; |
|
|
|
if ($pr) { |
|
$string =~ s!\b((pr[:#]?\s*#?)|((bin|conf|docs|gnu|i386|kern|misc|ports)\/))(\d+)\b!<A HREF=http://www.freebsd.org/cgi/query-pr.cgi?pr=\5>$&</A>!ig; |
|
} |
|
|
|
$string; |
|
} |
|
|
|
sub link { |
|
local($name, $where) = @_; |
|
|
|
"<A HREF=\"$where\">$name</A>\n"; |
|
} |
|
|
|
sub revcmp { |
|
local($rev1, $rev2) = @_; |
|
local(@r1) = split(/\./, $rev1); |
|
local(@r2) = split(/\./, $rev2); |
|
local($a,$b); |
|
|
|
while (($a = shift(@r1)) && ($b = shift(@r2))) { |
|
if ($a != $b) { |
|
return $a <=> $b; |
|
} |
|
} |
|
if (@r1) { return 1; } |
|
if (@r2) { return -1; } |
|
return 0; |
|
} |
|
|
|
sub fatal { |
|
local($errcode, $errmsg) = @_; |
|
print "Status: $errcode\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); |
|
} |
|
|
|
sub redirect { |
|
local($url) = @_; |
|
print "Status: 301 Moved\n"; |
|
print "Location: $url\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 ($rev eq ".") { |
|
# latest rev requested, don't check |
|
} elsif (/^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 dolog { |
|
local($fullname) = @_; |
|
local($curbranch,$symnames); #... |
|
|
|
print("Going to rlog '$fullname'\n") if ($verbose); |
open(RCS, "rlog '$fullname'|") || &fatal("500 Internal Error", |
open(RCS, "rlog '$fullname'|") || &fatal("500 Internal Error", |
"Failed to spawn rlog"); |
"Failed to spawn rlog"); |
while (<RCS>) { |
while (<RCS>) { |
Line 236 if (-d $fullname) { |
|
Line 576 if (-d $fullname) { |
|
logentry: |
logentry: |
while (!/^=========/) { |
while (!/^=========/) { |
$_ = <RCS>; |
$_ = <RCS>; |
|
last logentry if (!defined($_)); # EOF |
print "R:", $_ if ($verbose); |
print "R:", $_ if ($verbose); |
if (/^revision ([\d\.]+)/) { |
if (/^revision ([\d\.]+)/) { |
$rev = $1; |
$rev = $1; |
} elsif (/^========/ || /^----------------------------$/) { |
} elsif (/^========/ || /^----------------------------$/) { |
next logentry; |
next logentry; |
} else { |
} else { |
&fatal("500 Internal Error","Error parsing RCS output: $_"); |
# The rlog output is syntactically ambiguous. We must |
|
# have guessed wrong about where the end of the last log |
|
# message was. |
|
# Since this is likely to happen when people put rlog output |
|
# in their commit messages, don't even bother keeping |
|
# these lines since we don't know what revision they go with |
|
# any more. |
|
next logentry; |
|
# &fatal("500 Internal Error","Error parsing RCS output: $_"); |
} |
} |
$_ = <RCS>; |
$_ = <RCS>; |
print "D:", $_ if ($verbose); |
print "D:", $_ if ($verbose); |
Line 371 if (-d $fullname) { |
|
Line 720 if (-d $fullname) { |
|
} |
} |
print "\n"; |
print "\n"; |
print "<A HREF=\"$scriptwhere?rev=$_" . |
print "<A HREF=\"$scriptwhere?rev=$_" . |
&cvsroot . qq{"><b>$_</b></A>}; |
&cvsroot . "\"><b>$_</b></A>"; |
if (/^1\.1\.1\.\d+$/) { |
if (/^1\.1\.1\.\d+$/) { |
print " <i>(vendor branch)</i>"; |
print " <i>(vendor branch)</i>"; |
} |
} |
print " <i>" . &ctime($date{$_}) . "</i> by "; |
print " <i>" . &ctime($date{$_}) . " UTC</i> by "; |
print "<i>" . $author{$_} . "</i>\n"; |
print "<i><a href=\"mailto:" . $author{$_} . "\@FreeBSD.org\">" . $author{$_} . "</a></i>\n"; |
if ($revsym{$_}) { |
if ($revsym{$_}) { |
print "<BR>CVS Tags: <b>$revsym{$_}</b>"; |
print "<BR>CVS Tags: <b>$revsym{$_}</b>"; |
} |
} |
Line 414 if (-d $fullname) { |
|
Line 763 if (-d $fullname) { |
|
if ($prevrev[$#prevrev] != 0) { |
if ($prevrev[$#prevrev] != 0) { |
$prev = join(".", @prevrev); |
$prev = join(".", @prevrev); |
print "<BR><A HREF=\"${scriptwhere}.diff?r1=$prev"; |
print "<BR><A HREF=\"${scriptwhere}.diff?r1=$prev"; |
print "&r2=$_" . &cvsroot . qq{">Diffs to $prev</A>\n}; |
print "&r2=$_" . &cvsroot . "\">Diffs to $prev</A>\n"; |
# |
# |
# Plus, if it's on a branch, and it's not a vendor branch, |
# Plus, if it's on a branch, and it's not a vendor branch, |
# offer to diff with the immediately-preceding commit if it |
# offer to diff with the immediately-preceding commit if it |
Line 429 if (-d $fullname) { |
|
Line 778 if (-d $fullname) { |
|
if ($#tmp1 < $#tmp2) { |
if ($#tmp1 < $#tmp2) { |
print "; <A HREF=\"${scriptwhere}.diff?r1=$revorder[$i+1]"; |
print "; <A HREF=\"${scriptwhere}.diff?r1=$revorder[$i+1]"; |
print "&r2=$_" . &cvsroot . |
print "&r2=$_" . &cvsroot . |
qq{">Diffs to $revorder[$i+1]</A>\n}; |
"\">Diffs to $revorder[$i+1]</A>\n"; |
} |
} |
} |
} |
} |
} |
Line 447 if (-d $fullname) { |
|
Line 796 if (-d $fullname) { |
|
print "name using the type-in text box.\n"; |
print "name using the type-in text box.\n"; |
print "</A><P>\n"; |
print "</A><P>\n"; |
print "<FORM METHOD=\"GET\" ACTION=\"${scriptwhere}.diff\">\n"; |
print "<FORM METHOD=\"GET\" ACTION=\"${scriptwhere}.diff\">\n"; |
print qq{<input type=hidden name=cvsroot value=$cvstree>\n} |
print "<INPUT TYPE=HIDDEN NAME=\"cvsroot\" VALUE=\"$cvstree\">\n" |
if &cvsroot; |
if &cvsroot; |
print "Diffs between \n"; |
print "Diffs between \n"; |
print "<SELECT NAME=\"r1\">\n"; |
print "<SELECT NAME=\"r1\">\n"; |
Line 489 if (-d $fullname) { |
|
Line 838 if (-d $fullname) { |
|
print "</FORM>\n"; |
print "</FORM>\n"; |
print &html_footer; |
print &html_footer; |
print "</BODY></HTML>\n"; |
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 (/^(\S+)\s+(\S+)/o && $module eq $1 |
|
&& -d "${cvsroot}/$2" && $module ne $2) { |
|
&redirect($scriptname . '/' . $2 . $xtra); |
|
} |
|
} |
|
} |
|
&fatal("404 Not Found","$where: no such file or directory"); |
|
} |
|
|
|
sub htmlify { |
|
local($string, $pr) = @_; |
|
|
|
$string =~ s/&/&/g; |
|
$string =~ s/</</g; |
|
$string =~ s/>/>/g; |
|
|
|
if ($pr) { |
|
$string =~ s|\bpr(\W+[a-z]+/\W*)(\d+)|<A HREF=/cgi/query-pr.cgi?pr=$2>$&</A>|ig; |
|
} |
|
|
|
$string; |
|
} |
|
|
|
sub link { |
|
local($name, $where) = @_; |
|
|
|
"<A HREF=\"$where\">$name</A>\n"; |
|
} |
|
|
|
sub revcmp { |
|
local($rev1, $rev2) = @_; |
|
local(@r1) = split(/\./, $rev1); |
|
local(@r2) = split(/\./, $rev2); |
|
local($a,$b); |
|
|
|
while (($a = shift(@r1)) && ($b = shift(@r2))) { |
|
if ($a != $b) { |
|
return $a <=> $b; |
|
} |
|
} |
|
if (@r1) { return 1; } |
|
if (@r2) { return -1; } |
|
return 0; |
|
} |
|
|
|
sub fatal { |
|
local($errcode, $errmsg) = @_; |
|
print "Status: $errcode\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); |
|
} |
|
|
|
sub redirect { |
|
local($url) = @_; |
|
print "Status: 301 Moved\n"; |
|
print "Location: $url\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 { |
sub cvsroot { |