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.7 and 3.23

version 1.1.1.7, 2000/09/23 20:23:34

version 3.23, 2000/09/19 19:57:58

Line 42

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

# SUCH DAMAGE.

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

# $zId: cvsweb.cgi,v 1.101 2000/09/13 22:44:05 jumager Exp $

# $kId: cvsweb.cgi,v 1.26 2000/09/22 11:13:17 knu Exp $

# $Id$

###

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

$cvstreedefault $body_tag $logo $defaulttitle $address

$logo $defaulttitle $address

$backcolor $long_intro $short_instruction $shortLogLen

$long_intro $short_instruction $shortLogLen

$show_author $dirtable $tablepadding $columnHeaderColorDefault

$columnHeaderColorSorted $hr_breakable $showfunc $hr_ignwhite

$hr_ignkeysubst $diffcolorHeading $diffcolorEmpty $diffcolorRemove

Line 91 sub fatal($$);

Line 90 sub fatal($$);

sub redirect($);

sub safeglob($);

sub getMimeTypeFromSuffix($);

sub head($;$);

sub scan_directives(@);

sub doAnnotate($$);

sub doCheckout($$);

sub cvswebMarkup($$$);

Line 146 $allow_version_select = 1;

Line 143 $allow_version_select = 1;

# These are defined to allow checking with perl -cw

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

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

$cvstreedefault = $body_tag = $body_tag_for_src =

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

$logo = $defaulttitle = $address =

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

$long_intro = $short_instruction = $shortLogLen =

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

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

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

Line 158 $allow_markup = $use_java_script = $open_extern_window

Line 154 $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 = $gzip_open = undef;

$tabstop = $use_moddate = $moddate = undef;

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

Line 211 $nofilelinks = $is_textbased;

Line 207 $nofilelinks = $is_textbased;

# display garbage then :-/

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

# piping does not work as expected inside the server.

$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 && !$has_zlib));

Line 785 elsif (-d $fullname) {

Line 780 elsif (-d $fullname) {

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

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

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

gzipclose();

close(GZIP) if ($gzip_open);

exit;

}

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

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

gzipclose();

close(GZIP) if ($gzip_open);

exit;

}

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

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

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

gzipclose();

close(GZIP) if ($gzip_open);

exit;

}

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

Line 819 elsif (-d $fullname) {

Line 814 elsif (-d $fullname) {

# e.g. foo.c

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

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

gzipclose();

close(GZIP) if ($gzip_open);

exit;

}

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

Line 854 elsif (-d $fullname) {

Line 849 elsif (-d $fullname) {

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

}

gzipclose();

close(GZIP) if ($gzip_open);

## End MAIN

sub printDiffSelect($) {

Line 1080 sub getMimeTypeFromSuffix($) {

Line 1075 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 1214 sub doAnnotate($$) {

Line 1175 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 1256 sub doAnnotate($$) {

Line 1209 sub doAnnotate($$) {

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

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

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

print spacedHtmlText($line);

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

}

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

Line 1399 sub cvswebMarkup($$$) {

Line 1352 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/) {

Line 1409 sub cvswebMarkup($$$) {

Line 1363 sub cvswebMarkup($$$) {

}

else {

print "<PRE>";

foreach (@content) {

# prefetch several lines

print spacedHtmlText($_);

my @buf = head($filehandle);

my %d = scan_directives(@buf);

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

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

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

}

print "</PRE>";

}

Line 1525 sub doDiff($$$$$$) {

Line 1471 sub doDiff($$$$$$) {

if ($human_readable) {

http_header();

&human_readable_diff($fh, $rev2);

gzipclose();

close(GZIP) if ($gzip_open);

exit;

}

else {

Line 2308 sub flush_diff_rows($$$$) {

Line 2254 sub flush_diff_rows($$$$) {

# human_readable_diff(String revision_to_return_to);

sub human_readable_diff($){

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

my ($i,$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 2362 sub human_readable_diff($){

Line 2308 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 2386 sub human_readable_diff($){

Line 2326 sub human_readable_diff($){

}

else {

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

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

$_ = spacedHtmlText ($rest);

# Add fontface, size

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

Line 2470 sub navigateHeader($$$$$) {

Line 2410 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_tag_for_src\n";

print "<BODY BGCOLOR=\"$backcolor\">\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 2825 sub http_header(;$) {

Line 2765 sub http_header(;$) {

sub html_header($) {

my ($title) = @_;

my $version = '$zRevision: 1.103 $ $kRevision: 1.26 $'; #'

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

http_header();

print <<EOH;

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

Line 2870 sub forbidden_module($) {

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

CVSweb