cvsweb/cvsweb.cgi - diff

Return to cvsweb.cgi CVS log

Up to [cvsweb.bsd.lv] / cvsweb

Diff for /cvsweb/cvsweb.cgi between version 3.23 and 3.34

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

version 3.34, 2000/10/10 18:48:59

Line 42

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

# SUCH DAMAGE.

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

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

# $Id$

###

Line 59 use vars qw (

$checkoutMagic $doCheckout $scriptname $scriptwhere

$where $pathinfo $Browser $nofilelinks $maycompress @stickyvars

%funcline_regexp $is_mod_perl

$is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased

$is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased

%input $query $barequery $sortby $bydate $byrev $byauthor

$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 78 use vars qw (

Line 79 use vars qw (

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

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

$use_moddate $has_zlib $gzip_open

$LOG_FILESEPARATOR $LOG_REVSEPARATOR

);

sub printDiffSelect($);

Line 90 sub fatal($$);

Line 92 sub fatal($$);

sub redirect($);

sub safeglob($);

sub getMimeTypeFromSuffix($);

sub head($;$);

sub scan_directives(@);

sub doAnnotate($$);

sub doCheckout($$);

sub cvswebMarkup($$$);

Line 122 sub forbidden_module($);

Line 126 sub forbidden_module($);

use Cwd;

# == EDIT this ==

# User configuration is stored in

# Locations to search for user configuration, in order:

$config = undef;

for (

$ENV{CVSWEB_CONFIG},

for ($ENV{CVSWEB_CONFIG},

# '/home/knu/etc/cvsweb.conf',

'/usr/local/etc/cvsweb.conf',

getcwd . '/cvsweb.conf') {

getcwd() . '/cvsweb.conf'

$config = $_ if defined($_) && -r $_;

) {

$config = $_ if defined($_) && -r $_;

}

# == Configuration defaults ==

Line 143 $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 154 $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;

$LOG_FILESEPARATOR = q/^={77}$/;

$LOG_REVSEPARATOR = q/^-{28}$/;

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

use Time::Local;

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

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

# per file, so disable the link at the icon

# in this case:

$Browser = $ENV{HTTP_USER_AGENT};

$is_links = ($Browser =~ m`^Links `);

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

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

$is_msie = ($Browser =~ m`MSIE`);

$is_mozilla3 = ($Browser =~ m`^Mozilla/[3-9]`);

$is_textbased = ($is_lynx || $is_w3m);

$is_textbased = ($is_links || $is_lynx || $is_w3m);

$nofilelinks = $is_textbased;

Line 207 $nofilelinks = $is_textbased;

Line 215 $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 = (($ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`

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

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

|| $is_mozilla3)

&& !$is_msie

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

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

Line 228 $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 273 foreach (keys %DEFAULTVALUE)

Line 284 foreach (keys %DEFAULTVALUE)

}

$barequery = "";

my @barequery;

foreach (@stickyvars) {

# construct a query string with the sticky non default parameters set

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

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

if ($barequery) {

push @barequery, join('=', urlencode($_), urlencode($input{$_}));

$barequery = $barequery . "&";

}

my $thisval = urlencode($_) . "=" . urlencode($input{$_});

$barequery .= $thisval;

}

# is there any query ?

if ($barequery) {

if (@barequery) {

$barequery = join('&', @barequery);

$query = "?$barequery";

$barequery = "&" . $barequery;

$barequery = "&$barequery";

}

else {

$query = "";

}

undef @barequery;

# get actual parameters

$sortby = $input{"sortby"};

Line 339 if ($input{'cvsroot'} && $CVSROOT{$input{'cvsroot'}})

Line 349 if ($input{'cvsroot'} && $CVSROOT{$input{'cvsroot'}})

$cvsroot = $CVSROOT{$cvstree};

# create icons out of description

foreach my $k (keys %ICONS) {

my $k;

foreach $k (keys %ICONS) {

no strict 'refs';

my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}};

if ($ipath) {

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

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

${"${k}icon"} = $itxt;

}

undef $k;

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

}

undef $config_cvstree;

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

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

Line 780 elsif (-d $fullname) {

Line 800 elsif (-d $fullname) {

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

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

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

close(GZIP) if ($gzip_open);

gzipclose();

exit;

}

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

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

close(GZIP) if ($gzip_open);

gzipclose();

exit;

}

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

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

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

close(GZIP) if ($gzip_open);

gzipclose();

exit;

}

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

Line 814 elsif (-d $fullname) {

Line 834 elsif (-d $fullname) {

# e.g. foo.c

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

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

close(GZIP) if ($gzip_open);

gzipclose();

exit;

}

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

Line 849 elsif (-d $fullname) {

Line 869 elsif (-d $fullname) {

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

}

close(GZIP) if ($gzip_open);

gzipclose();

## End MAIN

sub printDiffSelect($) {

Line 917 sub htmlify($;$) {

Line 937 sub htmlify($;$) {

if ($extra) {

# get PR #'s as link ..

if (defined($prcgi)) {

1 while $string =~ s`\b(pr[:#]?\s*(?:#?\d+[,\s]\s*)*#?)(\d+)\b`$1 . &link($2, sprintf($prcgi, $2))`ie; # `

1 while $string =~ s`\b(pr[:#]?\s*(?:#?\d+[,\s]\s*)*#?)(\d+)\b`$1 . &link($2, sprintf($prcgi, $2))`ie; # `;

$string =~ s`\b${prcategories}/(\d+)\b`&link($&, sprintf($prcgi, $1))`igeo; # `

$string =~ s`\b${prcategories}/(\d+)\b`&link($&, sprintf($prcgi, $1))`igeo; # `;

}

# get manpage specs as link ..

if (defined($mancgi)) {

$string =~ s`\b([a-zA-Z]\w+)$([0-9n])$\B`&link($&, sprintf($mancgi, $2, $1))`ge; # `

$string =~ s`\b([a-zA-Z]\w+)(?:$([0-9n])$\B|\.([0-9n])\b)`&link($&, sprintf($mancgi, $2 ne '' ? $2 : $3, $1))`ge; # `x;

}

Line 963 sub spacedHtmlText($;$) {

Line 983 sub spacedHtmlText($;$) {

sub link($$) {

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

return "<A HREF=\"$where\">$name</A>\n";

return "<A HREF=\"$where\">$name</A>";

}

sub revcmp($$) {

Line 1075 sub getMimeTypeFromSuffix($) {

Line 1095 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 1094 sub doAnnotate($$) {

Line 1148 sub doAnnotate($$) {

($pathname = $where) =~ s/(Attic\/)?[^\/]*$//;

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

http_header();

navigateHeader($scriptwhere,$pathname,$filename,$rev, "annotate");

print "<h3 align=center>Annotation of $pathname$filename, Revision $rev</h3>\n";

# this seems to be necessary

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

Line 1108 sub doAnnotate($$) {

Line 1157 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 server") || fatal ("500 Internal Error",

$pid = open2($reader, $writer, "cvs -Rl 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 1160 sub doAnnotate($$) {

Line 1209 sub doAnnotate($$) {

# were nicer about buffering, then we could just leave it open, I think.

close ($writer) || die "cannot close: $!";

http_header();

navigateHeader($scriptwhere,$pathname,$filename,$rev, "annotate");

print "<h3 align=center>Annotation of $pathname$filename, Revision $rev</h3>\n";

# Ready to get the responses from the server.

# For example:

# E Annotations for foo/xx

Line 1175 sub doAnnotate($$) {

Line 1229 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 1184 sub doAnnotate($$) {

Line 1246 sub doAnnotate($$) {

}

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

$lineNr++;

my $lrev = substr ($_, 2, 13);

(my $lrev = substr($_, 2, 13)) =~ y/ //d;

my $lusr = substr ($_, 16, 9);

(my $lusr = substr($_, 16, 9)) =~ y/ //d;

my $line = substr ($_, 36);

my $line = substr($_, 36);

my $isCurrentRev = ($rev eq $lrev);

# we should parse the date here ..

if ($lrev eq $oldLrev) {

$revprint = " ";

$revprint = sprintf('%-8s', '');

}

else {

$revprint = $lrev; $oldLusr = "";

$revprint = sprintf('%-8s', $lrev);

$revprint =~ s`^(\S+)`<a href="${scriptwhere}${barequery}#rev$1">$1</A>`; # `

$revprint =~ s`\S+`<a href="${scriptwhere}${barequery}#rev$&">$&</A>`; # `

$oldLusr = '';

}

if ($lusr eq $oldLusr) {

$usrprint = " ";

$usrprint = '';

}

else {

$usrprint = $lusr;

}

$oldLrev = $lrev;

$oldLusr = $lusr;

# is there a less timeconsuming way to strip spaces ?

($lrev = $lrev) =~ s/\s+//g;

my $isCurrentRev = ($rev eq $lrev);

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

# Set bold for text-based browsers only - graphical

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

# browsers show bold fonts a bit wider than regular fonts,

print spacedHtmlText($line);

# so it looks irregular.

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

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

printf "%s%s %-8s %4d:",

$revprint,

$isCurrentRev ? '!' : ' ',

$usrprint,

$lineNr;

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

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

}

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

# We could complain about any text received after this, like the

Line 1352 sub cvswebMarkup($$$) {

Line 1422 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 1363 sub cvswebMarkup($$$) {

Line 1432 sub cvswebMarkup($$$) {

}

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 1471 sub doDiff($$$$$$) {

Line 1548 sub doDiff($$$$$$) {

if ($human_readable) {

http_header();

&human_readable_diff($fh, $rev2);

close(GZIP) if ($gzip_open);

gzipclose();

exit;

}

else {

Line 1622 again:

Line 1699 again:

$state = "head";

goto again;

}

if ($state eq "head" && /^----------------------------$/) {

if ($state eq "head" && /$LOG_REVSEPARATOR/o) {

$state = "log";

$rev = undef;

$date = undef;

Line 1632 again:

Line 1709 again:

next;

}

if ($state eq "log") {

if (/^----------------------------$/

if (/$LOG_REVSEPARATOR/o || /$LOG_FILESEPARATOR/o) {

|| /^=============================/) {

# End of a log entry.

my $revbranch;

($revbranch = $rev) =~ s/\.\d+$//;

Line 1680 again:

Line 1756 again:

$log = $log . $_;

}

if (/^===============/) {

if (/$LOG_FILESEPARATOR/o) {

$state = "start";

next;

}

Line 1754 sub readLog($;$) {

Line 1830 sub readLog($;$) {

# log info

# ----------------------------

logentry:

while (!/^=========/) {

while (!/$LOG_FILESEPARATOR/o) {

$_ = <$fh>;

last logentry if (!defined($_)); # EOF

print "R:", $_ if ($verbose);

Line 1762 sub readLog($;$) {

Line 1838 sub readLog($;$) {

$rev = $1;

unshift(@allrevisions,$rev);

}

elsif (/^========/ || /^----------------------------$/) {

elsif (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o) {

next logentry;

}

else {

Line 1796 sub readLog($;$) {

Line 1872 sub readLog($;$) {

while (<$fh>) {

print "L:", $_ if ($verbose);

next line if (/^branches:\s/);

last line if (/^----------------------------$/ || /^=========/);

last line if (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o);

$log{$rev} .= $_;

}

print "E:", $_ if ($verbose);

Line 2254 sub flush_diff_rows($$$$) {

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

Line 2384 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 2326 sub human_readable_diff($){

Line 2408 sub human_readable_diff($){

}

else {

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

$_ = spacedHtmlText ($rest);

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

# Add fontface, size

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

Line 2410 sub navigateHeader($$$$$) {

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

Line 2847 sub http_header(;$) {

sub html_header($) {

my ($title) = @_;

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

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

http_header();

print <<EOH;

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

Line 2810 sub forbidden_module($) {

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