===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.1.1.16
retrieving revision 3.37
diff -u -p -r1.1.1.16 -r3.37
--- cvsweb/cvsweb.cgi	2000/12/28 18:37:25	1.1.1.16
+++ cvsweb/cvsweb.cgi	2000/10/20 15:46:01	3.37
@@ -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.104 2000/11/01 22:05:12 hnordstrom Exp $
-# $kId: cvsweb.cgi,v 1.47 2000/12/28 18:07:20 knu Exp $
+# $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 $
 #
 ###
 
@@ -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 $charset $defaultTextPlain $defaultViewable
-    $allow_compress $GZIPBIN $backicon $diricon $fileicon
-    $fullname $newname $cvstreedefault
-    $body_tag $body_tag_for_src $logo $defaulttitle $address
+    $mimetype $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
@@ -79,7 +79,7 @@ use vars qw (
     $navigationHeaderColor $tableBorderColor $markupLogColor
     $tabstop $state $annTable $sel $curbranch @HideModules
     $module $use_descriptions %descriptions @mytz $dwhere $moddate
-    $use_moddate $has_zlib $gzip_open $allow_tar
+    $use_moddate $has_zlib $gzip_open
     $LOG_FILESEPARATOR $LOG_REVSEPARATOR
 );
 
@@ -228,10 +228,9 @@ $verbose = $v;
 $checkoutMagic = "~checkout~";
 $pathinfo = defined($ENV{PATH_INFO}) ? $ENV{PATH_INFO} : '';
 $where = $pathinfo;
-$where =~ tr|/|/|s;
 $doCheckout = ($where =~ /^\/$checkoutMagic/);
 $where =~ s|^/($checkoutMagic)?||;
-$where =~ s|/$||;
+$where =~ s|/+$||;
 $scriptname = defined($ENV{SCRIPT_NAME}) ? $ENV{SCRIPT_NAME} : '';
 $scriptname =~ s|^/?|/|;
 $scriptname =~ s|/+$||;
