===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.1.1.7
retrieving revision 3.23
diff -u -p -r1.1.1.7 -r3.23
--- cvsweb/cvsweb.cgi	2000/09/23 20:23:34	1.1.1.7
+++ cvsweb/cvsweb.cgi	2000/09/19 19:57:58	3.23
@@ -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 $
-# $kId: cvsweb.cgi,v 1.26 2000/09/22 11:13:17 knu Exp $
+# $zId: cvsweb.cgi,v 1.101 2000/09/13 22:44:05 jumager Exp $
+# $Id: cvsweb.cgi,v 3.23 2000/09/19 19:57:58 knu Exp $
 #
 ###
 
@@ -64,9 +64,8 @@ use vars qw (
     $bylog $byfile $hr_default $logsort $cvstree $cvsroot
     $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
+    $cvstreedefault $body_tag $logo $defaulttitle $address
+    $backcolor $long_intro $short_instruction $shortLogLen
     $show_author $dirtable $tablepadding $columnHeaderColorDefault
     $columnHeaderColorSorted $hr_breakable $showfunc $hr_ignwhite
     $hr_ignkeysubst $diffcolorHeading $diffcolorEmpty $diffcolorRemove
@@ -91,8 +90,6 @@ sub fatal($$);
 sub redirect($);
 sub safeglob($);
 sub getMimeTypeFromSuffix($);
-sub head($;$);
-sub scan_directives(@);
 sub doAnnotate($$);
 sub doCheckout($$);
 sub cvswebMarkup($$$);
@@ -146,9 +143,8 @@ $allow_version_select = 1;
 # These are defined to allow checking with perl -cw
 %CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES =
 %tags = %alltags = @tabcolors = ();
-$cvstreedefault = $body_tag = $body_tag_for_src = 
-$logo = $defaulttitle = $address =
-$long_intro = $short_instruction = $shortLogLen =
+$cvstreedefault = $body_tag = $logo = $defaulttitle = $address =
+$backcolor = $long_intro = $short_instruction = $shortLogLen =
 $show_author = $dirtable = $tablepadding = $columnHeaderColorDefault =
 $columnHeaderColorSorted = $hr_breakable = $showfunc = $hr_ignwhite =
 $hr_ignkeysubst = $diffcolorHeading = $diffcolorEmpty = $diffcolorRemove =
@@ -158,7 +154,7 @@ $allow_markup = $use_java_script = $open_extern_window
 $extern_window_width = $extern_window_height = $edit_option_form =
 $checkout_magic = $show_subdir_lastmod = $show_log_in_markup = $v =
 $navigationHeaderColor = $tableBorderColor = $markupLogColor =
-$tabstop = $use_moddate = $moddate = $gzip_open = undef;
+$tabstop = $use_moddate = $moddate = undef;
 
 ##### End of configuration variables #####
 
@@ -211,8 +207,7 @@ $nofilelinks = $is_textbased;
 # display garbage then :-/
 # Turn off gzip if running under mod_perl and no zlib is available,
 # piping does not work as expected inside the server.
-$maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING})
-		 && $ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`)
+$maycompress = (($ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`
 		 || $is_mozilla3)
 		&& !$is_msie
 		&& !($is_mod_perl && !$has_zlib));
