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.14 and 1.1.1.17

version 1.1.1.14, 2000/12/07 15:16:31

version 1.1.1.17, 2000/12/29 09:20:45

Line 43

# SUCH DAMAGE.

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

# $kId: cvsweb.cgi,v 1.42 2000/12/07 15:11:24 knu Exp $

# $kId: cvsweb.cgi,v 1.49 2000/12/29 09:12:15 knu Exp $

###

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

$use_moddate $has_zlib $gzip_open $allow_tar

$LOG_FILESEPARATOR $LOG_REVSEPARATOR

);

Line 122 sub toggleQuery($$);

sub urlencode($);

sub htmlquote($);

sub htmlunquote($);

sub hrefquote($);

sub http_header(;$);

sub html_header($);

sub html_footer();

Line 228 $verbose = $v;

Line 229 $verbose = $v;

$checkoutMagic = "~checkout~";

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

$where = $pathinfo;

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

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

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

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

$where =~ s|/$||;

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

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

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

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

Line 246 $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_links = ($Browser =~ m`^Links `);

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

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

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

Line 279 $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 296 $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 404 foreach $k (keys %ICONS) {

Line 407 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 419 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($@)));

Line 471 $module = $1;

Line 474 $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;

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

$where =~ s,^/,,;

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

if ($basedir eq '' || $where 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 = '';

do {

chdir $tmpdir

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

&& last;

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

? ("-r", $input{only_with_tag}) : ();

system "cvs", "-RlQd", $cvsroot, "co", @params, $where

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

&& 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", "--ignore-failed-read", "--exclude", "CVS", "-zcf", "-", $basedir

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

&& last;

chdir $tmpdir

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

&& last;

} while (0);

system "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 812 elsif (-d $fullname) {

Line 873 elsif (-d $fullname) {

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

print "</FORM>\n";

}

if ($allow_tar) {

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

if ($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 909 elsif (-d $fullname) {

Line 986 elsif (-d $fullname) {

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

my ($xtra, $module);

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

$xtra = $& if (($module = $where) =~ s|/.*||);

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

# Is there an indexed version of modules?

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

while (<$fh>) {

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

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

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

&redirect($scriptname . '/' . $2 . $xtra);

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

}

Line 1120 sub spacedHtmlText($;$) {

Line 1197 sub spacedHtmlText($;$) {

sub link($$) {

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

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

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

}

sub revcmp($$) {

Line 1564 sub cvswebMarkup($$$) {

Line 1641 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 {

print "<PRE>";

Line 1790 again:

Line 1867 again:

} elsif (/^symbolic names:/) {

$state = "tags";

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

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

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

$symrev{MAIN} = $branch;

$symrev{HEAD} = $branch;

$alltags{MAIN} = 1;

Line 1816 again:

Line 1893 again:

if (defined($tag)) {

if(defined($symrev{$tag}) || $tag eq "HEAD") {

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

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

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

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

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

} elsif ($tag ne "HEAD") {

Line 2014 sub readLog($;$) {

Line 2091 sub readLog($;$) {

# is the first commit listed on the appropriate branch.

# This is not neccesary the same revision as marked as head in the RCS file.

my $headrev = $curbranch || "1";

($symrev{"MAIN"} = $headrev) =~ s/(\.?)(\d+)$/${1}0.$2/;

($symrev{"MAIN"} = $headrev) =~ s/(\d+)$/0.$1/;

foreach $rev (@revorder) {

if ($rev =~ /^(\S*)\.\d+$/ && $headrev eq $1) {

$symrev{"HEAD"} = $rev;

Line 2036 sub readLog($;$) {

Line 2113 sub readLog($;$) {

foreach (reverse sort keys %symrev) {

$rev = $symrev{$_};

if ($rev =~ /^((.*)\.)0\.(\d+)$/) {

if ($rev =~ /^((.*)\.)?\b0\.(\d+)$/) {

push(@branchnames, $_);

# A revision number of A.B.0.D really translates into

Line 2050 sub readLog($;$) {

Line 2127 sub readLog($;$) {

# it has no head to translate to if there is nothing on

# the branch, but I guess this can never happen?

# Since some stupid people actually import/check in

# (the code below gracefully forgets about the branch

# files with version 0.X we assume that the above cannot

# if it should happen)

# happen, and regard 0.X(.*) as a revision and not a branch.

$head = defined($2) ? $2 : "";

$branch = $3;

Line 2082 sub readLog($;$) {

Line 2158 sub readLog($;$) {

my ($onlyonbranch, $onlybranchpoint);

if ($onlyonbranch = $input{'only_with_tag'}) {

$onlyonbranch = $symrev{$onlyonbranch};

if ($onlyonbranch =~ s/\.0\././) {

if ($onlyonbranch =~ s/\b0\.//) {

($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//;

}

else {

Line 2639 sub navigateHeader($$$$$) {

Line 2715 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 qq`<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">`;

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

print '';

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

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 2844 sub fileSortCmp() {

Line 2921 sub fileSortCmp() {

sub download_url($$;$) {

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

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

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

if (defined($checkoutMagic)

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

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

Line 2941 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 2975 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 3015 sub urlencode($) {

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

$_;

}

sub htmlquote($) {

Line 2966 sub htmlunquote($) {

Line 3042 sub htmlunquote($) {

$_;

}

sub hrefquote($) {

local($_) = @_;

y/ /+/;

htmlquote($_)

}

sub http_header(;$) {

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

if (defined($moddate)) {

Line 3024 sub http_header(;$) {

Line 3108 sub http_header(;$) {

sub html_header($) {

my ($title) = @_;

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

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

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

print <<EOH;

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

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

<html>

<head>

<title>$title</title>

</head>

CVSweb