@@ -245,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);
@@ -295,7 +294,6 @@ $query = $ENV{QUERY_STRING};
 
 if (defined($query) && $query ne '') {
     foreach (split(/&/, $query)) {
-	y/+/ /;
 	s/%(..)/sprintf("%c", hex($1))/ge;	# unquote %-quoted
 	if (/(\S+)=(.*)/) {
 	    $input{$1} = $2 if ($2 ne "");
@@ -406,7 +404,7 @@ foreach $k (keys %ICONS) {
     my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}};
     if ($ipath) {
 	${"${k}icon"} = sprintf('<IMG SRC="%s" ALT="%s" BORDER="0" WIDTH="%d" HEIGHT="%d">',
-				hrefquote($ipath), htmlquote($itxt), $iwidth, $iheight)
+				htmlquote($ipath), htmlquote($itxt), $iwidth, $iheight)
     }
     else {
 	${"${k}icon"} = $itxt;
@@ -473,68 +471,10 @@ $module = $1;
 if ($module && &forbidden_module($module)) {
     &fatal("403 Forbidden", "Access to $where forbidden.");
 }
-
-#
-# Handle tarball downloads before any headers are output.
-#
-if ($input{tarball}) {
-    &fatal("403 Forbidden", "Downloading tarballs is prohibited.")
-      unless $allow_tar;
-    $where =~ s,/[^/]*$,,;
-    $where =~ s,^/,,;
-    my($basedir) = ($where =~ m,([^/]+)$,);
-
-    if ($basedir eq '' || $where eq '') {
-	&fatal("500 Internal Error", "You cannot download the top level directory.");
-    }
-
-    my $tmpdir = "/tmp/.cvsweb.$$." . int(time);
-
-    mkdir($tmpdir, 0700)
-      or &fatal("500 Internal Error", "Unable to make temporary directory: $!");
-
-    my $fatal = '';
-
-    do {
-	chdir $tmpdir
-	  or $fatal = "500 Internal Error", "Unable to cd to temporary directory: $!"
-	    && last;
-
-	my @params = (exists $input{only_with_tag} && length $input{only_with_tag})
-	  ? ("-r", $input{only_with_tag}) : ();
-
-	system "cvs", "-RlQd", $cvsroot, "co", @params, $where
-	  and $fatal = "500 Internal Error","cvs co failure: $!: $where"
-	    && last;
-
-	chdir "$where/.."
-	  or $fatal = "500 Internal Error","Cannot find expected directory in checkout"
-	    && last;
-
-	$| = 1; # Essential to get the buffering right.
-
-	print "Content-type: application/x-gzip\r\n\r\n";
-
-	system "tar", "--ignore-failed-read", "--exclude", "CVS", "-zcf", "-", $basedir
-	  and $fatal = "500 Internal Error","tar zc failure: $!: $basedir"
-	    && last;
-
-	chdir $tmpdir
-	  or $fatal = "500 Internal Error","Unable to cd to temporary directory: $!"
-	    && last;
-    } while (0);
-
-    system "rm", "-rf", $tmpdir if -d $tmpdir;
-
-    &fatal($fatal) if $fatal;
-
-    exit;
-}
-
 ##############################
 # View a directory
 ###############################
-if (-d $fullname) {
+elsif (-d $fullname) {
 	my $dh = do {local(*DH);};
 	opendir($dh, $fullname) || &fatal("404 Not Found","$where: $!");
 	my @dir = readdir($dh);
@@ -872,22 +812,6 @@ if (-d $fullname) {
 	    print "<INPUT TYPE=SUBMIT VALUE=\"Go\">\n";
 	    print "</FORM>\n";
 	}
-
-	if ($allow_tar) {
-	    my($basefile) = ($where =~ m,(?:.*/)?([^/]+),);
-
-	    if ($basefile ne '') {
-		print "<HR NOSHADE>\n",
-		  "<DIV align=center>",
-		    &link("Download this directory in tarball",
-			  # Mangle the filename so browsers show a reasonable
-			  # filename to download.
-			  "$basefile.tar.gz$query".
-			  ($query ? "&" : "?")."tarball=1"),
-			    "</DIV>";
-	    }
-	}
-
 	my $formwhere = $scriptwhere;
 	$formwhere =~ s|Attic/?$|| if ($input{'hideattic'});
 
@@ -985,13 +909,13 @@ if (-d $fullname) {
 	my $fh = do {local(*FH);};
 	my ($xtra, $module);
 	# Assume it's a module name with a potential path following it.
-	$xtra = (($module = $where) =~ s|/.*||) ? $& : '';
+	$xtra = $& if (($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);
 		}
 	    }
 	}
@@ -1077,13 +1001,12 @@ sub findLastModifiedSubdirs(@) {
 sub htmlify_sub(&$) {
     (my $proc, local $_) = @_;
     local @_ = split(m`(<a [^>]+>[^<]*</a>)`i);
-    my $linked;
-    my $result = '';
+    my ($linked, $result);
 
     while (($_, $linked) = splice(@_, 0, 2)) {
 	&$proc();
-	$result .= $_ if defined($_);
-	$result .= $linked if defined($linked);
+	$result .= $_;
+	$result .= $linked;
     }
 
     $result;
@@ -1128,7 +1051,7 @@ sub htmlify($;$) {
 		       \#?)
 		      (\d+)\b
 		     }{
-			 $1 . &link($2, sprintf($prcgi, $2))
+			 $1 . &link($2, sprintf($prcgi, $2)) . $3
 		     }egix;
 		} $_;
 	    } while ($_ ne $prev);
@@ -1137,7 +1060,7 @@ sub htmlify($;$) {
 		s{
 		  (\b$prcategories/(\d+)\b)
 		 }{
-		     &link($1, sprintf($prcgi, $2))
+		     &link($1, sprintf($prcgi, $2)) . $3
 		 }egox;
 	    } $_;
 	}
@@ -1154,7 +1077,7 @@ sub htmlify($;$) {
 		   )
 		  )
 		 }{
-		     &link($1, sprintf($mancgi, $3 ne '' ? $3 : $4, $2))
+		     &link($1, sprintf($mancgi, $3 ne '' ? $3 : $4, $2)) . $5
 		 }egx;
 	    } $_;
 	}
