===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.1.1.9
retrieving revision 1.1.1.10
diff -u -p -r1.1.1.9 -r1.1.1.10
--- cvsweb/cvsweb.cgi 2000/09/30 20:17:23 1.1.1.9
+++ cvsweb/cvsweb.cgi 2000/10/07 07:50:18 1.1.1.10
@@ -43,7 +43,7 @@
# SUCH DAMAGE.
#
# $zId: cvsweb.cgi,v 1.103 2000/09/20 17:02:29 jumager Exp $
-# $kId: cvsweb.cgi,v 1.30 2000/09/30 20:10:01 knu Exp $
+# $kId: cvsweb.cgi,v 1.33 2000/10/07 07:44:12 knu Exp $
#
###
@@ -79,6 +79,7 @@ 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($);
@@ -159,6 +160,9 @@ $checkout_magic = $show_subdir_lastmod = $show_log_in_
$navigationHeaderColor = $tableBorderColor = $markupLogColor =
$tabstop = $use_moddate = $moddate = $gzip_open = undef;
+$LOG_FILESEPARATOR = q/^={77}$/;
+$LOG_REVSEPARATOR = q/^-{28}$/;
+
##### End of configuration variables #####
use Time::Local;
@@ -279,25 +283,24 @@ 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) {
- $barequery = $barequery . "&";
- }
- my $thisval = urlencode($_) . "=" . urlencode($input{$_});
- $barequery .= $thisval;
+ push @barequery, join('=', urlencode($_), urlencode($input{$_}));
}
}
# 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"};
@@ -345,7 +348,8 @@ 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) {
@@ -355,6 +359,7 @@ foreach my $k (keys %ICONS) {
${"${k}icon"} = $itxt;
}
}
+undef $k;
my $config_cvstree = "$config-$cvstree";
@@ -365,6 +370,7 @@ if (-f $config_cvstree) {
sprintf('Error in loading configuration file: %s
%s
',
$config_cvstree, &htmlify($@)));
}
+undef $config_cvstree;
$prcategories = '(?:' . join('|', @prcategories) . ')';
$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/;
@@ -930,13 +936,13 @@ 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; # `
- $string =~ s`\b${prcategories}/(\d+)\b`&link($&, sprintf($prcgi, $1))`igeo; # `
+ 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; # `
+ $string =~ s`\b([a-zA-Z]\w+)(?:\(([0-9n])\)\B|\.([0-9n])\b)`&link($&, sprintf($mancgi, $2 ne '' ? $2 : $3, $1))`ge; # `x;
}
}
@@ -976,7 +982,7 @@ sub spacedHtmlText($;$) {
sub link($$) {
my($name, $where) = @_;
- return "$name\n";
+ return "$name";
}
sub revcmp($$) {
@@ -1266,11 +1272,11 @@ sub doAnnotate($$) {
# so it looks irregular.
print "" if ($isCurrentRev && $is_textbased);
- printf ("%s%s %-8s %4d:",
+ printf "%s%s %-8s %4d:",
$revprint,
$isCurrentRev ? '!' : ' ',
$usrprint,
- $lineNr);
+ $lineNr;
print spacedHtmlText($line, $d{'tabstop'});
print "" if ($isCurrentRev && $is_textbased);
@@ -1692,7 +1698,7 @@ again:
$state = "head";
goto again;
}
- if ($state eq "head" && /^----------------------------$/) {
+ if ($state eq "head" && /$LOG_REVSEPARATOR/o) {
$state = "log";
$rev = undef;
$date = undef;
@@ -1702,8 +1708,7 @@ 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+$//;
@@ -1750,7 +1755,7 @@ again:
$log = $log . $_;
}
}
- if (/^===============/) {
+ if (/$LOG_FILESEPARATOR/o) {
$state = "start";
next;
}
@@ -1824,7 +1829,7 @@ sub readLog($;$) {
# log info
# ----------------------------
logentry:
- while (!/^=========/) {
+ while (!/$LOG_FILESEPARATOR/o) {
$_ = <$fh>;
last logentry if (!defined($_)); # EOF
print "R:", $_ if ($verbose);
@@ -1832,7 +1837,7 @@ sub readLog($;$) {
$rev = $1;
unshift(@allrevisions,$rev);
}
- elsif (/^========/ || /^----------------------------$/) {
+ elsif (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o) {
next logentry;
}
else {
@@ -1866,7 +1871,7 @@ 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);
@@ -2486,7 +2491,7 @@ sub navigateHeader($$$$$) {
$swhere = urlencode($filename) if ($swhere eq "");
print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">";
print "\n