===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 3.37
retrieving revision 3.40
diff -u -p -r3.37 -r3.40
--- cvsweb/cvsweb.cgi 2000/10/20 15:46:01 3.37
+++ cvsweb/cvsweb.cgi 2000/11/22 19:26:11 3.40
@@ -42,8 +42,8 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $zId: cvsweb.cgi,v 1.103 2000/09/20 17:02:29 jumager Exp $
-# $Id: cvsweb.cgi,v 3.37 2000/10/20 15:46:01 knu Exp $
+# $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $
+# $Id: cvsweb.cgi,v 3.40 2000/11/22 19:26:11 knu Exp $
#
###
@@ -63,10 +63,10 @@ use vars qw (
$is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased
%input $query $barequery $sortby $bydate $byrev $byauthor
$bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot
- $mimetype $defaultTextPlain $defaultViewable $allow_compress
- $GZIPBIN $backicon $diricon $fileicon $fullname $newname
- $cvstreedefault $body_tag $body_tag_for_src
- $logo $defaulttitle $address
+ $mimetype $charset $defaultTextPlain $defaultViewable
+ $allow_compress $GZIPBIN $backicon $diricon $fileicon
+ $fullname $newname $cvstreedefault
+ $body_tag $body_tag_for_src $logo $defaulttitle $address
$long_intro $short_instruction $shortLogLen
$show_author $dirtable $tablepadding $columnHeaderColorDefault
$columnHeaderColorSorted $hr_breakable $showfunc $hr_ignwhite
@@ -1001,12 +1001,13 @@ sub findLastModifiedSubdirs(@) {
sub htmlify_sub(&$) {
(my $proc, local $_) = @_;
local @_ = split(m`(]+>[^<]*)`i);
- my ($linked, $result);
+ my $linked;
+ my $result = '';
while (($_, $linked) = splice(@_, 0, 2)) {
&$proc();
- $result .= $_;
- $result .= $linked;
+ $result .= $_ if defined($_);
+ $result .= $linked if defined($linked);
}
$result;
@@ -1804,7 +1805,7 @@ again:
if ($state eq "tags" && /^\S/) {
if (defined($tag) && (defined($symrev{$tag}) || $tag eq "HEAD")) {
$revwanted = $tag eq "HEAD" ? $symrev{"MAIN"} : $symrev{$tag};
- ($branch = $revwanted) =~ s/\b0\.//;
+ ($branch = $revwanted) =~ s/\.0\././;
($branchpoint = $branch) =~ s/\.?\d+$//;
$revwanted = undef if ($revwanted ne $branch);
}
@@ -2033,7 +2034,7 @@ sub readLog($;$) {
foreach (reverse sort keys %symrev) {
$rev = $symrev{$_};
- if ($rev =~ /^((.*)\.)?\b0\.(\d+)$/) {
+ if ($rev =~ /^((.*)\.)0\.(\d+)$/) {
push(@branchnames, $_);
#
# A revision number of A.B.0.D really translates into
@@ -2046,9 +2047,11 @@ sub readLog($;$) {
# with the branch number 0.A, with the exception that
# it has no head to translate to if there is nothing on
# the branch, but I guess this can never happen?
- # (the code below gracefully forgets about the branch
- # if it should 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.
+ #
$head = defined($2) ? $2 : "";
$branch = $3;
$branchrev = $head . ($head ne "" ? "." : "") . $branch;
@@ -2078,7 +2081,7 @@ sub readLog($;$) {
my ($onlyonbranch, $onlybranchpoint);
if ($onlyonbranch = $input{'only_with_tag'}) {
$onlyonbranch = $symrev{$onlyonbranch};
- if ($onlyonbranch =~ s/\b0\.//) {
+ if ($onlyonbranch =~ s/\.0\././) {
($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//;
}
else {
@@ -2637,7 +2640,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 "";
@@ -2840,7 +2843,7 @@ sub fileSortCmp() {
sub download_url($$;$) {
my ($url,$revision,$mimetype) = @_;
- $revision =~ s/\b0\.//;
+ $revision =~ s/\.0\././;
if (defined($checkoutMagic)
&& (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) {
@@ -2996,7 +2999,7 @@ sub http_header(;$) {
}
select(GZIP);
$gzip_open = 1;
-# print "" if ($content_type eq "text/html");
+# print "" if ($content_type =~ m|^text/html\b|);
}
else {
if ($is_mod_perl) {
@@ -3020,12 +3023,13 @@ sub http_header(;$) {
sub html_header($) {
my ($title) = @_;
- my $version = '$zRevision: 1.103 $ $Revision: 3.37 $'; #'
- http_header();
+ my $version = '$zRevision: 1.104 $ $Revision: 3.40 $'; #'
+ http_header($charset ne "" ? "text/html; charset=$charset" : "text/html");
print <
+
$title