cvsweb/cvsweb.cgi - diff

Return to cvsweb.cgi CVS log

Up to [cvsweb.bsd.lv] / cvsweb

Diff for /cvsweb/cvsweb.cgi between version 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2000/08/14 04:35:13

version 1.1.1.2, 2000/08/15 08:40:58

Line 2

# cvsweb - a CGI interface to CVS trees.

# Written in their spare time by

# Bill Fenner <fenner@FreeBSD.org> (original work)

# extended by Henner Zeller <zeller@think.de>,

# Henrik Nordstrom <hno@hem.passagen.se>

# Ken Coar <coar@Apache.Org>

# Dick Balaska <dick@buckosoft.com>

# Akinori MUSHA <knu@FreeBSD.org>

Line 42

# SUCH DAMAGE.

# $zId: cvsweb.cgi,v 1.93 2000/07/27 17:42:28 hzeller Exp $

# $kId: cvsweb.cgi,v 1.11 2000/08/13 18:58:24 knu Exp $

# $kId: cvsweb.cgi,v 1.13 2000/08/15 08:35:51 knu Exp $

###

Line 79 use vars qw (

$use_moddate

);

sub printDiffSelect($);

sub findLastModifiedSubdirs(@);

sub htmlify($;$);

sub spacedHtmlText($);

sub link($$);

sub revcmp($$);

sub fatal($$);

sub redirect($);

sub safeglob($);

sub getMimeTypeFromSuffix($);

sub doAnnotate($$);

sub doCheckout($$);

sub cvswebMarkup($$$);

sub viewable($);

sub doDiff($$$$$$);

sub getDirLogs($$@);

sub readLog($;$);

sub printLog($;$);

sub doLog($);

sub flush_diff_rows($$$$);

sub human_readable_diff($);

sub navigateHeader($$$$$);

sub plural_write($$);

sub readableTime($$);

sub clickablePath($$);

sub chooseCVSRoot();

sub chooseMirror();

sub fileSortCmp();

sub download_url($$;$);

sub download_link($$$;$);

sub toggleQuery($$);

sub urlencode($);

sub http_header(;$);

sub html_header($);

sub html_footer();

sub link_tags($);

sub forbidden_module($);

##### Start of Configuration Area ########

use Cwd;

# == EDIT this ==

# User configuration is stored in

$config = undef;

for ($ENV{CVSWEB_CONFIG}, '/usr/local/etc/cvsweb.conf', getcwd . '/cvsweb.conf') {

for ($ENV{CVSWEB_CONFIG},

$config = $_ if -r $_;

# '/home/knu/etc/cvsweb.conf',

'/usr/local/etc/cvsweb.conf',

getcwd . '/cvsweb.conf') {

$config = $_ if defined($_) && -r $_;

}

# == Configuration defaults ==

Line 111 $difffontsize = $inputTextSize = $mime_types = $allow_

Line 152 $difffontsize = $inputTextSize = $mime_types = $allow_

$allow_markup = $use_java_script = $open_extern_window =

$extern_window_width = $extern_window_height = $edit_option_form =

$checkout_magic = $show_subdir_lastmod = $show_log_in_markup = $v =

$navigationHeaderColor = $tableBorderColor = $markupLogColor =

$tabstop = $use_moddate = $moddate = undef;

##### End of configuration variables #####

Line 139 $is_mod_perl = defined($ENV{MOD_PERL});

Line 180 $is_mod_perl = defined($ENV{MOD_PERL});

# in lynx, it it very annoying to have two links

# per file, so disable the link at the icon

# in this case:

$Browser = $ENV{HTTP_USER_AGENT} || '';

$Browser = $ENV{HTTP_USER_AGENT};

$is_lynx = ($Browser =~ m`^Lynx/`i);

$is_w3m = ($Browser =~ m`^w3m/`i);

$is_msie = ($Browser =~ m`MSIE`);

Line 159 $nofilelinks = $is_textbased;

Line 200 $nofilelinks = $is_textbased;

# Turn off gzip if running under mod_perl. piping does

# not work as expected inside the server. One can probably

# achieve the same result using Apache::GZIPFilter.

$maycompress =(($ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`

$maycompress = (($ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`

|| $is_mozilla3)

&& !$is_msie

&& !$is_mod_perl);

# put here the variables we need in order

# to hold our state - they will be added (with

# their current value) to any link/query string

# you construct

@stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag);

