cvsweb/cvsweb.cgi - diff

Return to cvsweb.cgi CVS log

Up to [cvsweb.bsd.lv] / cvsweb

Diff for /cvsweb/cvsweb.cgi between version 4.8 and 4.18

version 4.8, 2019/11/09 09:41:07

version 4.18, 2019/11/11 14:37:54

Line 69 use vars qw (

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

$bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot

$charset $output_filter

@command_path %CMD $allow_compress $backicon $diricon $fileicon $graphicon

@command_path %CMD $allow_compress $backicon $diricon $fileicon

$fullname $cvstreedefault $logo $defaulttitle $address $binfileicon

$long_intro $short_instruction $shortLogLen $show_author

$tablepadding $hr_breakable $showfunc $hr_ignwhite $hr_ignkeysubst

$inputTextSize $mime_types $allow_annotate $allow_markup $allow_mailtos

$allow_log_extra $allow_dir_extra $allow_source_extra

$allow_cvsgraph $cvsgraph_config $use_java_script $edit_option_form

$edit_option_form

$show_subdir_lastmod $show_log_in_markup $preformat_in_markup

$tabstop $state $annTable $sel @ForbiddenFiles

$use_descriptions %descriptions @mytz $dwhere

Line 86 use vars qw (

$allow_enscript @enscript_options %enscript_types

);

require Compress::Zlib;

use Cwd qw(abs_path);

use File::Path qw(rmtree);

use File::Spec::Functions qw(canonpath catdir catfile curdir devnull rootdir

Line 102 use constant CVSWEBMARKUP => qr{^text/(x-cvsweb|vnd\.v

Line 103 use constant CVSWEBMARKUP => qr{^text/(x-cvsweb|vnd\.v

use constant LOG_FILESEPR => qr/^={77}$/o;

use constant LOG_REVSEPR => qr/^-{28}$/o;

use constant HAS_ZLIB => eval { require Compress::Zlib; };

use constant HAS_EDIFF => eval { require String::Ediff; };

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

# All global initialization that can be done in compile time should go to

Line 121 BEGIN

Line 119 BEGIN

$HTML_META = <<EOM;

EOM

Line 138 EOM

Line 135 EOM

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

sub printDiffSelect($);

sub printDiffSelect();

sub printDiffSelectStickyVars();

sub getDiffLinks($$$);

sub printLogSortSelect($);

sub printLogSortSelect();

sub findLastModifiedSubdirs(@);

sub htmlify_sub(&$);

sub htmlify($;$);

Line 161 sub openOutputFilter();

Line 158 sub openOutputFilter();

sub doAnnotate($$);

sub doCheckout($$$);

sub doEnscript($$$;$);

sub doGraph();

sub doGraphView();

sub cvswebMarkup($$$$$$;$);

sub viewable($);

sub doDiff($$$$$$);

Line 183 sub download_url($$;$);

Line 178 sub download_url($$;$);

sub download_link($$$;$);

sub display_url($$;$);

sub display_link($$;$$);

sub graph_link($;$);

sub history_link($$;$);

sub toggleQuery($;$);

sub htmlquote($);

Line 214 $cvstreedefault = $logo = $defaulttitle =

Line 208 $cvstreedefault = $logo = $defaulttitle =

$address = $long_intro = $short_instruction = $shortLogLen = $show_author =

$tablepadding = $hr_breakable = $showfunc = $hr_ignwhite =

$hr_ignkeysubst = $inputTextSize = $mime_types = $allow_annotate =

$allow_markup = $allow_compress = $use_java_script = $edit_option_form =

$allow_markup = $allow_compress = $edit_option_form =

$show_subdir_lastmod = $show_log_in_markup = $preformat_in_markup =

$tabstop = $use_moddate = $gzip_open = $DEBUG = $allow_cvsgraph =

$tabstop = $use_moddate = $gzip_open = $DEBUG =

$cvsgraph_config = $cvshistory_url = $allow_tar = undef;

$cvshistory_url = $allow_tar = undef;

$allow_version_select = $allow_mailtos = $allow_log_extra = 1;

Line 317 $maycompress = (

Line 311 $maycompress = (

&& $ENV{HTTP_ACCEPT_ENCODING} =~ /gzip/)

|| $is_mozilla3)

&& !$is_msie

&& !(defined($ENV{MOD_PERL}) && !HAS_ZLIB)

&& !(defined($ENV{MOD_PERL}))

);

# Parameters that will be sticky in all constructed links/query strings.

Line 358 if (defined($ENV{QUERY_STRING})) {

Line 352 if (defined($ENV{QUERY_STRING})) {

$p =~ y/+/ /;

my ($key, $val) = split(/=/, $p, 2);

next unless defined($key);

$val = 1 unless defined($val);

$key = uri_unescape($key);

($key = uri_unescape($key)) =~ /[[:graph:]]/ or next;

$key =~ /([^a-z_12-])/ and fatal('404 Not Found',

($val = uri_unescape($val)) =~ /[[:graph:]]/ or next;

'Invalid character "%s" in query parameter "%s"', $1, $key);

if (defined $val) {

$val = uri_unescape($val);

$val =~ /([^a-zA-Z_01-9.\/-])/ and fatal('404 Not Found',

'Invalid character "%s" in the value "%s" of the query parameter "%s"',

$1, $val, $key);

} else {

$val = 1;

}

$query{$key} = $val;

}

Line 368 if (defined($ENV{QUERY_STRING})) {

Line 370 if (defined($ENV{QUERY_STRING})) {

undef %input;

my $t;

for my $p (qw(graph hideattic hidecvsroot hidenonreadable ignorecase ln copt

for my $p (qw(hideattic hidecvsroot hidenonreadable ignorecase ln copt

makeimage options tarball)) {

options tarball)) {

$t = $query{$p};

if (defined($t)) {

($input{$p}) = ($t =~ /^([01]|on)$/)

Line 757 if ($input{tarball}) {

Line 759 if ($input{tarball}) {

}

# Clean up.

chdir("..");

rmtree($tmpexportdir);

&fatal(@fatal) if @fatal;

Line 1050 EOF

Line 1053 EOF

$filesfound++;

printf "<tr class=\"%s\">\n", ($dirrow % 2) ? 'even' : 'odd';

printf '<td class="file"%s>', $allow_cvsgraph ? '' : ' colspan="2"';

printf '<td class="file" colspan="2">';

my $icon = $isbinary ? $binfileicon : $fileicon;

print $nofilelinks ? $icon : &link($icon, $url);

print ' ', &link(htmlquote($file), $url), $attic;

print '</td><td class="graph">', graph_link($fileurl) if $allow_cvsgraph;

print "</td>\n<td width=\"30\">", display_link($fileurl, $rev);

my $ageclass = 'age';

my $age = '';

Line 1120 EOF

Line 1122 EOF

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

&& $var ne 'only_with_tag');

}

printf(<<EOF, ($use_java_script ? ' onchange="this.form.submit()"' : ''));

print <<EOF;

<label for="only_with_tag" accesskey="T">Show only files with tag:

<option value="">All tags / default branch</option>

EOF

foreach my $tag (reverse sort { lc $a cmp lc $b } keys %tags) {

Line 1170 EOF

Line 1172 EOF

<legend>General options</legend>

EOF

for my $v qw(hidecvsroot hidenonreadable) {

for my $v (qw(hidecvsroot hidenonreadable)) {

printf(qq{<input type="hidden" name="%s" value="%s" />\n},

$v, $input{$v} || 0);

}

Line 1221 EOF

Line 1223 EOF

</td>

EOF

printLogSortSelect(0);

printLogSortSelect();

print <<EOF;

</td>

Line 1240 EOF

Line 1242 EOF

</td>

<td>

EOF

printDiffSelect(0);

printDiffSelect();

print <<EOF;

</td>

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

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

exit;

}

if ($allow_cvsgraph && $input{graph}) {

if ($input{makeimage}) {

doGraph();

} else {

doGraphView();

}

gzipclose();

exit;

}

&doLog($fullname);

}

Line 1364 gzipclose();

Line 1356 gzipclose();

## End MAIN

sub printDiffSelect($)

sub printDiffSelect()

{

my ($use_java_script) = @_;

print '<select id="f" name="f"';

print ' onchange="this.form.submit()"' if $use_java_script;

print ">\n";

for my $difftype (@DIFFTYPES) {

Line 1393 sub printDiffSelectStickyVars()

Line 1382 sub printDiffSelectStickyVars()

}

sub printLogSortSelect($)

sub printLogSortSelect()

{

my ($use_java_script) = @_;

print '<select id="logsort" name="logsort"';

print ' onchange="this.form.submit()"' if $use_java_script;

print ">\n";

for my $sortkey (@LOGSORTKEYS) {

Line 2339 EOF

Line 2325 EOF

EOF

printDiffSelectStickyVars();

print 'Diff format: ';

printDiffSelect($use_java_script);

printDiffSelect();

print "<input type=\"submit\" value=\"Show\" />\n</form>\n";

html_footer();

gzipclose();

Line 2912 sub printLog($$$;$$)

Line 2898 sub printLog($$$;$$)

$fileurl, $_, $barequery, $_));

}

print ' - ', graph_link('', 'revision graph')

if (!$inlogview && $allow_cvsgraph);

}

print "<br />\n";

Line 3046 sub printLog($$$;$$)

Line 3030 sub printLog($$$;$$)

}

# Generates the HTML view for CvsGraph.

sub doGraphView()

{

(my $pathname = $where) =~ s|[^/]*$||;

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

navigateHeader($scriptwhere, $pathname, $filename, undef, 'graph');

my $title = 'Revision graph of ' . htmlquote($pathname . $filename);

my $mapname = 'CvsGraphMap';

printf(<<EOF, $title, $mapname, $cvstree, $title);

EOF

# Remove any pre-existing tag/branch names from branch links.

(my $notag_query = $barequery) =~ s/;+only_with_tag=.*?(?=;|$)//g;

my @graph_cmd =

($CMD{cvsgraph},

'-r', $cvsroot,

'-m', $pathname,

'-i',

'-M', $mapname,

'-x', 'x',

"-Omap_branch_href=\"href=\\\"./?only_with_tag=%(%t%)$notag_query\\\"\"",

"-Omap_rev_href=\"href=\\\"?rev=%(%R%)$barequery\\\"\"",

"-Omap_diff_href=\"href=\\\"%(%F%).diff" .

"?r1=%(%P%);r2=%(%R%)$barequery\\\"\"",

);

push(@graph_cmd, '-c', $cvsgraph_config) if $cvsgraph_config;

push(@graph_cmd, $filename . ',v');

local *CVSGRAPH_OUT;

my ($h, $err) =

startproc(\@graph_cmd, \"", '>pipe', \*CVSGRAPH_OUT);

fatal('500 Internal Error', $err) unless $h;

# Browser compatibility kludge: many browsers do not support client side

# image maps where the <map> element contains only the id attribute. Let's

# add the corresponding name attribute to it on the fly.

while (<CVSGRAPH_OUT>) {

s/(<map\s+id="([^"]+)")\s*>/$1 name="$2">/;

print;

}

$h->finish();

print "</div>\n";

html_footer();

}

# Generates a graph using CvsGraph.

sub doGraph()

{

(my $pathname = $where) =~ s|[^/]*$||;

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

http_header('image/png');

my @graph_cmd = ($CMD{cvsgraph}, '-r', $cvsroot, '-m', $pathname);

push(@graph_cmd, '-c', $cvsgraph_config) if $cvsgraph_config;

push(@graph_cmd, $filename . ',v');

local *CVSGRAPH_OUT;

my ($h, $err) =

startproc(\@graph_cmd, \"", '>pipe', \*CVSGRAPH_OUT);

fatal('500 Internal Error', $err) unless $h;

{

local $/ = undef;

binmode(\*STDOUT);

print <CVSGRAPH_OUT>;

}

$h->finish();

}

sub doLog($)

{

my ($fullname) = @_;

Line 3153 sub doLog($)

Line 3054 sub doLog($)

&clickablePath($upwhere, 1), "</b>\n</p>\n";

print "<p>\n ";

print &link('Request diff between arbitrary revisions', '#diff');

print ' - ', &graph_link('', 'Display revisions graphically')

if $allow_cvsgraph;

if ($cvshistory_url) {

(my $d = $upwhere) =~ s|/+$||;

print ' - ', history_link($d, $filename);

Line 3257 EOF

Line 3156 EOF

</td>

EOF

printDiffSelect($use_java_script);

printDiffSelect();

print <<EOF;

</td>

Line 3266 EOF

Line 3165 EOF

if (@branchnames) {

printf(<<EOF, $use_java_script ? ' onchange="this.form.submit()"' : '');

print <<EOF;

<tr>

<label for="only_with_tag" accesskey="B">View only branch:</label>

</td>

EOF

my @tmp = ();

Line 3306 EOF

Line 3205 EOF

</td>

<td>

EOF

printLogSortSelect($use_java_script);

printLogSortSelect();

print <<EOF;

</td>

Line 3344 EOF

Line 3243 EOF

}

} elsif ($state eq "PreChange") { # state eq "PreChange"

# we got removes with subsequent adds

if (HAS_EDIFF) {

# construct the suffix tree

my $left_diff = join("\n", @$leftColRef[0..$leftRow-1]);

my $right_diff = join("\n", @$rightColRef[0..$rightRow-1]);

my $diff_str = String::Ediff::ediff($left_diff, $right_diff);

my @diff_str = split(/ /, $diff_str);

my $INFINITY = 10000000;

push(@diff_str, ($INFINITY) x 8);

my ($idx, $b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =

(0, @diff_str[0..7]);

my ($l_cul, $r_cul) = (0, 0);

my ($ldx, $rdx) = (0, 0);

my (@left_html, @right_html);

for (my $j = 0; $j < $leftRow; $j++) {

my $line_len = length(@$leftColRef[$j]);

my $line = @$leftColRef[$j];

$l_cul += length($line) + 1; # includes "\n"

my $l_culx = $l_cul - 1; # not includes "\n"

if ($j < $lb1) {

$line = spacedHtmlText($line);

push(@left_html, "<td class=\"diff diff-changed\">$line</td>");

} elsif ($lb1 == $j) {

my $html_line;

while ($lb1 == $j) {

my $begin_char = $l_culx - $b1;

$line =~ /^(.*)(.{$begin_char})$/;

$html_line .= spacedHtmlText($1) .

'</span><span class="diff diff-unchanged">';

$line = $2;

last if ($j != $le1);

my $end_char = $l_culx - $e1;

$line =~ /^(.*)(.{$end_char})$/;

$html_line .= spacedHtmlText($1) .

'</span><span class="diff diff-changed">';

$line = $2;

$idx++;

my ($tb1, $te1, $tlb1, $tle1, $tb2, $te2, $tlb2, $tle2) =

($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2);

($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =

@diff_str[$idx*8..($idx+1)*8-1];

$lb1 = $INFINITY if ($lb1 < 0);

$lb2 = $INFINITY if ($lb2 < 0);

$le1 = $INFINITY if ($le1 < 0);

$le2 = $INFINITY if ($le2 < 0);

if ($te1 > $b1) {

($b1, $lb1) = ($te1, $tle1);

}

if ($te2 > $b2) {

($b2, $lb2) = ($te2, $tle2);

}

push(@left_html,

sprintf('<td><span class="diff diff-changed">%s%s</span></td>',

$html_line, spacedHtmlText($line)));

} elsif ($le1 == $j) {

my $html_line;

while ($le1 == $j) {

my $end_char = $l_culx - $e1;

$line =~ /^(.*)(.{$end_char})$/;

$html_line .= spacedHtmlText($1) .

'</span><span class="diff diff-changed">';

$line = $2;

$idx++;

my ($tb1, $te1, $tlb1, $tle1, $tb2, $te2, $tlb2, $tle2) =

($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2);

($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =

@diff_str[$idx*8..($idx+1)*8-1];

$lb1 = $INFINITY if ($lb1 < 0);

$lb2 = $INFINITY if ($lb2 < 0);

$le1 = $INFINITY if ($le1 < 0);

$le2 = $INFINITY if ($le2 < 0);

if ($te1 > $b1) {

($b1, $lb1) = ($te1, $tle1);

}

if ($te2 > $b2) {

($b2, $lb2) = ($te2, $tle2);

}

last if ($lb1 != $j);

my $begin_char = $l_culx - $b1;

$line =~ /^(.*)(.{$begin_char})$/;

$html_line .= spacedHtmlText($1) .

'</span><span class="diff diff-unchanged">';

$line = $2;

}

push(@left_html,

sprintf('<td><span class="diff diff-unchanged">%s%s</span></td>',

$html_line, spacedHtmlText($line)));

} else {

$line = spacedHtmlText($line);

push(@left_html, "<td class=\"diff diff-unchanged\">$line</td>");

}

($idx, $b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =

(0, @diff_str[0..7]);

$lb1 = $INFINITY if ($lb1 < 0);

$lb2 = $INFINITY if ($lb2 < 0);

$le1 = $INFINITY if ($le1 < 0);

$le2 = $INFINITY if ($le2 < 0);

for (my $j = 0; $j < $rightRow; $j++) {

my $line_len = length(@$rightColRef[$j]);

my $line = @$rightColRef[$j];

$r_cul += length($line) + 1; # includes "\n"

my $r_culx = $r_cul - 1; # not includes "\n"

if ($j < $lb2) {

$line = spacedHtmlText($line);

push(@right_html, "<td class=\"diff diff-changed\">$line</td>");

} elsif ($lb2 == $j) {

my $html_line;

while ($lb2 == $j) {

my $begin_char = $r_culx - $b2;

$line =~ /^(.*)(.{$begin_char})$/;

$html_line .= spacedHtmlText($1) .

'</span><span class="diff diff-unchanged">';

$line = $2;

last if ($j != $le2);

my $end_char = $r_culx - $e2;

$line =~ /^(.*)(.{$end_char})$/;

$html_line .= spacedHtmlText($1) .

'</span><span class="diff diff-changed">';

$line = $2;

$idx++;

my ($tb1, $te1, $tlb1, $tle1, $tb2, $te2, $tlb2, $tle2) =

($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2);

($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =

@diff_str[$idx*8..($idx+1)*8-1];

$lb1 = $INFINITY if ($lb1 < 0);

$lb2 = $INFINITY if ($lb2 < 0);

$le1 = $INFINITY if ($le1 < 0);

$le2 = $INFINITY if ($le2 < 0);

if ($te1 > $b1) {

($b1, $lb1) = ($te1, $tle1);

}

if ($te2 > $b2) {

($b2, $lb2) = ($te2, $tle2);

}

push(@right_html,

sprintf('<td><span class="diff diff-changed">%s%s</span></td>',

$html_line, spacedHtmlText($line)));

} elsif ($le2 == $j) {

my $html_line;

while ($le2 == $j) {

my $end_char = $r_culx - $e2;

$line =~ /^(.*)(.{$end_char})$/;

$html_line .= spacedHtmlText($1) .

'</span><span class="diff diff-changed">';

$line = $2;

$idx++;

my ($tb1, $te1, $tlb1, $tle1, $tb2, $te2, $tlb2, $tle2) =

($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2);

($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =

@diff_str[$idx*8..($idx+1)*8-1];

$lb1 = $INFINITY if ($lb1 < 0);

$lb2 = $INFINITY if ($lb2 < 0);

$le1 = $INFINITY if ($le1 < 0);

$le2 = $INFINITY if ($le2 < 0);

if ($te1 > $b1) {

($b1, $lb1) = ($te1, $tle1);

}

if ($te2 > $b2) {

($b2, $lb2) = ($te2, $tle2);

}

last if ($lb2 != $j);

my $begin_char = $r_culx - $b2;

$line =~ /^(.*)(.{$begin_char})$/;

$html_line .= spacedHtmlText($1) .

'</span><span class="diff diff-unchanged">';

$line = $2;

}

push(@right_html,

sprintf('<td nowrap="nowrap"><span class="diff diff-unchanged"'.

'>%s%s</span></td>',

$html_line, spacedHtmlText($line)));

} else {

$line = spacedHtmlText ($line);

push @right_html, "<td class=\"diff diff-unchanged\">$line</td>";

}

for (my $j = 0; $j < $leftRow || $j < $rightRow ; $j++) { # dump out both cols

print '<tr>';

if ($j < $leftRow) {

print $left_html[$j];

} else {

print '<td class="diff diff-changed-missing"> </td>';

}

if ($j < $rightRow) {

print $right_html[$j];

} else {

print '<td class="diff diff-changed-missing"> </td>';

}

print "</tr>\n";

}

} else {

for (my $j = 0; $j < $leftRow || $j < $rightRow; $j++) { # dump both cols

print "<tr>\n";

if ($j < $leftRow) {

Line 3570 EOF

Line 3261 EOF

}

print "\n</tr>\n";

}

Line 3741 EOF

Line 3431 EOF

<label for="f">Diff format:<br />

EOF

printDiffSelectStickyVars();

printDiffSelect($use_java_script);

printDiffSelect();

printf(<<EOF, $rev1, $rev2);

</label>

Line 3951 sub chooseCVSRoot()

Line 3641 sub chooseCVSRoot()

if ($input{$k} && $k ne 'cvsroot');

}

printf(<<EOF, $use_java_script ? ' onchange="this.form.submit()"' : '');

print <<EOF;

<label for="cvsroot" accesskey="C">CVS Root:

EOF

foreach my $k (@CVSROOT) {

Line 4131 sub display_link($$;$$)

Line 3821 sub display_link($$;$$)

}

# Expects the passed in URL to be URI escaped, and without a query string.

# The passed in link text should be already HTML escaped as appropriate.

sub graph_link($;$)

{

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

$text ||= $graphicon;

return sprintf('<a href="%s?graph=1%s">%s</a>', $url, $barequery, $text);

}

# Returns a link to CVSHistory for the given directory and filename.

sub history_link($$;$)

Line 4234 sub http_header(;$$)

Line 3913 sub http_header(;$$)

push(@headers, 'Last-Modified: ' . scalar gmtime($moddate) . ' GMT')

if $moddate;

push(@headers, 'Content-Type: ' . $content_type);

push(@headers, "Content-Security-Policy: default-src 'none'; " .

"img-src 'self'; style-src 'unsafe-inline'");

if ($allow_compress && $maycompress) {

if (HAS_ZLIB

|| (defined($CMD{gzip}) && open(GZIP, "| $CMD{gzip} -1 -c")))

{

push(@headers, 'Content-Encoding: gzip');

push(@headers, 'Vary: Accept-Encoding'); # RFC 2616, 14.44

print join("\r\n", @headers) . "\r\n\r\n";

Line 4247 sub http_header(;$$)

Line 3924 sub http_header(;$$)

$| = 1;

$| = 0; # Flush header output.

tie(*GZIP, __PACKAGE__, \*STDOUT) if HAS_ZLIB;

tie(*GZIP, __PACKAGE__, \*STDOUT);

select(GZIP);

$gzip_open = 1;

} else {

print join("\r\n", @headers) . "\r\n\r\n";

printf

'<span style="font-size: smaller">Unable to find gzip binary in the <b>$command_path</b> (<code>%s</code>) to compress output</span><br />',

htmlquote(join(':', @command_path));

}

} else {

print join("\r\n", @headers) . "\r\n\r\n";

}

Line 4426 sub TIEHANDLE

Line 4094 sub TIEHANDLE

crc => 0,

len => 0,

};

my ($header) = pack("c10",

my ($header) = pack("C10",

MAGIC1, MAGIC2, Compress::Zlib::Z_DEFLATED(),

0, 0, 0, 0, 0, 0, OSCODE);

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

CVSweb