cvsweb/cvsweb.cgi - diff

Return to cvsweb.cgi CVS log

Up to [cvsweb.bsd.lv] / cvsweb

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

version 3.14, 2000/08/24 15:53:11

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

Line 53 use vars qw (

%CVSROOT %CVSROOTdescr %MIRRORS %DEFAULTVALUE %ICONS %MTYPES

%alltags @tabcolors %fileinfo %tags @branchnames %nameprinted

%symrev %revsym @allrevisions %date %author @revdisplayorder

@revisions %state %difflines %log %branchpoint @revorder $prcgi

@revisions %state %difflines %log %branchpoint @revorder

@prcategories $prcategories

$prcgi @prcategories $prcategories $mancgi

$checkoutMagic $doCheckout $scriptname $scriptwhere

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

%funcline_regexp $is_mod_perl

Line 82 use vars qw (

sub printDiffSelect($);

sub findLastModifiedSubdirs(@);

sub htmlify($;$);

sub spacedHtmlText($);

sub spacedHtmlText($;$);

sub link($$);

sub revcmp($$);

sub fatal($$);

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

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

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

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

$fullname = $cvsroot . '/' . $where;

$mimetype = &getMimeTypeFromSuffix ($fullname);

Line 886 sub findLastModifiedSubdirs(@) {

Line 887 sub findLastModifiedSubdirs(@) {

}

sub htmlify($;$) {

my($string, $pr) = @_;

my($string, $extra) = @_;

# Special Characters; RFC 1866

$string =~ s/&/&/g;

Line 895 sub htmlify($;$) {

Line 896 sub htmlify($;$) {

$string =~ s/>/>/g;

# get URL's as link ..

$string =~ s`(http|ftp|https)(://[-a-zA-Z0-9%.~:_/]+)([?&]([-a-zA-Z0-9%.~:_]+)=([-a-zA-Z0-9%.~:_])+)*`<A HREF="$1$2$3">$1$2$3</A>`;

$string =~ s`(http|ftp|https)(://[-a-zA-Z0-9%.~:_/]+)([?&]([-a-zA-Z0-9%.~:_]+)=([-a-zA-Z0-9%.~:_])+)*`<A HREF="$1$2$3">$1$2$3</A>`g; # `

# get e-mails as link

$string =~ s`([-a-zA-Z0-9_.]+@([-a-zA-Z0-9]+\.)+[A-Za-z]{2,4})`<A HREF="mailto:$1">$1</A>`;

$string =~ s`([-a-zA-Z0-9_.]+@([-a-zA-Z0-9]+\.)+[A-Za-z]{2,4})`<A HREF="mailto:$1">$1</A>`g; # `

# get #PR as link ..

if ($extra) {

if ($pr && defined($prcgi)) {

# get PR #'s as link ..

1 while $string =~ s`\b(pr[:#]?\s*(?:#?\d+[,\s]\s*)*#?)(\d+)\b`$1<A HREF="$prcgi$2">$2</A>`i;

if (defined($prcgi)) {

$string =~ s`\b${prcategories}/(\d+)\b`<A HREF="$prcgi$1">$&</A>`igo;

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; # `

}

# get manpage specs as link ..

if (defined($mancgi)) {

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

}

return $string;

}

sub spacedHtmlText($) {

sub spacedHtmlText($;$) {

local $_ = $_[0];

my $ts = $_[1] || $tabstop;

# Cut trailing spaces

# Cut trailing spaces and tabs

s/\s+\n$//;

s/[ \t]+$//;

# Expand tabs

if (defined($tabstop)) {

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

# Expand tabs

if (defined($tabstop));

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

}

# replace <tab> and <space> (\001 is to protect us from htmlify)

# gzip can make excellent use of this repeating pattern :-)

s/\001/\001%/g; #protect our & substitute

if ($hr_breakable) {

# make every other space 'breakable'

s/ / \001nbsp; \001nbsp; \001nbsp; \001nbsp;/g; # <tab>

s/ / \001nbsp;/g; # 2 * <space>

# leave single space as it is

}

} else {

else {

s/ /\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;/g;

s/ /\001nbsp;/g;

}

$_ = htmlify($_);

# unescape

s/\001([^%])/&$1/g;

y/\001/&/;

s/\001%/\001/g;

return $_;

}

Line 949 sub link($$) {

Line 954 sub link($$) {

sub revcmp($$) {

my($rev1, $rev2) = @_;

# make no comparison for a tag or a branch

return 0 if $rev1 =~ /[^\d.]/ || $rev2 =~ /[^\d.]/;

my(@r1) = split(/\./, $rev1);

my(@r2) = split(/\./, $rev2);

my($a,$b);

Line 1063 sub doAnnotate($$) {

Line 1072 sub doAnnotate($$) {

# make sure the revisions a wellformed, for security

# reasons ..

if (!($rev =~ /^[\d\.]+$/)) {

if ($rev =~ /[^\w.]/) {

&fatal("404 Not Found",

"Malformed query \"$ENV{QUERY_STRING}\"");

}

Line 1170 sub doAnnotate($$) {

Line 1179 sub doAnnotate($$) {

}

else {

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

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

}

if ($lusr eq $oldLusr) {

$usrprint = " ";

Line 1214 sub doCheckout($$) {

Line 1224 sub doCheckout($$) {

my ($mimetype,$revopt);

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

if ($rev eq 'HEAD' || $rev eq '.') {

$rev = undef;

}

# make sure the revisions a wellformed, for security

# reasons ..

if (defined($rev) && !($rev =~ /^[\d\.]+$/)) {

if (defined($rev) && $rev =~ /[^\w.]/) {

&fatal("404 Not Found",

"Malformed query \"$ENV{QUERY_STRING}\"");

}

Line 1252 sub doCheckout($$) {

Line 1266 sub doCheckout($$) {

# Safely for a child process to read from.

if (! open($fh, "-|")) { # child

open(STDERR, ">&STDOUT"); # Redirect stderr to stdout

exec("cvs", "-d", $cvsroot, "co", "-p", $revopt, $where);

exec("cvs", "-Rld", $cvsroot, "co", "-p", $revopt, $where);

}

#===================================================================

#Checking out squid/src/ftp.c

Line 1369 sub doDiff($$$$$$) {

Line 1383 sub doDiff($$$$$$) {

$rev2 = $tr2;

$sym2 = "";

}

# make sure the revisions a wellformed, for security

# reasons ..

if (!($rev1 =~ /^[\d\.]+$/) || !($rev2 =~ /^[\d\.]+$/)) {

if ($rev1 =~ /[^\w.]/ || $rev2 =~ /[^\w.]/) {

&fatal("404 Not Found",

"Malformed query \"$ENV{QUERY_STRING}\"");

}

Line 1413 sub doDiff($$$$$$) {

Line 1428 sub doDiff($$$$$$) {

# apply special options

if ($showfunc) {

push @difftype, '-p';

push @difftype, '-p' if $f =~ /^[cHhu]$/;

my($re1, $re2);

CVSweb