===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 3.32
retrieving revision 3.34
diff -u -p -r3.32 -r3.34
--- cvsweb/cvsweb.cgi 2000/10/07 07:35:08 3.32
+++ cvsweb/cvsweb.cgi 2000/10/10 18:48:59 3.34
@@ -43,7 +43,7 @@
# SUCH DAMAGE.
#
# $zId: cvsweb.cgi,v 1.103 2000/09/20 17:02:29 jumager Exp $
-# $Id: cvsweb.cgi,v 3.32 2000/10/07 07:35:08 knu Exp $
+# $Id: cvsweb.cgi,v 3.34 2000/10/10 18:48:59 knu Exp $
#
###
@@ -59,7 +59,7 @@ 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
@@ -196,12 +196,13 @@ $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;
@@ -936,13 +937,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;
}
}
@@ -982,7 +983,7 @@ sub spacedHtmlText($;$) {
sub link($$) {
my($name, $where) = @_;
- return "$name\n";
+ return "$name";
}
sub revcmp($$) {
@@ -1255,7 +1256,7 @@ sub doAnnotate($$) {
}
else {
$revprint = sprintf('%-8s', $lrev);
- $revprint =~ s`\S+`$&`; # `
+ $revprint =~ s`\S+`$&`; # `
$oldLusr = '';
}
if ($lusr eq $oldLusr) {
@@ -2491,7 +2492,7 @@ sub navigateHeader($$$$$) {
$swhere = urlencode($filename) if ($swhere eq "");
print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">";
print "\n\n";
- print '';
+ print '';
print "\n$path$filename - $title - $rev\n";
print "$body_tag_for_src\n";
print "";
@@ -2846,7 +2847,7 @@ sub http_header(;$) {
sub html_header($) {
my ($title) = @_;
- my $version = '$zRevision: 1.103 $ $Revision: 3.32 $'; #'
+ my $version = '$zRevision: 1.103 $ $Revision: 3.34 $'; #'
http_header();
print <