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.15 and 1.1.1.21

version 1.1.1.15, 2000/12/18 04:35:54

version 1.1.1.21, 2001/01/12 04:17:16

Line 1

#!/usr/bin/perl5 -ws

#!/usr/bin/perl -wT

# cvsweb - a CGI interface to CVS trees.

Line 43

# SUCH DAMAGE.

# $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $

# $kId: cvsweb.cgi,v 1.45 2000/12/18 04:25:30 knu Exp $

# $kId: cvsweb.cgi,v 1.63 2001/01/11 23:42:01 knu Exp $

###

require 5.000;

use strict;

use vars qw (

$config $allow_version_select $verbose

$mydir $uname $config $allow_version_select $verbose

%CVSROOT %CVSROOTdescr %MIRRORS %DEFAULTVALUE %ICONS %MTYPES

@CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr

%MIRRORS %DEFAULTVALUE %ICONS %MTYPES

@DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS

%alltags @tabcolors %fileinfo %tags @branchnames %nameprinted

%symrev %revsym @allrevisions %date %author @revdisplayorder

@revisions %state %difflines %log %branchpoint @revorder

$prcgi @prcategories $prcategories $mancgi

$prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword $mancgi

$checkoutMagic $doCheckout $scriptname $scriptwhere

$where $pathinfo $Browser $nofilelinks $maycompress @stickyvars

%funcline_regexp $is_mod_perl

Line 64 use vars qw (

Line 67 use vars qw (

%input $query $barequery $sortby $bydate $byrev $byauthor

$bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot

$mimetype $charset $defaultTextPlain $defaultViewable

$allow_compress $GZIPBIN $backicon $diricon $fileicon

$command_path %CMD $allow_compress

$backicon $diricon $fileicon

$fullname $newname $cvstreedefault

$body_tag $body_tag_for_src $logo $defaulttitle $address

$long_intro $short_instruction $shortLogLen

Line 75 use vars qw (

Line 79 use vars qw (

$difffontsize $inputTextSize $mime_types $allow_annotate

$allow_markup $use_java_script $open_extern_window

$extern_window_width $extern_window_height $edit_option_form

$show_subdir_lastmod $show_log_in_markup $v

$show_subdir_lastmod $show_log_in_markup $preformat_in_markup $v

$navigationHeaderColor $tableBorderColor $markupLogColor

$tabstop $state $annTable $sel $curbranch @HideModules

$module $use_descriptions %descriptions @mytz $dwhere $moddate

$use_moddate $has_zlib $gzip_open

$allow_tar @tar_options @gzip_options @cvs_options

$LOG_FILESEPARATOR $LOG_REVSEPARATOR

);

Line 95 sub revcmp($$);

Line 100 sub revcmp($$);

sub fatal($$);

sub redirect($);

sub safeglob($);

sub search_path($);

sub getMimeTypeFromSuffix($);

sub head($;$);

sub scan_directives(@);

Line 122 sub toggleQuery($$);

Line 128 sub toggleQuery($$);

sub urlencode($);

sub htmlquote($);

sub htmlunquote($);

sub hrefquote($);

sub http_header(;$);

sub html_header($);

sub html_footer();

Line 129 sub link_tags($);

Line 136 sub link_tags($);

sub forbidden_module($);

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

use Cwd;

delete $ENV{PATH};

use File::Basename;

($mydir) = (dirname($0) =~ /(.*)/); # untaint

# == EDIT this ==

# Locations to search for user configuration, in order:

for (

$ENV{CVSWEB_CONFIG},

"$mydir/cvsweb.conf",

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

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

getcwd() . '/cvsweb.conf'

) {

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

if (defined($_) && -r $_) {

$config = $_;

last;

}

# == Configuration defaults ==

Line 150 $allow_version_select = 1;

Line 163 $allow_version_select = 1;

######## Configuration variables #########

# These are defined to allow checking with perl -cw

%CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES =

@CVSrepositories = @CVSROOT = %CVSROOT =

%MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES =

%tags = %alltags = @tabcolors = ();

$cvstreedefault = $body_tag = $body_tag_for_src =

$logo = $defaulttitle = $address =

Line 228 $verbose = $v;

Line 242 $verbose = $v;

$checkoutMagic = "~checkout~";

$pathinfo = defined($ENV{PATH_INFO}) ? $ENV{PATH_INFO} : '';

$where = $pathinfo;

$doCheckout = ($where =~ /^\/$checkoutMagic/);

$doCheckout = ($where =~ m|^/$checkoutMagic/|);

$where =~ s|^/($checkoutMagic)?||;

$where =~ s|^/$checkoutMagic/|/|;

$where =~ s|/+$||;

$where =~ s|^/||;

$scriptname = defined($ENV{SCRIPT_NAME}) ? $ENV{SCRIPT_NAME} : '';

$scriptname =~ s|^/?|/|;

$scriptname =~ s|^/*|/|;

$scriptname =~ s|/+$||;

$scriptwhere = $scriptname;

# Let's workaround thttpd's stupidness..

if ($where) {

if ($scriptname =~ m|/$|) {

$scriptwhere .= '/' . urlencode($where);

$pathinfo .= '/';

my $re = quotemeta $pathinfo;

$scriptname =~ s/$re$//;

}

$scriptwhere = $scriptname;

$scriptwhere .= '/' . urlencode($where);

$where = '/' if ($where eq '');

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

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

Line 277 $maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING})

Line 297 $maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING})

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

if (-f $config) {

do $config

require $config

|| &fatal("500 Internal Error",

sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>',

$config, &htmlify($@)));

Line 294 $query = $ENV{QUERY_STRING};

Line 314 $query = $ENV{QUERY_STRING};

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

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

y/+/ /;

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

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

$input{$1} = $2 if ($2 ne "");

Line 352 else {

Line 373 else {

}

undef @barequery;

if (defined($input{path})) {

redirect("$scriptname/$input{path}$query");

}

# get actual parameters

$sortby = $input{"sortby"};

$bydate = 0;

Line 379 $defaultDiffType = $input{'f'};

Line 404 $defaultDiffType = $input{'f'};

$logsort = $input{'logsort'};

my @tmp = @CVSrepositories;

my @pair;

while (@pair = splice(@tmp, 0, 2)) {

my($key, $val) = @pair;

my($descr, $cvsroot) = @$val;

next if !-d $cvsroot;

$CVSROOTdescr{$key} = $descr;

$CVSROOT{$key} = $cvsroot;

push @CVSROOT, $key;

}

undef @tmp;

undef @pair;

## Default CVS-Tree

if (!defined($CVSROOT{$cvstreedefault})) {

&fatal("500 Internal Error",

Line 404 foreach $k (keys %ICONS) {

Line 444 foreach $k (keys %ICONS) {

my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}};

if ($ipath) {

${"${k}icon"} = sprintf('<IMG SRC="%s" ALT="%s" BORDER="0" WIDTH="%d" HEIGHT="%d">',

htmlquote($ipath), htmlquote($itxt), $iwidth, $iheight)

hrefquote($ipath), htmlquote($itxt), $iwidth, $iheight)

}

else {

${"${k}icon"} = $itxt;

Line 416 my $config_cvstree = "$config-$cvstree";

Line 456 my $config_cvstree = "$config-$cvstree";

# Do some special configuration for cvstrees

if (-f $config_cvstree) {

do $config_cvstree

require $config_cvstree

|| &fatal("500 Internal Error",

sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>',

$config_cvstree, &htmlify($@)));

}

undef $config_cvstree;

$prcategories = '(?:' . join('|', @prcategories) . ')';

$re_prcategories = '(?:' . join('|', @prcategories) . ')' if @prcategories;

$re_prkeyword = quotemeta($prkeyword) if defined($prkeyword);

$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/;

$fullname = $cvsroot . '/' . $where;

$fullname = "$cvsroot/$where";

$mimetype = &getMimeTypeFromSuffix ($fullname);

$defaultTextPlain = ($mimetype eq "text/plain");

$defaultViewable = $allow_markup && viewable($mimetype);

# search for GZIP if compression allowed

my $rewrite = 0;

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

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

if ($pathinfo =~ m|//|) {

# output through the nonexistent gzip ..

$pathinfo =~ y|/|/|s;

# any more elegant ways to prevent this are welcome!

$rewrite = 1;

if ($allow_compress && $maycompress && !$has_zlib) {

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

if (-x "$_/gzip") {

$GZIPBIN = "$_/gzip";

last;

}

if (-d $fullname) {

if (-d $fullname && $pathinfo !~ m|/$|) {

$pathinfo .= '/';

# ensure, that directories always end with (exactly) one '/'

$rewrite = 1;

# to allow relative URL's. If they're not, make a redirect.

if (!($pathinfo =~ m|/$|) || ($pathinfo =~ m |/{2,}$|)) {

redirect ($scriptwhere . '/' . $query);

}

else {

$where .= '/';

$scriptwhere .= '/';

}

if (!-d $fullname && $pathinfo =~ m|/$|) {

chop $pathinfo;

$rewrite = 1;

}

if ($rewrite) {

redirect($scriptname . urlencode($pathinfo) . $query);

}

undef $rewrite;

if (!-d $cvsroot) {

&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.');

}

Line 471 $module = $1;

Line 507 $module = $1;

if ($module && &forbidden_module($module)) {

&fatal("403 Forbidden", "Access to $where forbidden.");

}

# Handle tarball downloads before any headers are output.

if ($input{tarball}) {

&fatal("403 Forbidden", "Downloading tarballs is prohibited.")

unless $allow_tar;

my($module) = ($where =~ m,^/?(.*),); # untaint

$module =~ s,/[^/]*$,,;

my($basedir) = ($module =~ m,([^/]+)$,);

if ($basedir eq '' || $module eq '') {

&fatal("500 Internal Error", "You cannot download the top level directory.");

}

my $tmpdir = "/tmp/.cvsweb.$$." . int(time);

mkdir($tmpdir, 0700)

or &fatal("500 Internal Error", "Unable to make temporary directory: $!");

my $fatal = '';

while (1) {

my $tag = (exists $input{only_with_tag} && length $input{only_with_tag})

? $input{only_with_tag} : "HEAD";

system $CMD{cvs}, @cvs_options, '-Qd', $cvsroot, 'export', '-r', $tag, '-d', "$tmpdir/$basedir", $module

and $fatal = "500 Internal Error","cvs co failure: $!: $module"

&& last;

$| = 1; # Essential to get the buffering right.

print "Content-type: application/x-gzip\r\n\r\n";

system "$CMD{tar} @tar_options -cf - -C $tmpdir $basedir | $CMD{gzip} @gzip_options -c"

and $fatal = "500 Internal Error","tar zc failure: $!: $basedir"

&& last;

last;

}

system $CMD{rm}, '-rf', $tmpdir if -d $tmpdir;

&fatal($fatal) if $fatal;

exit;

}

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

# View a directory

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

elsif (-d $fullname) {

if (-d $fullname) {

my $dh = do {local(*DH);};

opendir($dh, $fullname) || &fatal("404 Not Found","$where: $!");

my @dir = readdir($dh);

Line 809 elsif (-d $fullname) {

Line 893 elsif (-d $fullname) {

">$tag\n";

}

print "</SELECT>\n";

print " Module path or alias:\n";

printf "<INPUT TYPE=TEXT NAME=\"path\" VALUE=\"%s\" SIZE=15>\n", htmlquote($where);

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

print "</FORM>\n";

}

if ($allow_tar) {

my($basefile) = ($where =~ m,(?:.*/)?([^/]+),);

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

print "<HR NOSHADE>\n",

"<DIV align=center>",

&link("Download this directory in tarball",

# Mangle the filename so browsers show a reasonable

# filename to download.

"$basefile.tar.gz$query".

($query ? "&" : "?")."tarball=1"),

"</DIV>";

}

my $formwhere = $scriptwhere;

$formwhere =~ s|Attic/?$|| if ($input{'hideattic'});

Line 895 elsif (-d $fullname) {

Line 997 elsif (-d $fullname) {

# The file has been removed and is in the Attic.

# Send a redirect pointing to the file in the Attic.

(my $newplace = $scriptwhere) =~ s|/([^/]+)$|/Attic/$1|;

&redirect($newplace);

redirect("$newplace$query");

exit;

}

elsif (0 && (my @files = &safeglob($fullname . ",v"))) {

Line 911 elsif (-d $fullname) {

Line 1013 elsif (-d $fullname) {

# Assume it's a module name with a potential path following it.

$xtra = (($module = $where) =~ s|/.*||) ? $& : '';

# Is there an indexed version of modules?

if (open($fh, "$cvsroot/CVSROOT/modules")) {

if (open($fh, "< $cvsroot/CVSROOT/modules")) {

while (<$fh>) {

if (/^(\S+)\s+(\S+)/o && $module eq $1

&& -d "$cvsroot/$2" && $module ne $2) {

&redirect("$scriptname/$2$xtra");

redirect("$scriptname/$2$xtra$query");

}

Line 1036 sub htmlify($;$) {

Line 1138 sub htmlify($;$) {

if ($extra) {

# get PR #'s as link: "PR#nnnn" "PR: nnnn, ..." "PR nnnn, ..." "bin/nnnn"

if (defined($prcgi)) {

if (defined($prcgi) && defined($re_prcategories) && defined($re_prkeyword)) {

my $prev;

do {

Line 1044 sub htmlify($;$) {

Line 1146 sub htmlify($;$) {

$_ = htmlify_sub {

(\bPR[:\#]?\s*

(\b$re_prkeyword[:\#]?\s*

(?:

\#?

\d+[,\s]\s*

Line 1059 sub htmlify($;$) {

Line 1161 sub htmlify($;$) {

$_ = htmlify_sub {

(\b$prcategories/(\d+)\b)

(\b$re_prcategories/(\d+)\b)

}{

&link($1, sprintf($prcgi, $2))

}egox;

Line 1070 sub htmlify($;$) {

Line 1172 sub htmlify($;$) {

if (defined($mancgi)) {

$_ = htmlify_sub {

(\b([a-zA-Z][\w_.]+)

(\b([a-zA-Z][\w.]+)

(?:

$ ([0-9n]) $\B

Line 1078 sub htmlify($;$) {

Line 1180 sub htmlify($;$) {

)

}{

&link($1, sprintf($mancgi, $3 ne '' ? $3 : $4, $2))

&link($1, sprintf($mancgi, defined($3) ? $3 : $4, $2))

}egx;

} $_;

}

Line 1118 sub spacedHtmlText($;$) {

Line 1220 sub spacedHtmlText($;$) {

}

sub link($$) {

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

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

sprintf '<A HREF="%s">%s</A>', htmlquote($where), $name;

sprintf '<A HREF="%s">%s</A>', hrefquote($url), $name;

}

sub revcmp($$) {

Line 1202 sub safeglob($) {

Line 1304 sub safeglob($) {

@results;

}

sub search_path($) {

my($command) = @_;

my $d;

for $d (split(/:/, $command_path)) {

return "$d/$command" if -x "$d/$command";

}

$command;

}

sub getMimeTypeFromSuffix($) {

my ($fullname) = @_;

my ($mimetype, $suffix);

Line 1275 sub doAnnotate($$) {

Line 1388 sub doAnnotate($$) {

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

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

# make sure the revisions a wellformed, for security

# make sure the revisions are wellformed, for security

# reasons ..

if ($rev =~ /[^\w.]/) {

&fatal("404 Not Found",

Line 1294 sub doAnnotate($$) {

Line 1407 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 -Rl server") || fatal ("500 Internal Error",

$pid = open2($reader, $writer, "cvs", @cvs_options, "server")

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

|| 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

Line 1486 sub doCheckout($$) {

Line 1599 sub doCheckout($$) {

# Safely for a child process to read from.

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

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

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

exec($CMD{cvs}, @cvs_options, '-d', $cvsroot, 'co', '-p', $revopt, $where);

}

if (eof($fh)) {

Line 1564 sub cvswebMarkup($$$) {

Line 1677 sub cvswebMarkup($$$) {

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

print "<HR noshade>";

if ($mimetype =~ /^image/) {

printf '<IMG SRC="%s"><BR>', htmlquote("$url$barequery");

printf '<IMG SRC="%s"><BR>', hrefquote("$url$barequery");

}

elsif ($mimetype =~ m%^application/pdf%) {

printf '<EMBED SRC="%s" WIDTH="100%"><BR>', htmlquote("$url$barequery");

printf '<EMBED SRC="%s" WIDTH="100%"><BR>', hrefquote("$url$barequery");

}

else {

elsif ($preformat_in_markup) {

print "<PRE>";

# prefetch several lines

Line 1584 sub cvswebMarkup($$$) {

Line 1697 sub cvswebMarkup($$$) {

}

print "</PRE>";

}

else {

print "<PLAINTEXT>\n", <$filehandle>;

}

sub viewable($) {

Line 1664 sub doDiff($$$$$$) {

Line 1780 sub doDiff($$$$$$) {

}

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

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

exec("rcsdiff",@difftype,"-r$rev1","-r$rev2",$fullname);

exec($CMD{rcsdiff}, @difftype, "-r$rev1", "-r$rev2", $fullname);

}

if ($human_readable) {

http_header();

Line 1745 sub getDirLogs($$@) {

Line 1861 sub getDirLogs($$@) {

return;

}

if ($tag) {

if (defined($tag)) {

#can't use -r<tag> as - is allowed in tagnames, but misinterpreated by rlog..

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

open(STDERR, '>/dev/null'); # rlog may complain; ignore.

exec('rlog', @files);

exec($CMD{rlog}, @files);

}

else {

my $kidpid = open($fh, "-|");

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

if (! $kidpid) {

open(STDERR, '>/dev/null'); # rlog may complain; ignore.

exec($CMD{rlog}, '-r', @files);

exec('rlog', '-r', @files);

}

$state = "start";

while (<$fh>) {

if ($state eq "start") {

#Next file. Initialize file variables

$rev = undef;

$rev = '';

$revwanted = undef;

$revwanted = '';

$branch = undef;

$branch = '';

$branchpoint = undef;

$branchpoint = '';

$filename = undef;

$filename = '';

$log = undef;

$log = '';

$revision = undef;

$revision = '';

$branch = undef;

%symrev = ();

@filetags = ();

#jump to head state

Line 1789 again:

Line 1903 again:

$branch = $1

} elsif (/^symbolic names:/) {

$state = "tags";

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

($branch = $head) =~ s/\.\d+$// if $branch eq '';

$branch =~ s/(\d+)$/0.$1/;

$symrev{MAIN} = $branch;

$symrev{HEAD} = $branch;

Line 1798 again:

Line 1912 again:

push (@filetags, "MAIN", "HEAD");

} elsif (/$LOG_REVSEPARATOR/o) {

$state = "log";

$rev = undef;

$rev = '';

$date = undef;

$date = '';

$log = "";

$log = '';

# Try to reconstruct the relative filename if RCS spits out a full path

$filename =~ s%^\Q$DirName\E/%%;

}

Line 1818 again:

Line 1932 again:

$revwanted = $symrev{$tag eq "HEAD" ? "MAIN" : $tag};

($branch = $revwanted) =~ s/\b0\.//;

($branchpoint = $branch) =~ s/\.?\d+$//;

$revwanted = undef if ($revwanted ne $branch);

$revwanted = '' if ($revwanted ne $branch);

} elsif ($tag ne "HEAD") {

print "Tag not found, skip this file" if ($verbose);

$state = "skip";

Line 1835 again:

Line 1949 again:

if ($state eq "log") {

if (/$LOG_REVSEPARATOR/o || /$LOG_FILESEPARATOR/o) {

# End of a log entry.

my $revbranch;

my $revbranch = $rev;

($revbranch = $rev) =~ s/\.\d+$//;

$revbranch =~ s/\.\d+$//;

print "$filename $rev Wanted: $revwanted ",

"Revbranch: $revbranch Branch: $branch ",

"Branchpoint: $branchpoint\n" if ($verbose);

if (!defined($revwanted) && defined($branch)

if ($revwanted eq '' && $branch ne ''

&& $branch eq $revbranch || !defined($tag)) {

print "File revision $rev found for branch $branch\n"

if ($verbose);

$revwanted = $rev;

}

if (defined($revwanted) ? $rev eq $revwanted :

if ($revwanted ne '' ? $rev eq $revwanted :

defined($branchpoint) ? $rev eq $branchpoint :

$branchpoint ne '' ? $rev eq $branchpoint :

0 && ($rev eq $head)) { # Don't think head is needed here..

print "File info $rev found for $filename\n" if ($verbose);

my @finfo = ($rev,$date,$log,$author,$filename);

Line 1856 again:

Line 1970 again:

$fileinfo{$name} = [ @finfo ];

$state = "done" if ($rev eq $revwanted);

}

$rev = undef;

$rev = '';

$date = undef;

$date = '';

$log = "";

$log = '';

}

elsif (!defined($date) && m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);|) {

elsif ($date eq '' && m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);|) {

my $yr = $1;

# damn 2-digit year routines :-)

if ($yr > 100) {

Line 1872 again:

Line 1986 again:

$log = '';

next;

}

elsif (!defined($rev) && m/^revision (.*)$/) {

elsif ($rev eq '' && /^revision (.*)$/) {

$rev = $1;

next;

}

Line 1887 again:

Line 2001 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 ?");

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

}

close($fh);

}

Line 1915 sub readLog($;$) {

Line 2029 sub readLog($;$) {

print("Going to rlog '$fullname'\n") if ($verbose);

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

if ($revision ne '') {

exec("rlog",$revision,$fullname);

exec($CMD{rlog}, $revision, $fullname);

}

else {

exec("rlog",$fullname);

exec($CMD{rlog}, $fullname);

}

while (<$fh>) {

print if ($verbose);

Line 2280 sub printLog($;$) {

Line 2394 sub printLog($;$) {

if (/^\d+\.\d+\.\d+/ && !/^1\.1\.1\.\d+$/) {

my ($i,$nextmain);

for ($i = 0; $i < $#revorder && $revorder[$i] ne $_; $i++){}

my (@tmp2) = split(/\./, $_);

my @tmp2 = split(/\./, $_);

for ($nextmain = ""; $i > 0; $i--) {

my ($next) = $revorder[$i-1];

my $next = $revorder[$i-1];

my (@tmp1) = split(/\./, $next);

my @tmp1 = split(/\./, $next);

if ($#tmp1 < $#tmp2) {

if (@tmp1 < @tmp2) {

$nextmain = $next;

last;

}

# Only the highest version on a branch should have

# a diff for the "next main".

last if (join(".",@tmp1[0..$#tmp1-1])

last if (@tmp1 - 1 <= @tmp2 &&

eq join(".",@tmp2[0..$#tmp1-1]));

join(".",@tmp1[0..$#tmp1-1]) eq join(".",@tmp2[0..$#tmp1-1]));

}

if (!defined($diffrev{$nextmain})) {

$diffrev{$nextmain} = 1;

Line 2641 sub navigateHeader($$$$$) {

Line 2755 sub navigateHeader($$$$$) {

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

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

print qq`<META name="robots" content="nofollow">\n`;

print '';

print '';

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

print "$body_tag_for_src\n";

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

Line 2755 sub clickablePath($$) {

Line 2869 sub clickablePath($$) {

}

sub chooseCVSRoot() {

my @foo;

if (2 <= @CVSROOT) {

foreach (sort keys %CVSROOT) {

if (-d $CVSROOT{$_}) {

push(@foo, $_);

}

if (@foo > 1) {

my ($k);

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

foreach $k (keys %input) {

Line 2776 sub chooseCVSRoot() {

Line 2884 sub chooseCVSRoot() {

print "<td>\n<select name=\"cvsroot\"";

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

print ">\n";

foreach $k (@foo) {

foreach $k (@CVSROOT) {

print "<option value=\"$k\"";

print " selected" if ($k eq $cvstree);

print ">", ($CVSROOTdescr{$k} ? $CVSROOTdescr{$k} : $k), "</option>\n";

}

print "</select>\n</td>";

print "<td><input type=submit value=\"Go\"></td>";

print "<td>";

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

}

else {

# no choice ..

print "CVS Root: <b>[$cvstree]</b>";

}

print " Module path or alias:\n";

print "<INPUT TYPE=TEXT NAME=\"path\" VALUE=\"\" SIZE=15>\n";

print "<input type=submit value=\"Go\">";

if (2 <= @CVSROOT) {

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

}

sub chooseMirror() {

Line 2864 sub download_link($$$;$) {

Line 2979 sub download_link($$$;$) {

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

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

printf '<A HREF="%s"', htmlquote("$fullurl$barequery");

printf '<A HREF="%s"', hrefquote("$fullurl$barequery");

if ($open_extern_window && (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) {

print ' target="cvs_checkout"';

Line 2898 sub download_link($$$;$) {

Line 3013 sub download_link($$$;$) {

if (defined($extern_window_height));

printf q` onClick="window.open('%s','cvs_checkout','%s');"`,

htmlquote($fullurl), join(',', @attr);

hrefquote($fullurl), join(',', @attr);

}

print "><b>$textlink</b></A>";

Line 2938 sub urlencode($) {

Line 3053 sub urlencode($) {

s/[\000-+{-\377]/sprintf("%%%02x", ord($&))/ge;

$_;

}

sub htmlquote($) {

Line 2966 sub htmlunquote($) {

Line 3080 sub htmlunquote($) {

$_;

}

sub hrefquote($) {

local($_) = @_;

y/ /+/;

htmlquote($_)

}

sub http_header(;$) {

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

$content_type .= "; charset=$charset"

if $content_type =~ m,^text/, && defined($charset) && $charset;

if (defined($moddate)) {

if ($is_mod_perl) {

Apache->request->header_out("Last-Modified" => scalar gmtime($moddate) . " GMT");

Line 2983 sub http_header(;$) {

Line 3109 sub http_header(;$) {

print "Content-type: $content_type\r\n";

}

if ($allow_compress && $maycompress) {

if ($has_zlib || (defined($GZIPBIN) && open(GZIP, "|$GZIPBIN -1 -c"))) {

if ($has_zlib || (defined($CMD{gzip}) && open(GZIP, "| $CMD{gzip} -1 -c"))) {

if ($is_mod_perl) {

Apache->request->content_encoding("x-gzip");

Apache->request->header_out(Vary => "Accept-Encoding");

Line 3009 sub http_header(;$) {

Line 3135 sub http_header(;$) {

else {

print "\r\n"; # Close headers

}

print "<font size=-1>Unable to find gzip binary in the \$PATH to compress output</font><br>";

print "<font size=-1>Unable to find gzip binary in the <b>\$command_path</b> ($command_path) to compress output</font><br>";

}

else {

Line 3024 sub http_header(;$) {

Line 3150 sub http_header(;$) {

sub html_header($) {

my ($title) = @_;

my $version = '$zRevision: 1.104 $ $kRevision: 1.45 $'; #'

my $version = '$zRevision: 1.104 $ $kRevision: 1.63 $'; #'

http_header(defined($charset) ? "text/html; charset=$charset" : "text/html");

http_header("text/html");

print <<EOH;

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

"http://www.w3.org/TR/REC-html40/loose.dtd">

CVSweb