===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.1.1.14
retrieving revision 1.1.1.15
diff -u -p -r1.1.1.14 -r1.1.1.15
--- cvsweb/cvsweb.cgi 2000/12/07 15:16:31 1.1.1.14
+++ cvsweb/cvsweb.cgi 2000/12/18 04:35:54 1.1.1.15
@@ -43,7 +43,7 @@
# SUCH DAMAGE.
#
# $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $
-# $kId: cvsweb.cgi,v 1.42 2000/12/07 15:11:24 knu Exp $
+# $kId: cvsweb.cgi,v 1.45 2000/12/18 04:25:30 knu Exp $
#
###
@@ -244,7 +244,7 @@ $is_mod_perl = defined($ENV{MOD_PERL});
# in lynx, it it very annoying to have two links
# per file, so disable the link at the icon
# in this case:
-$Browser = $ENV{HTTP_USER_AGENT};
+$Browser = $ENV{HTTP_USER_AGENT} || '';
$is_links = ($Browser =~ m`^Links `);
$is_lynx = ($Browser =~ m`^Lynx/`i);
$is_w3m = ($Browser =~ m`^w3m/`i);
@@ -909,13 +909,13 @@ elsif (-d $fullname) {
my $fh = do {local(*FH);};
my ($xtra, $module);
# Assume it's a module name with a potential path following it.
- $xtra = $& if (($module = $where) =~ s|/.*||);
+ $xtra = (($module = $where) =~ s|/.*||) ? $& : '';
# Is there an indexed version of modules?
if (open($fh, "$cvsroot/CVSROOT/modules")) {
while (<$fh>) {
if (/^(\S+)\s+(\S+)/o && $module eq $1
- && -d "${cvsroot}/$2" && $module ne $2) {
- &redirect($scriptname . '/' . $2 . $xtra);
+ && -d "$cvsroot/$2" && $module ne $2) {
+ &redirect("$scriptname/$2$xtra");
}
}
}
@@ -1790,7 +1790,7 @@ again:
} elsif (/^symbolic names:/) {
$state = "tags";
($branch = $head) =~ s/\.\d+$// if (!defined($branch));
- $branch =~ s/(\.?)(\d+)$/${1}0.$2/;
+ $branch =~ s/(\d+)$/0.$1/;
$symrev{MAIN} = $branch;
$symrev{HEAD} = $branch;
$alltags{MAIN} = 1;
@@ -1816,7 +1816,7 @@ again:
if (defined($tag)) {
if(defined($symrev{$tag}) || $tag eq "HEAD") {
$revwanted = $symrev{$tag eq "HEAD" ? "MAIN" : $tag};
- ($branch = $revwanted) =~ s/\.0\././;
+ ($branch = $revwanted) =~ s/\b0\.//;
($branchpoint = $branch) =~ s/\.?\d+$//;
$revwanted = undef if ($revwanted ne $branch);
} elsif ($tag ne "HEAD") {
@@ -2014,7 +2014,7 @@ sub readLog($;$) {
# is the first commit listed on the appropriate branch.
# This is not neccesary the same revision as marked as head in the RCS file.
my $headrev = $curbranch || "1";
- ($symrev{"MAIN"} = $headrev) =~ s/(\.?)(\d+)$/${1}0.$2/;
+ ($symrev{"MAIN"} = $headrev) =~ s/(\d+)$/0.$1/;
foreach $rev (@revorder) {
if ($rev =~ /^(\S*)\.\d+$/ && $headrev eq $1) {
$symrev{"HEAD"} = $rev;
@@ -2036,7 +2036,7 @@ sub readLog($;$) {
foreach (reverse sort keys %symrev) {
$rev = $symrev{$_};
- if ($rev =~ /^((.*)\.)0\.(\d+)$/) {
+ if ($rev =~ /^((.*)\.)?\b0\.(\d+)$/) {
push(@branchnames, $_);
#
# A revision number of A.B.0.D really translates into
@@ -2050,9 +2050,8 @@ sub readLog($;$) {
# it has no head to translate to if there is nothing on
# the branch, but I guess this can never happen?
#
- # Since some stupid people actually import/check in
- # files with version 0.X we assume that the above cannot
- # happen, and regard 0.X(.*) as a revision and not a branch.
+ # (the code below gracefully forgets about the branch
+ # if it should happen)
#
$head = defined($2) ? $2 : "";
$branch = $3;
@@ -2082,7 +2081,7 @@ sub readLog($;$) {
my ($onlyonbranch, $onlybranchpoint);
if ($onlyonbranch = $input{'only_with_tag'}) {
$onlyonbranch = $symrev{$onlyonbranch};
- if ($onlyonbranch =~ s/\.0\././) {
+ if ($onlyonbranch =~ s/\b0\.//) {
($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//;
}
else {
@@ -2639,9 +2638,10 @@ sub navigateHeader($$$$$) {
my ($swhere,$path,$filename,$rev,$title) = @_;
$swhere = "" if ($swhere eq $scriptwhere);
$swhere = urlencode($filename) if ($swhere eq "");
- print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">";
+ print qq``;
print "\n\n";
- print '';
+ print qq`\n`;
+ print '';
print "\n$path$filename - $title - $rev\n";
print "$body_tag_for_src\n";
print "";
@@ -2844,7 +2844,7 @@ sub fileSortCmp() {
sub download_url($$;$) {
my ($url,$revision,$mimetype) = @_;
- $revision =~ s/\.0\././;
+ $revision =~ s/\b0\.//;
if (defined($checkoutMagic)
&& (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) {
@@ -3024,13 +3024,14 @@ sub http_header(;$) {
sub html_header($) {
my ($title) = @_;
- my $version = '$zRevision: 1.104 $ $kRevision: 1.42 $'; #'
+ my $version = '$zRevision: 1.104 $ $kRevision: 1.45 $'; #'
http_header(defined($charset) ? "text/html; charset=$charset" : "text/html");
print <
+
$title