cvsweb/cvsweb.cgi - diff

Return to cvsweb.cgi CVS log

Up to [cvsweb.bsd.lv] / cvsweb

Diff for /cvsweb/cvsweb.cgi between version 3.20 and 3.27

version 3.20, 2000/09/10 11:54:21

version 3.27, 2000/09/28 18:06:58

Line 9

# Ken Coar <coar@Apache.Org>

# Dick Balaska <dick@buckosoft.com>

# Akinori MUSHA <knu@FreeBSD.org>

# Jens-Uwe Mager <jum@helios.de>

# Based on:

# * Bill Fenners cvsweb.cgi revision 1.28 available from:

Line 41

Line 42

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

# SUCH DAMAGE.

# $zId: cvsweb.cgi,v 1.94 2000/08/24 06:41:22 hnordstrom Exp $

# $zId: cvsweb.cgi,v 1.103 2000/09/20 17:02:29 jumager Exp $

# $Id$

###

Line 63 use vars qw (

Line 64 use vars qw (

$bylog $byfile $hr_default $logsort $cvstree $cvsroot

$mimetype $defaultTextPlain $defaultViewable $allow_compress

$GZIPBIN $backicon $diricon $fileicon $fullname $newname

$cvstreedefault $body_tag $logo $defaulttitle $address

$cvstreedefault $body_tag $body_tag_for_src

$backcolor $long_intro $short_instruction $shortLogLen

$logo $defaulttitle $address

$long_intro $short_instruction $shortLogLen

$show_author $dirtable $tablepadding $columnHeaderColorDefault

$columnHeaderColorSorted $hr_breakable $showfunc $hr_ignwhite

$hr_ignkeysubst $diffcolorHeading $diffcolorEmpty $diffcolorRemove

Line 76 use vars qw (

Line 78 use vars qw (

$navigationHeaderColor $tableBorderColor $markupLogColor

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

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

$use_moddate

$use_moddate $has_zlib $gzip_open

);

sub printDiffSelect($);

Line 89 sub fatal($$);

Line 91 sub fatal($$);

sub redirect($);

sub safeglob($);

sub getMimeTypeFromSuffix($);

sub head($;$);

sub scan_directives(@);

sub doAnnotate($$);

sub doCheckout($$);

sub cvswebMarkup($$$);

Line 142 $allow_version_select = 1;

Line 146 $allow_version_select = 1;

# These are defined to allow checking with perl -cw

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

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

$cvstreedefault = $body_tag = $logo = $defaulttitle = $address =

$cvstreedefault = $body_tag = $body_tag_for_src =

$backcolor = $long_intro = $short_instruction = $shortLogLen =

$logo = $defaulttitle = $address =

$long_intro = $short_instruction = $shortLogLen =

$show_author = $dirtable = $tablepadding = $columnHeaderColorDefault =

$columnHeaderColorSorted = $hr_breakable = $showfunc = $hr_ignwhite =

$hr_ignkeysubst = $diffcolorHeading = $diffcolorEmpty = $diffcolorRemove =

Line 153 $allow_markup = $use_java_script = $open_extern_window

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

$tabstop = $use_moddate = $moddate = $gzip_open = undef;

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

use Time::Local;

use IPC::Open2;

# Check if the zlib C library interface is installed, and if yes

# we can avoid using the extra gzip process.

eval {

require Compress::Zlib;

};

$has_zlib = !$@;

$verbose = $v;

$checkoutMagic = "~checkout~";

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

Line 197 $nofilelinks = $is_textbased;

Line 209 $nofilelinks = $is_textbased;

# braindamaged MS-Internet Exploders claim that they

# accept gzip .. but don't in fact and

# display garbage then :-/

# Turn off gzip if running under mod_perl. piping does

# Turn off gzip if running under mod_perl and no zlib is available,

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

# piping does not work as expected inside the server.

# achieve the same result using Apache::GZIPFilter.

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

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

&& $ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`)

|| $is_mozilla3)

&& !$is_msie

&& !$is_mod_perl);

&& !($is_mod_perl && !$has_zlib));

# put here the variables we need in order

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

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

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

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

if (-f $config) {

do $config;

do $config

}

|| &fatal("500 Internal Error",

else {

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

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

} else {

&fatal("500 Internal Error",

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

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

Line 343 foreach my $k (keys %ICONS) {

Line 357 foreach my $k (keys %ICONS) {

}

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

# Do some special configuration for cvstrees

do "$config-$cvstree" if (-f "$config-$cvstree");

if (-f $config_cvstree) {

do $config_cvstree

|| &fatal("500 Internal Error",

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

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

}

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

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

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

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

# 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) {

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

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

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

$GZIPBIN = "$_/gzip";

Line 710 elsif (-d $fullname) {

Line 731 elsif (-d $fullname) {

foreach my $var (@stickyvars) {

print "<INPUT TYPE=HIDDEN NAME=\"$var\" VALUE=\"$input{$var}\">\n"

if (defined($input{$var})

&& $input{$var} ne $DEFAULTVALUE{$var}

&& (!defined($DEFAULTVALUE{$var})

|| $input{$var} ne $DEFAULTVALUE{$var})

&& $input{$var} ne ""

&& $var ne "only_with_tag");

}

Line 772 elsif (-d $fullname) {

Line 794 elsif (-d $fullname) {

elsif (-f $fullname . ',v') {

if (defined($input{'rev'}) || $doCheckout) {

&doCheckout($fullname, $input{'rev'});

gzipclose();

exit;

}

if (defined($input{'annotate'}) && $allow_annotate) {

&doAnnotate($input{'annotate'});

gzipclose();

exit;

}

if (defined($input{'r1'}) && defined($input{'r2'})) {

&doDiff($fullname, $input{'r1'}, $input{'tr1'},

$input{'r2'}, $input{'tr2'}, $input{'f'});

gzipclose();

exit;

}

print("going to dolog($fullname)\n") if ($verbose);

Line 803 elsif (-d $fullname) {

Line 828 elsif (-d $fullname) {

# e.g. foo.c

&doDiff($fullname, $input{'r1'}, $input{'tr1'},

$input{'r2'}, $input{'tr2'}, $input{'f'});

gzipclose();

exit;

}

elsif (($newname = $fullname) =~ s|/([^/]+)$|/Attic/$1| &&

Line 836 elsif (-d $fullname) {

Line 862 elsif (-d $fullname) {

}

&fatal("404 Not Found","$where: no such file or directory");

}

gzipclose();

## End MAIN

sub printDiffSelect($) {

Line 923 sub spacedHtmlText($;$) {

Line 951 sub spacedHtmlText($;$) {

# Cut trailing spaces and tabs

s/[ \t]+$//;

if (defined($tabstop)) {

if (defined($ts)) {

# Expand tabs

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

}

Line 1061 sub getMimeTypeFromSuffix($) {

Line 1089 sub getMimeTypeFromSuffix($) {

}

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

# read first lines like head(1)

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

sub head($;$) {

my $fh = $_[0];

my $linecount = $_[1] || 10;

my @buf;

if ($linecount > 0) {

my $i;

for ($i = 0; !eof($fh) && $i < $linecount; $i++) {

push @buf, scalar <$fh>;

}

} else {

@buf = <$fh>;

}

@buf;

}

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

# scan vim and Emacs directives

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

sub scan_directives(@) {

my $ts = undef;

for (@_) {

$ts = $1 if /\b(?:ts|tabstop|tab-width)[:=]\s*([1-9]\d*)\b/;

}

('tabstop' => $ts);

}

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

# show Annotation

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

sub doAnnotate($$) {

Line 1161 sub doAnnotate($$) {

Line 1223 sub doAnnotate($$) {

else {

print "<pre>";

}

while (<$reader>) {

# prefetch several lines

my @buf = head($reader);

my %d = scan_directives(@buf);

while (@buf || !eof($reader)) {

$_ = @buf ? shift @buf : <$reader>;

my @words = split;

# Adding one is for the (single) space which follows $words[0].

my $rest = substr ($_, length ($words[0]) + 1);

Line 1195 sub doAnnotate($$) {

Line 1265 sub doAnnotate($$) {

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

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

print spacedHtmlText($line);

print spacedHtmlText($line, $d{'tabstop'});

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

}

elsif ($words[0] eq "ok") {

Line 1338 sub cvswebMarkup($$$) {

Line 1408 sub cvswebMarkup($$$) {

$input{only_with_tag};

}

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

my @content = <$filehandle>;

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

print "<HR noshade>";

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

print "<IMG SRC=\"$url$barequery\"><BR>";

}

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

print "<EMBED SRC=\"$url$barequery\" WIDTH=\"100%\"><BR>";

}

else {

print "<PRE>";

foreach (@content) {

print spacedHtmlText($_);

# prefetch several lines

my @buf = head($filehandle);

my %d = scan_directives(@buf);

while (@buf || !eof($filehandle)) {

$_ = @buf ? shift @buf : <$filehandle>;

print spacedHtmlText($_, $d{'tabstop'});

}

print "</PRE>";

}

Line 1356 sub cvswebMarkup($$$) {

Line 1436 sub cvswebMarkup($$$) {

sub viewable($) {

my ($mimetype) = @_;

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

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

}

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

Line 1454 sub doDiff($$$$$$) {

Line 1534 sub doDiff($$$$$$) {

if ($human_readable) {

http_header();

&human_readable_diff($fh, $rev2);

gzipclose();

exit;

}

else {

Line 2123 EOF

Line 2204 EOF

foreach (@stickyvars) {

print "<INPUT TYPE=HIDDEN NAME=\"$_\" VALUE=\"$input{$_}\">\n"

if (defined($input{$_})

&& ($input{$_} ne $DEFAULTVALUE{$_} && $input{$_} ne ""));

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

|| $input{$_} ne $DEFAULTVALUE{$_})

&& $input{$_} ne ""));

}

print "Diffs between \n";

print "<TABLE><TR>\n";

print "<TD align=right>Diffs between \n";

print "<SELECT NAME=\"r1\">\n";

print "<OPTION VALUE=\"text\" SELECTED>Use Text Field\n";

print $sel;

print "</SELECT>\n";

$diffrev = $revdisplayorder[$#revdisplayorder];

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

print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr1\" VALUE=\"$diffrev\" onChange='document.diff_select.r1.selectedIndex=0'>\n";

print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr1\" VALUE=\"$diffrev\" onChange='document.diff_select.r1.selectedIndex=0'></TD>";

print " and \n";

print "<TD><BR></TD></TR>\n";

print "<TR><TD align=right>and \n";

print "<SELECT NAME=\"r2\">\n";

print "<OPTION VALUE=\"text\" SELECTED>Use Text Field\n";

print $sel;

print "</SELECT>\n";

$diffrev = $revdisplayorder[0];

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

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

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

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

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

printDiffSelect(0);

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

print "</FORM>\n";

print "</TR></TABLE>\n";

print "<HR noshade>\n";

print "<TABLE>";

print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n";

print "<TR><TD align=right>Preferred Diff type:</TD>";

print "<TD>";

printDiffSelect($use_java_script);

print "</TD><TD></TD></TR>\n";

if (@branchnames) {

print "<TR><TD align=right>View only Branch:</TD>";

print "<TD>";

print "<A name=branch></A>\n";

print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n";

foreach (@stickyvars) {

next if ($_ eq "only_with_tag");

next if ($_ eq "logsort");

print "<INPUT TYPE=HIDDEN NAME=\"$_\" VALUE=\"$input{$_}\">\n"

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

&& $input{$_} ne "");

}

print "View only Branch: \n";

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

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

print ">\n";

Line 2170 EOF

Line 2253 EOF

&& $input{"only_with_tag"} eq $_);

print ">${_}\n";

}

print "</SELECT>\n";

print "</SELECT></TD><TD></TD></TR>\n";

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

print "</FORM>\n";

}

print "<A name=logsort></A>\n";

print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n";

foreach (@stickyvars) {

next if ($_ eq "f");

next if ($_ eq "only_with_tag");

next if ($_ eq "logsort");

print "<INPUT TYPE=HIDDEN NAME=\"$_\" VALUE=\"$input{$_}\">\n"

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

if (defined($input{$_})

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

|| $input{$_} ne $DEFAULTVALUE{$_})

&& $input{$_} ne "");

}

print "Sort log by: \n";

print "<TR><TD align=right>";

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

print "<A name=logsort></A>\n";

print "Sort log by:</TD>";

print "<TD><SELECT NAME=\"logsort\"";

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

print ">\n";

print "<OPTION VALUE=cvs",$logsort eq "cvs" ? " SELECTED" : "", ">Not sorted";

print "<OPTION VALUE=date",$logsort eq "date" ? " SELECTED" : "", ">Commit date";

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

print "</SELECT>\n";

print "</SELECT></TD>";

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

print "<TD><INPUT TYPE=SUBMIT VALUE=\" Set \"></TD>";

print "</FORM>\n";

print "</TR></TABLE>";

print &html_footer;

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

}

Line 2232 sub flush_diff_rows($$$$) {

Line 2317 sub flush_diff_rows($$$$) {

# human_readable_diff(String revision_to_return_to);

sub human_readable_diff($){

my ($i,$difftxt, $where_nd, $filename, $pathname, $scriptwhere_nd);

my ($difftxt, $where_nd, $filename, $pathname, $scriptwhere_nd);

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

my ($date1, $date2, $r1d, $r2d, $r1r, $r2r, $rev1, $rev2, $sym1, $sym2);

my (@rightCol, @leftCol);

Line 2286 sub human_readable_diff($){

Line 2371 sub human_readable_diff($){

# cascading style sheets because we've to set the

# font and color for each row. anyone ...?

####

while (<$fh>) {

$difftxt = $_;

# prefetch several lines

my @buf = head($fh);

my %d = scan_directives(@buf);

while (@buf || !eof($fh)) {

$difftxt = @buf ? shift @buf : <$fh>;

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

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

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

Line 2304 sub human_readable_diff($){

Line 2395 sub human_readable_diff($){

}

else {

($diffcode,$rest) = $difftxt =~ /^([-+ ])(.*)/;

$_ = spacedHtmlText ($rest);

$_ = spacedHtmlText($rest, $d{'tabstop'});

# Add fontface, size

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

Line 2388 sub navigateHeader($$$$$) {

Line 2479 sub navigateHeader($$$$$) {

$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 "$body_tag_for_src\n";

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

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

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

Line 2689 sub http_header(;$) {

Line 2780 sub http_header(;$) {

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

if (defined($moddate)) {

if ($is_mod_perl) {

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

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

}

else {

print "Last-Modified: " . scalar gmtime($moddate) . " GMT\r\n";

Line 2702 sub http_header(;$) {

Line 2793 sub http_header(;$) {

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

}

if ($allow_compress && $maycompress) {

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

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

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

if ($is_mod_perl) {

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

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

Line 2715 sub http_header(;$) {

Line 2805 sub http_header(;$) {

print "\r\n"; # Close headers

}

$| = 1; $| = 0; # Flush header output

select ($fh);

if ($has_zlib) {

tie *GZIP, __PACKAGE__, \*STDOUT;

}

select(GZIP);

$gzip_open = 1;

# print "" if ($content_type eq "text/html");

}

else {

Line 2740 sub http_header(;$) {

Line 2834 sub http_header(;$) {

sub html_header($) {

my ($title) = @_;

my $version = '$zRevision: 1.94 $ $Revision$'; #'

my $version = '$zRevision: 1.103 $ $Revision$'; #'

http_header();

print <<EOH;

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

Line 2785 sub forbidden_module($) {

Line 2879 sub forbidden_module($) {

}

return 0;

}

# Close the GZIP handle remove the tie.

sub gzipclose {

if ($gzip_open) {

select(STDOUT);

close(GZIP);

untie *GZIP;

$gzip_open = 0;

}

# implement a gzipped file handle via the Compress:Zlib compression

# library.

sub MAGIC1() { 0x1f }

sub MAGIC2() { 0x8b }

sub OSCODE() { 3 }

sub TIEHANDLE {

my ($class, $out) = @_;

my ($d) = Compress::Zlib::deflateInit(-Level => Compress::Zlib::Z_BEST_COMPRESSION(),

-WindowBits => -Compress::Zlib::MAX_WBITS()) or return undef;

my ($o) = {

handle => $out,

dh => $d,

crc => 0,

len => 0,

};

my ($header) = pack("c10", MAGIC1, MAGIC2, Compress::Zlib::Z_DEFLATED(), 0,0,0,0,0,0, OSCODE);

print {$o->{handle}} $header;

return bless($o, $class);

}

sub PRINT {

my ($o) = shift;

my ($buf) = join(defined $, ? $, : "",@_);

my ($len) = length($buf);

my ($compressed, $status) = $o->{dh}->deflate($buf);

print {$o->{handle}} $compressed if defined($compressed);

$o->{crc} = Compress::Zlib::crc32($buf, $o->{crc});

$o->{len} += $len;

return $len;

}

sub PRINTF {

my ($o) = shift;

my ($fmt) = shift;

my ($buf) = sprintf($fmt, @_);

my ($len) = length($buf);

my ($compressed, $status) = $o->{dh}->deflate($buf);

print {$o->{handle}} $compressed if defined($compressed);

$o->{crc} = Compress::Zlib::crc32($buf, $o->{crc});

$o->{len} += $len;

return $len;

}

sub WRITE {

my ($o, $buf, $len, $off) = @_;

my ($compressed, $status) = $o->{dh}->deflate(substr($buf, 0, $len));

print {$o->{handle}} $compressed if defined($compressed);

$o->{crc} = Compress::Zlib::crc32(substr($buf, 0, $len), $o->{crc});

$o->{len} += $len;

return $len;

}

sub CLOSE {

my ($o) = @_;

return if !defined( $o->{dh});

my ($buf) = $o->{dh}->flush();

$buf .= pack("V V", $o->{crc}, $o->{len});

print {$o->{handle}} $buf;

undef $o->{dh};

}

sub DESTROY {

my ($o) = @_;

CLOSE($o);

}

CVSweb