@@ -785,18 +780,18 @@ elsif (-d $fullname) {
     elsif (-f $fullname . ',v') {
 	if (defined($input{'rev'}) || $doCheckout) {
 	    &doCheckout($fullname, $input{'rev'});
-	    gzipclose();
+	    close(GZIP) if ($gzip_open);
 	    exit;
 	}
 	if (defined($input{'annotate'}) && $allow_annotate) {
 	    &doAnnotate($input{'annotate'});
-	    gzipclose();
+	    close(GZIP) if ($gzip_open);
 	    exit;
 	}
 	if (defined($input{'r1'}) && defined($input{'r2'})) {
 	    &doDiff($fullname, $input{'r1'}, $input{'tr1'},
 		    $input{'r2'}, $input{'tr2'}, $input{'f'});
-	    gzipclose();
+	    close(GZIP) if ($gzip_open);
 	    exit;
 	}
 	print("going to dolog($fullname)\n") if ($verbose);
@@ -819,7 +814,7 @@ elsif (-d $fullname) {
 	# e.g. foo.c
 	&doDiff($fullname, $input{'r1'}, $input{'tr1'},
 		$input{'r2'}, $input{'tr2'}, $input{'f'});
-	gzipclose();
+	close(GZIP) if ($gzip_open);
 	exit;
     }
     elsif (($newname = $fullname) =~ s|/([^/]+)$|/Attic/$1| &&
@@ -854,7 +849,7 @@ elsif (-d $fullname) {
 	&fatal("404 Not Found","$where: no such file or directory");
     }
 
-gzipclose();
+close(GZIP) if ($gzip_open);
 ## End MAIN
 
 sub printDiffSelect($) {
@@ -1080,40 +1075,6 @@ sub getMimeTypeFromSuffix($) {
 }
 
 ###############################
-# read first lines like head(1)
-###############################
-sub head($;$) {
-    my $fh = $_[0];
-    my $linecount = $_[1] || 10;
-
-    my @buf;
-
-    if ($linecount > 0) {
-	my $i;
-	for ($i = 0; !eof($fh) && $i < $linecount; $i++) {
-	    push @buf, scalar <$fh>;
-	}
-    } else {
-	@buf = <$fh>;
-    }
-
-    @buf;
-}
-
-###############################
-# scan vim and Emacs directives
-###############################
-sub scan_directives(@) {
-    my $ts = undef;
-
-    for (@_) {
-	$ts = $1 if /\b(?:ts|tabstop|tab-width)[:=]\s*([1-9]\d*)\b/;
-    }
-
-    ('tabstop' => $ts);
-}
-
-###############################
 # show Annotation
 ###############################
 sub doAnnotate($$) {
@@ -1214,15 +1175,7 @@ sub doAnnotate($$) {
     else {
 	print "<pre>";
     }
-
-    # prefetch several lines
-    my @buf = head($reader);
-
-    my %d = scan_directives(@buf);
-
-    while (@buf || !eof($reader)) {
-	$_ = @buf ? shift @buf : <$reader>;
-
+    while (<$reader>) {
 	my @words = split;
 	# Adding one is for the (single) space which follows $words[0].
 	my $rest = substr ($_, length ($words[0]) + 1);
@@ -1256,7 +1209,7 @@ sub doAnnotate($$) {
 
 	    print "<b>" if ($isCurrentRev);
 	    printf ("%8s%s%8s %4d:", $revprint, ($isCurrentRev ? "|" : " "), $usrprint, $lineNr);
-	    print spacedHtmlText($line, $d{'tabstop'});
+	    print spacedHtmlText($line);
 	    print "</b>" if ($isCurrentRev);
 	}
 	elsif ($words[0] eq "ok") {
@@ -1399,6 +1352,7 @@ sub cvswebMarkup($$$) {
 	    $input{only_with_tag};
     }
     print "</td></tr></table>";
+    my @content = <$filehandle>;
     my $url = download_url($fileurl, $revision, $mimetype);
     print "<HR noshade>";
     if ($mimetype =~ /^image/) {
@@ -1409,16 +1363,8 @@ sub cvswebMarkup($$$) {
     }
     else {
 	print "<PRE>";
-
-	# prefetch several lines
-	my @buf = head($filehandle);
-
-	my %d = scan_directives(@buf);
-
-	while (@buf || !eof($filehandle)) {
-	    $_ = @buf ? shift @buf : <$filehandle>;
-
-	    print spacedHtmlText($_, $d{'tabstop'});
+	foreach (@content) {
+	    print spacedHtmlText($_);
 	}
 	print "</PRE>";
     }
@@ -1525,7 +1471,7 @@ sub doDiff($$$$$$) {
 	if ($human_readable) {
 	    http_header();
 	    &human_readable_diff($fh, $rev2);
-	    gzipclose();
+	    close(GZIP) if ($gzip_open);
 	    exit;
 	}
 	else {
@@ -2308,7 +2254,7 @@ sub flush_diff_rows($$$$) {
 # human_readable_diff(String revision_to_return_to);
 ##
 sub human_readable_diff($){
-  my ($difftxt, $where_nd, $filename, $pathname, $scriptwhere_nd);
+  my ($i,$difftxt, $where_nd, $filename, $pathname, $scriptwhere_nd);
   my ($fh, $rev) = @_;
   my ($date1, $date2, $r1d, $r2d, $r1r, $r2r, $rev1, $rev2, $sym1, $sym2);
   my (@rightCol, @leftCol);
@@ -2362,15 +2308,9 @@ sub human_readable_diff($){
   # cascading style sheets because we've to set the
   # font and color for each row. anyone ...?
   ####
+  while (<$fh>) {
+      $difftxt = $_;
 
-  # prefetch several lines
-  my @buf = head($fh);
-
-  my %d = scan_directives(@buf);
-
-  while (@buf || !eof($fh)) {
-      $difftxt = @buf ? shift @buf : <$fh>;
-
       if ($difftxt =~ /^@@/) {
 	  ($oldline,$newline,$funname) = $difftxt =~ /@@ \-([0-9]+).*\+([0-9]+).*@@(.*)/;
           print  "<tr bgcolor=\"$diffcolorHeading\"><td width=\"50%\">";
@@ -2386,7 +2326,7 @@ sub human_readable_diff($){
       }
       else {
 	  ($diffcode,$rest) = $difftxt =~ /^([-+ ])(.*)/;
-	  $_ = spacedHtmlText($rest, $d{'tabstop'});
+	  $_ = spacedHtmlText ($rest);
 
 	  # Add fontface, size
 	  $_ = "$fs&nbsp;$_$fe";
@@ -2470,9 +2410,9 @@ sub navigateHeader($$$$$) {
     $swhere = urlencode($filename) if ($swhere eq "");
     print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">";
     print "<HTML>\n<HEAD>\n";
-    print '<!-- CVSweb $zRevision: 1.103 $  $kRevision: 1.26 $ -->';
+    print '<!-- CVSweb $zRevision: 1.101 $  $Revision: 3.23 $ -->';
     print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n";
-    print  "$body_tag_for_src\n";
+    print  "<BODY BGCOLOR=\"$backcolor\">\n";
     print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">";
     print "<tr valign=bottom><td>";
     print  "<a href=\"$swhere$query#rev$rev\">$backicon";
@@ -2825,7 +2765,7 @@ sub http_header(;$) {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.103 $  $kRevision: 1.26 $'; #'
+    my $version = '$zRevision: 1.101 $  $Revision: 3.23 $'; #'
     http_header();
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"
@@ -2870,17 +2810,6 @@ sub forbidden_module($) {
     }
 
     return 0;
-}
-
-# Close the GZIP handle remove the tie.
-
-sub gzipclose {
-	if ($gzip_open) {
-	    select(STDOUT);
-	    close(GZIP);
-	    untie *GZIP;
-	    $gzip_open = 0;
-	}
 }
 
 # implement a gzipped file handle via the Compress:Zlib compression