Line 184 else {

Line 225 else {

undef %input;

$query = $ENV{QUERY_STRING};

if ($query ne '') {

if (defined($query) && $query ne '') {

foreach (split(/&/, $query)) {

s/%(..)/sprintf("%c", hex($1))/ge; # unquote %-quoted

if (/(\S+)=(.*)/) {

Line 196 if ($query ne '') {

Line 237 if ($query ne '') {

}

# For backwards compability, set only_with_tag to only_on_branch if set.

$input{only_with_tag} = $input{only_on_branch}

if (defined($input{only_on_branch}));

Line 223 foreach (keys %DEFAULTVALUE)

Line 264 foreach (keys %DEFAULTVALUE)

}

$barequery = "";

foreach (@stickyvars) {

# construct a query string with the sticky non default parameters set

if (defined($input{$_}) && $input{$_} ne '' &&

!(defined($DEFAULTVALUE{$_}) && $input{$_} eq $DEFAULTVALUE{$_})) {

if ($barequery) {

$barequery = $barequery . "&";

Line 315 $defaultViewable = $allow_markup && viewable($mimetype

Line 356 $defaultViewable = $allow_markup && viewable($mimetype

# search for GZIP if compression allowed

# We've to find out if the GZIP-binary exists .. otherwise

# ge get an Internal Server Error if we try to pipe the

# output through the nonexistent gzip ..

# any more elegant ways to prevent this are welcome!

if ($allow_compress && $maycompress) {

foreach (split(/:/, $ENV{PATH})) {

Line 396 elsif (-d $fullname) {

Line 437 elsif (-d $fullname) {

$input{only_with_tag};

}

print "<HR NOSHADE>\n";

# Using <MENU> in this manner violates the HTML2.0 spec but

# provides the results that I want in most browsers. Another

# case of layout spooging up HTML.

my $infocols = 0;

if ($dirtable) {

if (defined($tableBorderColor)) {

Line 411 elsif (-d $fullname) {

Line 452 elsif (-d $fullname) {

}

print "<table width=\"100%\" border=0 cellspacing=1 cellpadding=$tablepadding>\n";

$infocols++;

print "<tr><th align=left bgcolor=\"" . (($byfile) ?

$columnHeaderColorSorted :

$columnHeaderColorDefault) . "\">";

print "<a href=\"./" . &toggleQuery("sortby","file") .

"#dirlist\">" if (!$byfile);

Line 423 elsif (-d $fullname) {

Line 464 elsif (-d $fullname) {

# with revision information:

if (scalar(%fileinfo)) {

$infocols++;

print "<th align=left bgcolor=\"" . (($byrev) ?

$columnHeaderColorSorted :

$columnHeaderColorDefault) . "\">";

print "<a href=\"./" . &toggleQuery ("sortby","rev") .

"#dirlist\">" if (!$byrev);

Line 432 elsif (-d $fullname) {

Line 473 elsif (-d $fullname) {

print "</a>" if (!$byrev);

print "</th>";

$infocols++;

print "<th align=left bgcolor=\"" . (($bydate) ?

$columnHeaderColorSorted :

$columnHeaderColorDefault) . "\">";

print "<a href=\"./" . &toggleQuery ("sortby","date") .

"#dirlist\">" if (!$bydate);

Line 442 elsif (-d $fullname) {

Line 483 elsif (-d $fullname) {

print "</th>";

if ($show_author) {

$infocols++;

print "<th align=left bgcolor=\"" . (($byauthor) ?

$columnHeaderColorSorted :

$columnHeaderColorDefault) . "\">";

print "<a href=\"./" . &toggleQuery ("sortby","author") .

"#dirlist\">" if (!$byauthor);

Line 452 elsif (-d $fullname) {

Line 493 elsif (-d $fullname) {

print "</th>";

}

$infocols++;

print "<th align=left bgcolor=\"" . (($bylog) ?

$columnHeaderColorSorted :

$columnHeaderColorDefault) . "\">";

print "<a href=\"./", toggleQuery("sortby","log"), "#dirlist\">" if (!$bylog);

print "Last log entry";

Line 471 elsif (-d $fullname) {

Line 512 elsif (-d $fullname) {

print "<menu>\n";

}

my $dirrow = 0;

my $i;

lookingforattic:

for ($i = 0; $i <= $#dir; $i++) {

Line 486 elsif (-d $fullname) {

Line 527 elsif (-d $fullname) {

closedir($dh);

}

my $hideAtticToggleLink = "<a href=\"./" .

&toggleQuery ("hideattic") .

"#dirlist\">[Hide]</a>" if (!$input{'hideattic'});

Line 548 elsif (-d $fullname) {

Line 589 elsif (-d $fullname) {

}

print " ", &link($_ . "/", $url), $attic;

if ($_ eq "Attic") {

print "  <a href=\"./" .

&toggleQuery ("hideattic") .

"#dirlist\">[Don't hide]</a>";

}

# Show last change in dir

if ($filename) {

print "</td><td> </td><td> " if ($dirtable);

Line 621 elsif (-d $fullname) {

Line 662 elsif (-d $fullname) {

print " ", &link($_, $url), $attic;

print "</td><td> " if ($dirtable);

download_link($fileurl,

$rev, $rev,

$defaultViewable ? "text/x-cvsweb-markup" : undef);

print "</td><td> " if ($dirtable);

if ($date) {

Line 649 elsif (-d $fullname) {

Line 690 elsif (-d $fullname) {

print "</td></tr></table>";

}

print "". ($dirtable == 1) ? "</table>" : "</menu>" . "\n";

if ($filesexists && !$filesfound) {

print "<P><B>NOTE:</B> There are $filesexists files, but none matches the current tag ($input{only_with_tag})\n";

}

if ($input{only_with_tag} && (!%tags || !$tags{$input{only_with_tag}})) {

%tags = %alltags

}

if (scalar %tags

|| $input{only_with_tag}

|| $edit_option_form

|| defined($input{"options"})) {

print "<hr size=1 NOSHADE>";

Line 678 elsif (-d $fullname) {

Line 719 elsif (-d $fullname) {

print ">";

print "<OPTION VALUE=\"\">All tags / default branch\n";

foreach my $tag (reverse sort { lc $a cmp lc $b } keys %tags) {

print "<OPTION",defined($input{only_with_tag}) &&

$input{only_with_tag} eq $tag ? " SELECTED":"",

$input{only_with_tag} eq $tag ? " SELECTED" : "",

">$tag\n";

}

print "</SELECT>\n";

Line 712 elsif (-d $fullname) {

Line 753 elsif (-d $fullname) {

print "<OPTION VALUE=rev",$logsort eq "rev" ? " SELECTED" : "", ">Revision";

print "</SELECT></td></tr>";

print "<tr><td>Diff format: ";

printDiffSelect();

printDiffSelect(0);

print "</td>";

print "<td>Show Attic files: ";

print "<INPUT NAME=hideattic TYPE=CHECKBOX", $input{'hideattic'}?" CHECKED":"",

print "<INPUT NAME=hideattic TYPE=CHECKBOX", $input{'hideattic'} ? " CHECKED" : "",

"></td></tr>\n";

print "<tr><td align=center colspan=2><input type=submit value=\"Change Options\">";

print "</td></tr></table></center></FORM>\n";

}

print &html_footer;

print "</BODY></HTML>\n";

}

###############################

# View Files

Line 796 elsif (-d $fullname) {

Line 837 elsif (-d $fullname) {

}

## End MAIN

sub printDiffSelect {

sub printDiffSelect($) {

my ($use_java_script) = @_;

$use_java_script = 0 if (!defined($use_java_script));

my ($f) = $input{'f'};

print "<SELECT NAME=\"f\"";

print " onchange=\"submit()\"" if ($use_java_script);

Line 811 sub printDiffSelect {

Line 851 sub printDiffSelect {

print "</SELECT>";

}

sub findLastModifiedSubdirs {

sub findLastModifiedSubdirs(@) {

my (@dirs) = @_;

my ($dirname, @files);

Line 845 sub findLastModifiedSubdirs {

Line 885 sub findLastModifiedSubdirs {

return @files;

}

sub htmlify {

sub htmlify($;$) {

my($string, $pr) = @_;

# Special Characters; RFC 1866

$string =~ s/&/&/g;

$string =~ s/\"/"/g;

$string =~ s/</</g;

$string =~ s/>/>/g;

Line 868 sub htmlify {

Line 908 sub htmlify {

return $string;

}

sub spacedHtmlText {

sub spacedHtmlText($) {

my($string, $pr) = @_;

local $_ = $_[0];

# Cut trailing spaces

s/\s+$//;

s/\s+\n$//;

# Expand tabs

$string =~ s/\t+/' ' x (length($&) * $tabstop - length($`) % $tabstop)/e

s/\t+/' ' x (length($&) * $tabstop - length($`) % $tabstop)/e

if (defined($tabstop));

# replace <tab> and <space> (\001 is to protect us from htmlify)

# gzip can make excellent use of this repeating pattern :-)

$string =~ s/\001/\001%/g; #protect our & substitute

s/\001/\001%/g; #protect our & substitute

if ($hr_breakable) {

# make every other space 'breakable'

$string =~ s/ / \001nbsp; \001nbsp; \001nbsp; \001nbsp;/g; # <tab>

s/ / \001nbsp; \001nbsp; \001nbsp; \001nbsp;/g; # <tab>

$string =~ s/ / \001nbsp;/g; # 2 * <space>

s/ / \001nbsp;/g; # 2 * <space>

# leave single space as it is

}

else {

$string =~ s/ /\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;/g;

s/ /\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;/g;

$string =~ s/ /\001nbsp;/g;

s/ /\001nbsp;/g;

}

$string = htmlify($string);

$_ = htmlify($_);

# unescape

$string =~ s/\001([^%])/&$1/g;

s/\001([^%])/&$1/g;

$string =~ s/\001%/\001/g;

s/\001%/\001/g;

return $string;

return $_;

}

sub link {

sub link($$) {

my($name, $where) = @_;

return "<A HREF=\"$where\">$name</A>\n";

}

sub revcmp {

sub revcmp($$) {

my($rev1, $rev2) = @_;

my(@r1) = split(/\./, $rev1);

my(@r2) = split(/\./, $rev2);

Line 923 sub revcmp {

Line 963 sub revcmp {

return 0;

}

sub fatal {

sub fatal($$) {

my($errcode, $errmsg) = @_;

if ($is_mod_perl) {

Apache->request->status((split(/ /, $errcode))[0]);

Line 937 sub fatal {

Line 977 sub fatal {

exit(1);

}

sub redirect {

sub redirect($) {

my($url) = @_;

if ($is_mod_perl) {

Apache->request->status(301);

Line 953 sub redirect {

Line 993 sub redirect {

exit(1);

}

sub safeglob {

sub safeglob($) {

my ($filename) = @_;

my ($dirname);

my (@results);

Line 982 sub safeglob {

Line 1022 sub safeglob {

@results;

}

sub getMimeTypeFromSuffix {

sub getMimeTypeFromSuffix($) {

my ($fullname) = @_;

my ($mimetype, $suffix);

my $fh = do {local(*FH);};

Line 990 sub getMimeTypeFromSuffix {

Line 1030 sub getMimeTypeFromSuffix {

($suffix = $fullname) =~ s/^.*\.([^.]*)$/$1/;

$mimetype = $MTYPES{$suffix};

$mimetype = $MTYPES{'*'} if (!$mimetype);

if (!$mimetype && -f $mime_types) {

# okey, this is something special - search the

# mime.types database

Line 1003 sub getMimeTypeFromSuffix {

Line 1043 sub getMimeTypeFromSuffix {

}

close ($fh);

}

# okey, didn't find anything useful ..

if (!($mimetype =~ /\S\/\S/)) {

$mimetype = "text/plain";

Line 1014 sub getMimeTypeFromSuffix {

Line 1054 sub getMimeTypeFromSuffix {

###############################

# show Annotation

###############################

sub doAnnotate ($$) {

sub doAnnotate($$) {

my ($rev) = @_;

my ($pid);

my ($pathname, $filename);

Line 1033 sub doAnnotate ($$) {

Line 1073 sub doAnnotate ($$) {

http_header();

navigateHeader ($scriptwhere,$pathname,$filename,$rev, "annotate");

navigateHeader($scriptwhere,$pathname,$filename,$rev, "annotate");

print "<h3 align=center>Annotation of $pathname$filename, Revision $rev</h3>\n";

# this seems to be necessary

Line 1045 sub doAnnotate ($$) {

Line 1085 sub doAnnotate ($$) {

# the public domain.

# we could abandon the use of rlog, rcsdiff and co using

# the cvsserver in a similiar way one day (..after rewrite)

$pid = open2($reader, $writer, "cvs server") || fatal ("500 Internal Error",

"Fatal Error - unable to open cvs for annotation");

# OK, first send the request to the server. A simplified example is:

# Root /home/kingdon/zwork/cvsroot

# Argument foo/xx

Line 1057 sub doAnnotate ($$) {

Line 1097 sub doAnnotate ($$) {

# /home/kingdon/zwork/cvsroot

# annotate

# although as you can see there are a few more details.

print $writer "Root $cvsroot\n";

print $writer "Valid-responses ok error Valid-requests Checked-in Updated Merged Removed M E\n";

# Don't worry about sending valid-requests, the server just needs to

Line 1077 sub doAnnotate ($$) {

Line 1117 sub doAnnotate ($$) {

if ($path eq "") {

# In our example, $_ is "dir".

$path = $_;

}

else {

print $writer "Directory $path\n";

print $writer "$cvsroot/$path\n";

Line 1090 sub doAnnotate ($$) {

Line 1130 sub doAnnotate ($$) {

# And the last "Directory" before "annotate" is the top level.

print $writer "Directory .\n";

print $writer "$cvsroot\n";

print $writer "annotate\n";

# OK, we've sent our command to the server. Thing to do is to

# close the writer side and get all the responses. If "cvs server"

# were nicer about buffering, then we could just leave it open, I think.

close ($writer) || die "cannot close: $!";

# Ready to get the responses from the server.

# For example:

# E Annotations for foo/xx

# E ***************

# M 1.3 (kingdon 06-Sep-97): hello

# ok

my ($lineNr) = 0;

my ($oldLrev, $oldLusr) = ("", "");

Line 1142 sub doAnnotate ($$) {

Line 1182 sub doAnnotate ($$) {

# is there a less timeconsuming way to strip spaces ?

($lrev = $lrev) =~ s/\s+//g;

my $isCurrentRev = ($rev eq $lrev);

print "<b>" if ($isCurrentRev);

printf ("%8s%s%8s %4d:", $revprint, ($isCurrentRev ? "|" : " "), $usrprint, $lineNr);

print spacedHtmlText($line);

Line 1169 sub doAnnotate ($$) {

Line 1209 sub doAnnotate ($$) {

###############################

# make Checkout

###############################

sub doCheckout {

sub doCheckout($$) {

my ($fullname, $rev) = @_;

my ($mimetype,$revopt);

my $fh = do {local(*FH);};

Line 1203 sub doCheckout {

Line 1243 sub doCheckout {

$moddate=$date{$symrev{HEAD}};

}

### just for the record:

### 'cvs co' seems to have a bug regarding single checkout of

### directories/files having spaces in it;

Line 1213 sub doCheckout {

Line 1253 sub doCheckout {

if (! open($fh, "-|")) { # child

open(STDERR, ">&STDOUT"); # Redirect stderr to stdout

exec("cvs", "-d", $cvsroot, "co", "-p", $revopt, $where);

}

#===================================================================

#Checking out squid/src/ftp.c

#RCS: /usr/src/CVS/squid/src/ftp.c,v

Line 1252 sub doCheckout {

Line 1292 sub doCheckout {

close($fh);

}

sub cvswebMarkup {

sub cvswebMarkup($$$) {

my ($filehandle,$fullname,$revision) = @_;

my ($pathname, $filename);

Line 1262 sub cvswebMarkup {

Line 1302 sub cvswebMarkup {

http_header();

navigateHeader ($scriptwhere, $pathname, $filename, $revision, "view");

navigateHeader($scriptwhere, $pathname, $filename, $revision, "view");

print "<HR noshade>";

print "<table width=\"100%\"><tr><td bgcolor=\"$markupLogColor\">";

print "File: ", &clickablePath($where, 1);

Line 1270 sub cvswebMarkup {

Line 1310 sub cvswebMarkup {

&download_link(urlencode($fileurl), $revision, "(download)");

if (!$defaultTextPlain) {

print " ";

&download_link(urlencode($fileurl), $revision, "(as text)",

"text/plain");

}

print "<BR>\n";

Line 1302 sub cvswebMarkup {

Line 1342 sub cvswebMarkup {

sub viewable($) {

my ($mimetype) = @_;

$mimetype =~ m%^text/% ||

$mimetype =~ m%^(text|image)/%;

$mimetype =~ m%^image/% ||

}

###############################

# Show Colored Diff

###############################

sub doDiff {

sub doDiff($$$$$$) {

my($fullname, $r1, $tr1, $r2, $tr2, $f) = @_;

my $fh = do {local(*FH);};

my ($rev1, $rev2, $sym1, $sym2, @difftype, $diffname, $f1, $f2);

Line 1454 sub doDiff {

Line 1492 sub doDiff {

###############################

# Show Logs ..

###############################

sub getDirLogs {

sub getDirLogs($$@) {

my ($cvsroot,$dirname,@otherFiles) = @_;

my ($state,$otherFiles,$tag, $file, $date, $branchpoint, $branch, $log);

my ($rev, $revision, $revwanted, $filename, $head, $author);

Line 1472 sub getDirLogs {

Line 1510 sub getDirLogs {

}

# just execute rlog if there are any files

if ($#files < 0) {

return;

}

Line 1517 again:

Line 1555 again:

}

if ($state eq "head" && /^symbolic names/) {

$state = "tags";

($branch = $head) =~ s/\.\d+$// if (!defined($branch));

$branch =~ s/(\.?)(\d+)$/${1}0.$2/;

$symrev{MAIN} = $branch;

$symrev{HEAD} = $branch;

Line 1615 again:

Line 1653 again:

}

if ($. == 0) {

fatal("500 Internal Error",

"Failed to spawn GNU rlog on <em>'".join(", ", @files)."'</em><p>did you set the <b>\$ENV{PATH}</b> in your configuration file correctly ?");

}

close($fh);

}

sub readLog {

sub readLog($;$) {

my($fullname,$revision) = @_;

my ($symnames, $head, $rev, $br, $brp, $branch, $branchrev);

my $fh = do {local(*FH);};

Line 1884 sub printLog($;$) {

Line 1922 sub printLog($;$) {

}

if (not $defaultTextPlain) {

print " / ";

&download_link($fileurl, $_, "(as text)",

"text/plain");

}

if (!$defaultViewable) {

Line 2025 sub printLog($;$) {

Line 2063 sub printLog($;$) {

print "</PRE>\n";

}

sub doLog {

sub doLog($) {

my($fullname) = @_;

my ($diffrev, $upwhere, $filename, $backurl);

readLog($fullname);

html_header("CVS log for $where");

Line 2089 EOF

Line 2127 EOF

$diffrev = $input{"r2"} if (defined($input{"r2"}));

print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr2\" VALUE=\"$diffrev\" onChange='docuement.diff_select.r2.selectedIndex=0'>\n";

print "<BR>Type of Diff should be a ";

printDiffSelect();

printDiffSelect(0);

print "<INPUT TYPE=SUBMIT VALUE=\" Get Diffs \">\n";

print "</FORM>\n";

print "<HR noshade>\n";

Line 2144 EOF

Line 2182 EOF

print "</BODY></HTML>\n";

}

sub flush_diff_rows ($$$$)

sub flush_diff_rows($$$$) {

{

my $j;

my ($leftColRef,$rightColRef,$leftRow,$rightRow) = @_;

if ($state eq "PreChangeRemove") { # we just got remove-lines before

Line 2190 sub human_readable_diff($){

Line 2227 sub human_readable_diff($){

($pathname = $where_nd) =~ s/(Attic\/)?[^\/]*$//;

($scriptwhere_nd = $scriptwhere) =~ s/.diff$//;

navigateHeader ($scriptwhere_nd, $pathname, $filename, $rev, "diff");

navigateHeader($scriptwhere_nd, $pathname, $filename, $rev, "diff");

# Read header to pick up read revision and date, if possible

while (<$fh>) {

Line 2206 sub human_readable_diff($){

Line 2243 sub human_readable_diff($){

$rev2 = $r2r;

$date2 = $r2d;

}

print "<h3 align=center>Diff for /$where_nd between version $rev1 and $rev2</h3>\n";

print "<table border=0 cellspacing=0 cellpadding=0 width=\"100%\">\n";

Line 2236 sub human_readable_diff($){

Line 2273 sub human_readable_diff($){

####

while (<$fh>) {

$difftxt = $_;

if ($difftxt =~ /^@@/) {

($oldline,$newline,$funname) = $difftxt =~ /@@ \-([0-9]+).*\+([0-9]+).*@@(.*)/;

print "<tr bgcolor=\"$diffcolorHeading\"><td width=\"50%\">";

Line 2256 sub human_readable_diff($){

Line 2293 sub human_readable_diff($){

# Add fontface, size

$_ = "$fs $_$fe";

#########

# little state machine to parse unified-diff output (Hen, zeller@think.de)

# in order to get some nice 'ediff'-mode output

Line 2274 sub human_readable_diff($){

Line 2311 sub human_readable_diff($){

$state = "PreChange";

$rightCol[$rightRow++] = $_;

}

elsif ($diffcode eq '-') {

$state = "PreChangeRemove";

$leftCol[$leftRow++] = $_;

Line 2330 sub human_readable_diff($){

Line 2367 sub human_readable_diff($){

print "</tr></table>";

}

sub navigateHeader ($$$$$) {

sub navigateHeader($$$$$) {

my ($swhere,$path,$filename,$rev,$title) = @_;

$swhere = "" if ($swhere eq $scriptwhere);

$swhere = urlencode($filename) if ($swhere eq "");

print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">";

print "<HTML>\n<HEAD>\n";

print '';

print '';

print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n";

print "<BODY BGCOLOR=\"$backcolor\">\n";

print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">";

Line 2344 sub navigateHeader ($$$$$) {

Line 2381 sub navigateHeader ($$$$$) {

print "<a href=\"$swhere$query#rev$rev\">$backicon";

print "</a> <b>Return to ", &link("$filename","$swhere$query#rev$rev")," CVS log";

print "</b> $fileicon</td>";

print "<td align=right>$diricon <b>Up to ", &clickablePath($path, 1), "</b></td>";

print "</tr></table>";

}

sub plural_write ($$)

sub plural_write($$) {

{

my ($num,$text) = @_;

if ($num != 1) {

$text = $text . "s";

Line 2368 sub plural_write ($$)

Line 2404 sub plural_write ($$)

# '..time ago'

# H. Zeller <zeller@think.de>

sub readableTime ($$)

sub readableTime($$) {

{

my ($i, $break, $retval);

my ($secs,$long) = @_;

Line 2387 sub readableTime ($$)

Line 2422 sub readableTime ($$)

31536000, 'year');

my @breaks = sort {$a <=> $b} keys %desc;

$i = 0;

while ($i <= $#breaks && $secs >= 2 * $breaks[$i]) {

$i++;

}

$i--;

Line 2398 sub readableTime ($$)

Line 2433 sub readableTime ($$)

my $rest = $secs % $break;

$i--;

$break = $breaks[$i];

my $resttime = plural_write(int ($rest / $break),

$desc{$break});

if ($resttime) {

$retval = $retval . ", " . $resttime;

Line 2416 sub readableTime ($$)

Line 2451 sub readableTime ($$)

# basename (last directory/file) is a link as well

sub clickablePath($$) {

my ($pathname,$clickLast) = @_;

my $retval = '';

if ($pathname eq '/') {

# this should never happen - chooseCVSRoot() is

# intended to do this

Line 2460 sub chooseCVSRoot() {

Line 2495 sub chooseCVSRoot() {

my ($k);

print "<form method=\"GET\" action=\"${scriptwhere}\">\n";

foreach $k (keys %input) {

print "<input type=hidden NAME=$k VALUE=$input{$k}>\n"

if ($input{$k}) && ($k ne "cvsroot");

}

# Form-Elements look wierd in Netscape if the background

Line 2494 sub chooseMirror() {

Line 2529 sub chooseMirror() {

# and may not be useful for your site; If you don't

# set %MIRRORS this won't show up, anyway

# Should perhaps exlude the current site somehow..

if (keys %MIRRORS) {

print "\nThis cvsweb is mirrored in:\n";

foreach $mirror (keys %MIRRORS) {

Line 2506 sub chooseMirror() {

Line 2541 sub chooseMirror() {

}

sub fileSortCmp {

sub fileSortCmp() {

my ($comp) = 0;

my ($c,$d,$af,$bf);

Line 2537 sub fileSortCmp {

Line 2572 sub fileSortCmp {

}

# make A url for downloading

sub download_url {

sub download_url($$;$) {

my ($url,$revision,$mimetype) = @_;

$revision =~ s/\b0\.//;

Line 2554 sub download_url {

Line 2589 sub download_url {

return $url;

}

# Presents a link to download the

# selected revision

sub download_link {

sub download_link($$$;$) {

my ($url,$revision,$textlink,$mimetype) = @_;

my ($fullurl) = download_url($url,$revision,$mimetype);

my ($paren) = $textlink =~ /^\(/;

Line 2628 sub toggleQuery($$) {

Line 2663 sub toggleQuery($$) {

return "";

}

sub urlencode {

sub urlencode($) {

my ($in) = @_;

my ($out);

($out = $in) =~ s/([\000-+{-\377])/sprintf("%%%02x", ord($1))/ge;

return $out;

}

sub http_header {

sub http_header(;$) {

my $content_type = shift || "text/html";

if (defined($moddate)) {

if ($is_mod_perl) {

Line 2690 sub http_header {

Line 2725 sub http_header {

sub html_header($) {

my ($title) = @_;

my $version = '$zRevision: 1.93 $ $kRevision: 1.11 $';

my $version = '$zRevision: 1.93 $ $kRevision: 1.13 $'; #'

http_header();

print <<EOH;

<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"

Line 2704 $logo <h1 align="center">$title</h1>

Line 2739 $logo <h1 align="center">$title</h1>

EOH

}

sub html_footer {

sub html_footer() {

return "<hr noshade><address>$address</address>\n";

}

sub link_tags

sub link_tags($) {

{

my ($tags) = @_;

my ($ret) = "";

my ($fileurl,$filename);

Line 2728 sub link_tags

Line 2762 sub link_tags

# See if a module is listed in the config file's @HideModule list.

sub forbidden_module {

sub forbidden_module($) {

my($module) = @_;

for (my $i=0; $i < @HideModules; $i++) {

return 1 if $module eq $HideModules[$i];

}

CVSweb