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.18 and 1.1.1.23

version 1.1.1.18, 2001/01/01 23:55:44

version 1.1.1.23, 2001/03/22 19:52:43

Line 1

#!/usr/bin/perl5 -ws

#!/usr/bin/perl -wT

# cvsweb - a CGI interface to CVS trees.

Line 18

# Redistribution and use in source and binary forms, with or without

Line 42

# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

# SUCH DAMAGE.

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

# $zId: cvsweb.cgi,v 1.106 2001/03/10 01:16:27 hnordstrom Exp $

# $kId: cvsweb.cgi,v 1.54 2001/01/01 23:15:02 knu Exp $

# $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.68 2001/03/22 19:46:59 knu Exp $

###

require 5.000;

use strict;

use vars qw (

$config $allow_version_select $verbose

$cvsweb_revision

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

$mydir $uname $config $allow_version_select $verbose

@CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr

%MIRRORS %DEFAULTVALUE %ICONS %MTYPES

@DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS

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

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

Line 64 use vars qw (

Line 68 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 79 use vars qw (

Line 84 use vars qw (

$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 @cvs_options

$use_moddate $has_zlib $gzip_open

$allow_tar @tar_options @gzip_options @cvs_options

$LOG_FILESEPARATOR $LOG_REVSEPARATOR

);

Line 95 sub revcmp($$);

Line 101 sub revcmp($$);

sub fatal($$);

sub redirect($);

sub safeglob($);

sub search_path($);

sub getMimeTypeFromSuffix($);

sub head($;$);

sub scan_directives(@);

Line 130 sub link_tags($);

Line 137 sub link_tags($);

sub forbidden_module($);

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

use Cwd;

delete $ENV{PATH};

$cvsweb_revision = '1.106' . '.' . (split(/ /,

q$Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.68 2001/03/22 19:46:59 knu Exp $

))[2];

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 151 $allow_version_select = 1;

Line 168 $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 229 $verbose = $v;

Line 247 $verbose = $v;

$checkoutMagic = "~checkout~";

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

$where = $pathinfo;

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

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

$doCheckout = ($where =~ /^\/$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 stupidity..

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 286 if (-f $config) {

Line 309 if (-f $config) {

} else {

&fatal("500 Internal Error",

'Configuration not found. Set the variable <code>$config</code> '

. 'in cvsweb.cgi, or the environment variable '

. 'in cvsweb.cgi to your <b>cvsweb.conf</b> configuration file first.');

. '<code>CVSWEB_CONFIG</code>, to your <b>cvsweb.conf</b> '

. 'configuration file first.');

}

undef %input;

Line 355 else {

Line 376 else {

}

undef @barequery;

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

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

}

# get actual parameters

$sortby = $input{"sortby"};

$bydate = 0;

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

Line 407 $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 435 $mimetype = &getMimeTypeFromSuffix ($fullname);

Line 475 $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 482 if ($module && &forbidden_module($module)) {

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

if ($input{tarball}) {

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

unless $allow_tar;

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

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

$where =~ s,^/,,;

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

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

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

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

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

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

}

Line 497 if ($input{tarball}) {

Line 532 if ($input{tarball}) {

my $fatal = '';

do {

while (1) {

chdir $tmpdir

or $fatal = "500 Internal Error", "Unable to cd to temporary directory: $!"

&& last;

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

? $input{only_with_tag} : "HEAD";

system "cvs", @cvs_options, "-Qd", $cvsroot, "export", "-r", $tag, $where

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

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

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

&& last;

chdir "$where/.."

or $fatal = "500 Internal Error","Cannot find expected directory in checkout"

&& last;

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

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

system "tar", "-zcf", "-", $basedir, @tar_options

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

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

&& last;

chdir $tmpdir

last;

or $fatal = "500 Internal Error","Unable to cd to temporary directory: $!"

}

&& last;

} while (0);

system "rm", "-rf", $tmpdir if -d $tmpdir;

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

&fatal($fatal) if $fatal;

Line 711 if (-d $fullname) {

Line 736 if (-d $fullname) {

if ($_ eq '..' || -d "$fullname/$_") {

next if ($_ eq '..' && $where eq '/');

my ($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}}

my ($rev,$date,$log,$author,$filename);

($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}}

if (defined($fileinfo{$_}));

printf '<tr bgcolor="%s"><td>', $tabcolors[$dirrow % 2] if $dirtable;

if ($_ eq '..') {

Line 871 if (-d $fullname) {

Line 897 if (-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";

}

Line 878 if (-d $fullname) {

Line 906 if (-d $fullname) {

if ($allow_tar) {

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

if ($basefile ne '') {

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

print "<HR NOSHADE>\n",

"<DIV align=center>",

&link("Download this directory in tarball",

Line 973 if (-d $fullname) {

Line 1001 if (-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 989 if (-d $fullname) {

Line 1017 if (-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 1196 sub spacedHtmlText($;$) {

Line 1224 sub spacedHtmlText($;$) {

}

sub link($$) {

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

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

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

$url =~ s/:/sprintf("%%%02x", ord($&))/eg;

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

}

sub revcmp($$) {

Line 1275 sub safeglob($) {

Line 1305 sub safeglob($) {

push(@results, "$dirname/" .$_);

}

closedir($dh);

}

@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 1353 sub doAnnotate($$) {

Line 1395 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 1372 sub doAnnotate($$) {

Line 1414 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 @cvs_options -l server") || fatal ("500 Internal Error",

$pid = open2($reader, $writer, $CMD{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 1564 sub doCheckout($$) {

Line 1606 sub doCheckout($$) {

# Safely for a child process to read from.

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

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

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

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

}

if (eof($fh)) {

Line 1745 sub doDiff($$$$$$) {

Line 1787 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 1829 sub getDirLogs($$@) {

Line 1871 sub getDirLogs($$@) {

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

Line 1967 again:

Line 2008 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 1995 sub readLog($;$) {

Line 2036 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 2600 sub human_readable_diff($){

Line 2641 sub human_readable_diff($){

print "<br>Tag: $sym2\n" if ($sym1);

print "</th>\n";

my $fs = "<font face=\"$difffontface\" size=\"$difffontsize\">";

my $fs = "<font face=\"$difffontface\" size=\"$difffontsize\"><tt>";

my $fe = "</font>";

my $fe = "</tt></font>";

my $leftRow = 0;

my $rightRow = 0;

Line 2718 sub navigateHeader($$$$$) {

Line 2759 sub navigateHeader($$$$$) {

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

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

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

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

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

print <<EOF;

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

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

print '';

<HTML>

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

<HEAD>

print "$body_tag_for_src\n";

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

print "<tr valign=bottom><td>";

<TITLE>$path$filename - $title - $rev</TITLE></HEAD>

$body_tag_for_src

EOF

print &link($backicon, "$swhere$query#rev$rev");

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

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

Line 2835 sub clickablePath($$) {

Line 2881 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 2856 sub chooseCVSRoot() {

Line 2896 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 2935 sub download_url($$;$) {

Line 2982 sub download_url($$;$) {

$url .= "?rev=$revision";

$url .= '&content-type=' . urlencode($mimetype) if (defined($mimetype));

$url =~ s/:/sprintf("%%%02x", ord($&))/eg;

$url;

}

Line 3074 sub http_header(;$) {

Line 3123 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 3100 sub http_header(;$) {

Line 3149 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 3115 sub http_header(;$) {

Line 3164 sub http_header(;$) {

sub html_header($) {

my ($title) = @_;

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

http_header("text/html");

print <<EOH;

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

Line 3124 sub html_header($) {

Line 3172 sub html_header($) {

<head>

<title>$title</title>

</head>

$body_tag

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

CVSweb