@@ -1196,7 +1119,7 @@ sub spacedHtmlText($;$) {
 sub link($$) {
 	my($name, $where) = @_;
 
-	sprintf '<A HREF="%s">%s</A>', hrefquote($where), $name;
+	sprintf '<A HREF="%s">%s</A>', htmlquote($where), $name;
 }
 
 sub revcmp($$) {
@@ -1565,11 +1488,6 @@ sub doCheckout($$) {
       open(STDERR, ">&STDOUT"); # Redirect stderr to stdout
       exec("cvs", "-Rld", $cvsroot, "co", "-p", $revopt, $where);
     }
-
-    if (eof($fh)) {
-	&fatal("404 Not Found",
-	       "$where is not (any longer) pertinent");
-    }
 #===================================================================
 #Checking out squid/src/ftp.c
 #RCS:  /usr/src/CVS/squid/src/ftp.c,v
@@ -1589,7 +1507,12 @@ sub doCheckout($$) {
     }
     if ($filename ne $where) {
 	&fatal("500 Internal Error",
-	       "Unexpected output from cvs co: $cvsheader");
+	       "Unexpected output from cvs co: $cvsheader"
+	       . "<p><b>Check whether the directory $cvsroot/CVSROOT exists "
+	       . "and the script has write-access to the CVSROOT/history "
+	       . "file if it exists."
+	       . "<br>The script needs to place lock files in the "
+	       . "directory the file is in as well.</b>");
     }
     $| = 1;
 
@@ -1640,10 +1563,10 @@ sub cvswebMarkup($$$) {
     my $url = download_url($fileurl, $revision, $mimetype);
     print "<HR noshade>";
     if ($mimetype =~ /^image/) {
-	printf '<IMG SRC="%s"><BR>', hrefquote("$url$barequery");
+	printf '<IMG SRC="%s"><BR>', htmlquote("$url$barequery");
     }
     elsif ($mimetype =~ m%^application/pdf%) {
-	printf '<EMBED SRC="%s" WIDTH="100%"><BR>', hrefquote("$url$barequery");
+	printf '<EMBED SRC="%s" WIDTH="100%"><BR>', htmlquote("$url$barequery");
     }
     else {
 	print "<PRE>";
@@ -1856,58 +1779,55 @@ sub getDirLogs($$@) {
 again:
 	if ($state eq "head") {
 	    #$rcsfile = $1 if (/^RCS file: (.+)$/); #not used (yet)
-
-	    if (/^Working file: (.+)$/) {
-		$filename = $1;
-	    } elsif (/^head: (.+)$/) {
-		$head = $1;
-	    } elsif (/^branch: (.+)$/) {
-		$branch = $1 
-	    } elsif (/^symbolic names:/) {
-		$state = "tags";
-		($branch = $head) =~ s/\.\d+$// if (!defined($branch));
-		$branch =~ s/(\d+)$/0.$1/;
-		$symrev{MAIN} = $branch;
-		$symrev{HEAD} = $branch;
-		$alltags{MAIN} = 1;
-		$alltags{HEAD} = 1;
-		push (@filetags, "MAIN", "HEAD");
-	    } elsif (/$LOG_REVSEPARATOR/o) {
-		$state = "log";
-		$rev = undef;
-		$date = undef;
-		$log = "";
-		# Try to reconstruct the relative filename if RCS spits out a full path
-		$filename =~ s%^\Q$DirName\E/%%;
-	    }
+	    $filename = $1 if (/^Working file: (.+)$/);
+	    $head = $1 if (/^head: (.+)$/);
+	    $branch = $1 if (/^branch: (.+)$/);
+	}
+	if ($state eq "head" && /^symbolic names/) {
+	    $state = "tags";
+	    ($branch = $head) =~ s/\.\d+$// if (!defined($branch));
+	    $branch =~ s/(\.?)(\d+)$/${1}0.$2/;
+	    $symrev{MAIN} = $branch;
+	    $symrev{HEAD} = $branch;
+	    $alltags{MAIN} = 1;
+	    $alltags{HEAD} = 1;
+	    push (@filetags, "MAIN", "HEAD");
 	    next;
 	}
-	if ($state eq "tags") {
-	    if (/^\s+(.+):\s+([\d\.]+)\s+$/) {
-		push (@filetags, $1);
-		$symrev{$1} = $2;
-		$alltags{$1} = 1;
+	if ($state eq "tags" &&
+			    /^\s+(.+):\s+([\d\.]+)\s+$/) {
+	    push (@filetags, $1);
+	    $symrev{$1} = $2;
+	    $alltags{$1} = 1;
+	    next;
+	}
+	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\.//;
+		($branchpoint = $branch) =~ s/\.?\d+$//;
+		$revwanted = undef if ($revwanted ne $branch);
+	    }
+	    elsif (defined($tag) && $tag ne "HEAD") {
+		print "Tag not found, skip this file" if ($verbose);
+		$state = "skip";
 		next;
-	    } elsif (/^\S/) {
-		if (defined($tag)) {
-		    if(defined($symrev{$tag}) || $tag eq "HEAD") {
-			$revwanted = $symrev{$tag eq "HEAD" ? "MAIN" : $tag};
-			($branch = $revwanted) =~ s/\b0\.//;
-			($branchpoint = $branch) =~ s/\.?\d+$//;
-			$revwanted = undef if ($revwanted ne $branch);
-		    } elsif ($tag ne "HEAD") {
-			print "Tag not found, skip this file" if ($verbose);
-			$state = "skip";
-			next;
-		    }
-		}
-		foreach my $tagfound (@filetags) {
-		    $tags{$tagfound} = 1;
-		}
-		$state = "head";
-		goto again;
 	    }
+	    foreach my $tagfound (@filetags) {
+		$tags{$tagfound} = 1;
+	    }
+	    $state = "head";
+	    goto again;
 	}
+	if ($state eq "head" && /$LOG_REVSEPARATOR/o) {
+	    $state = "log";
+	    $rev = undef;
+	    $date = undef;
+	    $log = "";
+	    # Try to reconstruct the relative filename if RCS spits out a full path
+	    $filename =~ s%^\Q$DirName\E/%%;
+	    next;
+	}
 	if ($state eq "log") {
 	    if (/$LOG_REVSEPARATOR/o || /$LOG_FILESEPARATOR/o) {
 		# End of a log entry.
@@ -2090,11 +2010,12 @@ 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+)$/0.$1/;
+	($symrev{"MAIN"} = $headrev) =~ s/(\.?)(\d+)$/${1}0.$2/;
+	revision:
 	foreach $rev (@revorder) {
 	    if ($rev =~ /^(\S*)\.\d+$/ && $headrev eq $1) {
 		$symrev{"HEAD"} = $rev;
-		last;
+		last revision;
 	    }
 	}
 	($symrev{"HEAD"} = $headrev) =~ s/\.\d+$//
@@ -2125,7 +2046,6 @@ 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)
 		#
@@ -2133,13 +2053,14 @@ sub readLog($;$) {
 		$branch = $3;
 		$branchrev = $head . ($head ne "" ? "." : "") . $branch;
 		my $regex;
-		$regex = quotemeta $branchrev;
+		($regex = $branchrev) =~ s/\./\\./g;
 		$rev = $head;
 
+		revision:
 		foreach my $r (@revorder) {
 		    if ($r =~ /^${regex}\b/) {
 			$rev = $branchrev;
-			last;
+			last revision;
 		    }
 		}
 		next if ($rev eq "");
@@ -2714,10 +2635,9 @@ sub navigateHeader($$$$$) {
     my ($swhere,$path,$filename,$rev,$title) = @_;
     $swhere = "" if ($swhere eq $scriptwhere);
     $swhere = urlencode($filename) if ($swhere eq "");
-    print qq`<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">`;
+    print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">";
     print "<HTML>\n<HEAD>\n";
-    print qq`<META name="robots" content="nofollow">\n`;
-    print '<!-- CVSweb $zRevision: 1.104 $  $kRevision: 1.47 $ -->';
+    print '<!-- CVSweb $zRevision: 1.103 $  $Revision: 3.37 $ -->';
     print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n";
     print  "$body_tag_for_src\n";
     print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">";
@@ -2940,7 +2860,7 @@ sub download_link($$$;$) {
     my ($url, $revision, $textlink, $mimetype) = @_;
     my ($fullurl) = download_url($url, $revision, $mimetype);
 
-    printf '<A HREF="%s"', hrefquote("$fullurl$barequery");
+    printf '<A HREF="%s"', htmlquote("$fullurl$barequery");
 
     if ($open_extern_window && (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) {
 	print ' target="cvs_checkout"';
@@ -2974,7 +2894,7 @@ sub download_link($$$;$) {
 	      if (defined($extern_window_height));
 
 	    printf q` onClick="window.open('%s','cvs_checkout','%s');"`,
-	      hrefquote($fullurl), join(',', @attr);
+	      htmlquote($fullurl), join(',', @attr);
 	}
     }
     print "><b>$textlink</b></A>";
@@ -3014,7 +2934,8 @@ sub urlencode($) {
 
     s/[\000-+{-\377]/sprintf("%%%02x", ord($&))/ge;
 
-    $_;
+
+       $_;
 }
 
 sub htmlquote($) {
@@ -3041,14 +2962,6 @@ sub htmlunquote($) {
     $_;
 }
 
-sub hrefquote($) {
-    local($_) = @_;
-
-    y/ /+/;
-
-    htmlquote($_)
-}
-
 sub http_header(;$) {
     my $content_type = shift || "text/html";
     if (defined($moddate)) {
@@ -3083,7 +2996,7 @@ sub http_header(;$) {
 	    }
 	    select(GZIP);
 	    $gzip_open = 1;
-#	    print "<!-- gzipped -->" if ($content_type =~ m|^text/html\b|);
+#	    print "<!-- gzipped -->" if ($content_type eq "text/html");
 	}
 	else {
 	    if ($is_mod_perl) {
@@ -3107,14 +3020,12 @@ sub http_header(;$) {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.104 $  $kRevision: 1.47 $'; #'
-    http_header(defined($charset) ? "text/html; charset=$charset" : "text/html");
+    my $version = '$zRevision: 1.103 $  $Revision: 3.37 $'; #'
+    http_header();
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"
  "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html>
-<head>
-<meta name="robots" content="nofollow">
 <title>$title</title>
 <!-- CVSweb $version -->
 </head>