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.22 and 1.1.1.27

version 1.1.1.22, 2001/01/14 08:49:27

version 1.1.1.27, 2001/07/06 09:54:57

Line 42

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

# SUCH DAMAGE.

# $zId: cvsweb.cgi,v 1.105 2000/11/26 01:51:04 jumager Exp $

# $zId: cvsweb.cgi,v 1.110 2001/06/29 09:29:36 hnordstrom Exp $

# $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.64 2001/01/13 07:48:09 knu Exp $

# $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.78 2001/07/06 09:49:01 knu Exp $

###

Line 85 use vars qw (

$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

$allow_tar @tar_options @gzip_options @zip_options @cvs_options

$LOG_FILESEPARATOR $LOG_REVSEPARATOR

);

Line 139 sub forbidden_module($);

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

delete $ENV{PATH};

$cvsweb_revision = join('.', '1.105', (split(/ /,

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

q$Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.64 2001/01/13 07:48:09 knu Exp $

q$Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.78 2001/07/06 09:49:01 knu Exp $

))[2]);

))[2];

use File::Basename;

Line 170 $allow_version_select = 1;

# These are defined to allow checking with perl -cw

@CVSrepositories = @CVSROOT = %CVSROOT =

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

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

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

$cvstreedefault = $body_tag = $body_tag_for_src =

$logo = $defaulttitle = $address =

$long_intro = $short_instruction = $shortLogLen =

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 520 if ($input{tarball}) {

Line 518 if ($input{tarball}) {

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

unless $allow_tar;

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

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

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

my($ext) = ($1 =~ /(\.tar\.gz|\.zip)$/);

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

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

Line 532 if ($input{tarball}) {

Line 531 if ($input{tarball}) {

mkdir($tmpdir, 0700)

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

my $fatal = '';

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

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

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

@fatal = ("500 Internal Error", "cvs co failure: $!: $module");

&& last;

} else {

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

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

if ($ext eq '.tar.gz') {

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"

and @fatal = ("500 Internal Error", "tar zc failure: $!: $basedir");

&& last;

} elsif ($ext eq '.zip' && $CMD{zip}) {

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

last;

system "cd $tmpdir && $CMD{zip} @zip_options -r - $basedir"

and @fatal = ("500 Internal Error", "zip failure: $!: $basedir");

} else {

@fatal = ("500 Internal Error", "unsupported file type");

}

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

&fatal($fatal) if $fatal;

&fatal(@fatal) if @fatal;

exit;

}

Line 750 if (-d $fullname) {

Line 753 if (-d $fullname) {

else {

print &link($backicon, $url);

}

print " ", &link("Previous Directory", $url);

print " ", &link("Parent Directory", $url);

}

else {

$url = urlencode($_) . "/$query";

$url = './' . urlencode($_) . "/$query";

print "<A NAME=\"$_\"></A>";

if ($nofilelinks) {

print $diricon;

Line 816 if (-d $fullname) {

Line 819 if (-d $fullname) {

}

elsif (s/,v$//) {

$fileurl = ($attic ? "Attic/" : "") . urlencode($_);

$url = $fileurl . $query;

$url = './' . $fileurl . $query;

my $rev = '';

my $date = '';

my $log = '';

Line 910 if (-d $fullname) {

Line 913 if (-d $fullname) {

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

print "<HR NOSHADE>\n",

"<DIV align=center>",

"<DIV align=center>Download this directory in ";

&link("Download this directory in tarball",

# Mangle the filename so browsers show a reasonable

# filename to download.

print &link("tarball",

"$basefile.tar.gz$query".

"./$basefile.tar.gz$query".

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

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

"</DIV>";

if ($CMD{zip}) {

print " or ",

&link("zip archive",

"./$basefile.zip$query".

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

}

print "</DIV>";

}

Line 1108 sub findLastModifiedSubdirs(@) {

Line 1117 sub findLastModifiedSubdirs(@) {

sub htmlify_sub(&$) {

(my $proc, local $_) = @_;

local @_ = split(m`(<a [^>]+>[^<]*</a>)`i);

my @a = split(m`(<a [^>]+>[^<]*</a>)`i);

my $linked;

my $result = '';

while (($_, $linked) = splice(@_, 0, 2)) {

while (($_, $linked) = splice(@a, 0, 2)) {

&$proc();

$result .= $_ if defined($_);

$result .= $linked if defined($linked);

Line 1228 sub spacedHtmlText($;$) {

Line 1237 sub spacedHtmlText($;$) {

sub link($$) {

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

$url =~ s/:/sprintf("%%%02x", ord($&))/eg if $url =~ /^[^a-z]/; # relative

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

}

Line 1305 sub safeglob($) {

Line 1316 sub safeglob($) {

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

}

closedir($dh);

}

@results;

Line 1318 sub search_path($) {

Line 1330 sub search_path($) {

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

}

$command;

'';

}

sub getMimeTypeFromSuffix($) {

Line 1413 sub doAnnotate($$) {

Line 1425 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, "server")

$pid = open2($reader, $writer, $CMD{cvs}, @cvs_options, "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:

Line 1621 sub doCheckout($$) {

Line 1633 sub doCheckout($$) {

# Parse CVS header

my ($revision, $filename, $cvsheader);

$filename = "";

while(<$fh>) {

last if (/^\*\*\*\*/);

$revision = $1 if (/^VERS: (.*)$/);

Line 1704 sub cvswebMarkup($$$) {

Line 1717 sub cvswebMarkup($$$) {

print "</PRE>";

}

else {

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

print "<PRE>";

while (<$filehandle>) {

print htmlquote($_);

}

print "</PRE>";

}

Line 1771 sub doDiff($$$$$$) {

Line 1788 sub doDiff($$$$$$) {

while (($re1, $re2) = each %funcline_regexp) {

if ($fullname =~ /$re1/) {

push @difftype, '-F', '$re2';

push @difftype, '-F', $re2;

last;

}

Line 2640 sub human_readable_diff($){

Line 2657 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 2663 sub human_readable_diff($){

Line 2680 sub human_readable_diff($){

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

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

$funname = htmlquote($funname);

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

print "<table width=\"100%\" border=1 cellpadding=5><tr><td><b>Line $oldline</b>";

print " <font size=-1>$funname</font></td></tr></table>";

Line 2757 sub human_readable_diff($){

Line 2775 sub human_readable_diff($){

sub navigateHeader($$$$$) {

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

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

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

$swhere = './' . urlencode($filename) if ($swhere eq "");

print <<EOF;

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

Line 2772 $body_tag_for_src

Line 2790 $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>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>";

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

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

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

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

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

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

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

Line 3186 sub link_tags($) {

Line 3206 sub link_tags($) {

my ($fileurl,$filename);

($filename = $where) =~ s/^.*\///;

$fileurl = urlencode($filename);

$fileurl = './' . urlencode($filename);

foreach my $sym (split(", ", $tags)) {

$ret .= ",\n" if ($ret ne "");

CVSweb