=================================================================== RCS file: /cvs/cvsweb/cvsweb.cgi,v retrieving revision 1.1.1.7 retrieving revision 3.21 diff -u -p -r1.1.1.7 -r3.21 --- cvsweb/cvsweb.cgi 2000/09/23 20:23:34 1.1.1.7 +++ cvsweb/cvsweb.cgi 2000/09/11 17:11:03 3.21 @@ -9,7 +9,6 @@ # Ken Coar # Dick Balaska # Akinori MUSHA -# Jens-Uwe Mager # # Based on: # * Bill Fenners cvsweb.cgi revision 1.28 available from: @@ -42,8 +41,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.94 2000/08/24 06:41:22 hnordstrom Exp $ +# $Id: cvsweb.cgi,v 3.21 2000/09/11 17:11:03 knu Exp $ # ### @@ -64,9 +63,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 @@ -78,7 +76,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 + $use_moddate ); sub printDiffSelect($); @@ -91,8 +89,6 @@ sub fatal($$); sub redirect($); sub safeglob($); sub getMimeTypeFromSuffix($); -sub head($;$); -sub scan_directives(@); sub doAnnotate($$); sub doCheckout($$); sub cvswebMarkup($$$); @@ -146,9 +142,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,20 +153,13 @@ $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 ##### use Time::Local; use IPC::Open2; -# Check if the zlib C library interface is installed, and if yes -# we can avoid using the extra gzip process. -eval { - require Compress::Zlib; -}; -$has_zlib = !$@; - $verbose = $v; $checkoutMagic = "~checkout~"; $pathinfo = defined($ENV{PATH_INFO}) ? $ENV{PATH_INFO} : ''; @@ -209,13 +197,13 @@ $nofilelinks = $is_textbased; # braindamaged MS-Internet Exploders claim that they # accept gzip .. but don't in fact and # 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`) +# Turn off gzip if running under mod_perl. piping does +# not work as expected inside the server. One can probably +# achieve the same result using Apache::GZIPFilter. +$maycompress = (($ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip` || $is_mozilla3) && !$is_msie - && !($is_mod_perl && !$has_zlib)); + && !$is_mod_perl); # put here the variables we need in order # to hold our state - they will be added (with @@ -371,7 +359,7 @@ $defaultViewable = $allow_markup && viewable($mimetype # ge get an Internal Server Error if we try to pipe the # output through the nonexistent gzip .. # any more elegant ways to prevent this are welcome! -if ($allow_compress && $maycompress && !$has_zlib) { +if ($allow_compress && $maycompress) { foreach (split(/:/, $ENV{PATH})) { if (-x "$_/gzip") { $GZIPBIN = "$_/gzip"; @@ -722,8 +710,7 @@ elsif (-d $fullname) { foreach my $var (@stickyvars) { print "\n" if (defined($input{$var}) - && (!defined($DEFAULTVALUE{$var}) - || $input{$var} ne $DEFAULTVALUE{$var}) + && $input{$var} ne $DEFAULTVALUE{$var} && $input{$var} ne "" && $var ne "only_with_tag"); } @@ -785,18 +772,15 @@ elsif (-d $fullname) { elsif (-f $fullname . ',v') { if (defined($input{'rev'}) || $doCheckout) { &doCheckout($fullname, $input{'rev'}); - gzipclose(); exit; } if (defined($input{'annotate'}) && $allow_annotate) { &doAnnotate($input{'annotate'}); - gzipclose(); exit; } if (defined($input{'r1'}) && defined($input{'r2'})) { &doDiff($fullname, $input{'r1'}, $input{'tr1'}, $input{'r2'}, $input{'tr2'}, $input{'f'}); - gzipclose(); exit; } print("going to dolog($fullname)\n") if ($verbose); @@ -819,7 +803,6 @@ elsif (-d $fullname) { # e.g. foo.c &doDiff($fullname, $input{'r1'}, $input{'tr1'}, $input{'r2'}, $input{'tr2'}, $input{'f'}); - gzipclose(); exit; } elsif (($newname = $fullname) =~ s|/([^/]+)$|/Attic/$1| && @@ -853,8 +836,6 @@ elsif (-d $fullname) { } &fatal("404 Not Found","$where: no such file or directory"); } - -gzipclose(); ## End MAIN sub printDiffSelect($) { @@ -942,7 +923,7 @@ sub spacedHtmlText($;$) { # Cut trailing spaces and tabs s/[ \t]+$//; - if (defined($ts)) { + if (defined($tabstop)) { # Expand tabs 1 while s/\t+/' ' x (length($&) * $ts - length($`) % $ts)/e } @@ -1080,40 +1061,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 +1161,7 @@ sub doAnnotate($$) { else { print "
";
     }
-
-    # 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 +1195,7 @@ sub doAnnotate($$) {
 
 	    print "" if ($isCurrentRev);
 	    printf ("%8s%s%8s %4d:", $revprint, ($isCurrentRev ? "|" : " "), $usrprint, $lineNr);
-	    print spacedHtmlText($line, $d{'tabstop'});
+	    print spacedHtmlText($line);
 	    print "" if ($isCurrentRev);
 	}
 	elsif ($words[0] eq "ok") {
@@ -1399,26 +1338,16 @@ sub cvswebMarkup($$$) {
 	    $input{only_with_tag};
     }
     print "";
+    my @content = <$filehandle>;
     my $url = download_url($fileurl, $revision, $mimetype);
     print "
";
     if ($mimetype =~ /^image/) {
 	print "
";
     }
-    elsif ($mimetype =~ m%^application/pdf%) {
-	print "
";
-    }
     else {
 	print "
";
-
-	# 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 "
";
     }
@@ -1427,7 +1356,7 @@ sub cvswebMarkup($$$) {
 sub viewable($) {
     my ($mimetype) = @_;
 
-    $mimetype =~ m%^((text|image)/|application/pdf)% ;
+    $mimetype =~ m%^(text|image)/%;
 }
 
 ###############################
@@ -1525,7 +1454,6 @@ sub doDiff($$$$$$) {
 	if ($human_readable) {
 	    http_header();
 	    &human_readable_diff($fh, $rev2);
-	    gzipclose();
 	    exit;
 	}
 	else {
@@ -2195,9 +2123,7 @@ EOF
         foreach (@stickyvars) {
 	    print "\n"
 		if (defined($input{$_})
-		    && ((!defined($DEFAULTVALUE{$_})
-		         || $input{$_} ne $DEFAULTVALUE{$_})
-		        && $input{$_} ne ""));
+		    && ($input{$_} ne $DEFAULTVALUE{$_} && $input{$_} ne ""));
 	}
 	print "\n";
 	print "
Diffs between \n";
@@ -2251,9 +2177,7 @@ EOF
 	    next if ($_ eq "only_with_tag");
 	    next if ($_ eq "logsort");
 	    print "\n"
-		if (defined($input{$_})
-		    && (!defined($DEFAULTVALUE{$_})
-		        || $input{$_} ne $DEFAULTVALUE{$_})
+		if (defined($input{$_}) && $input{$_} ne $DEFAULTVALUE{$_}
 		    && $input{$_} ne "");
 	}
 	print "
";
@@ -2308,7 +2232,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 +2286,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  "
";
@@ -2386,7 +2304,7 @@ sub human_readable_diff($){
       }
       else {
 	  ($diffcode,$rest) = $difftxt =~ /^([-+ ])(.*)/;
-	  $_ = spacedHtmlText($rest, $d{'tabstop'});
+	  $_ = spacedHtmlText ($rest);
 
 	  # Add fontface, size
 	  $_ = "$fs $_$fe";
@@ -2470,9 +2388,9 @@ 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  "\n";
     print "";
     print "
";
     print  "$backicon";
@@ -2771,7 +2689,7 @@ sub http_header(;$) {
     my $content_type = shift || "text/html";
     if (defined($moddate)) {
 	if ($is_mod_perl) {
-	    Apache->request->header_out("Last-Modified" => scalar gmtime($moddate) . " GMT");
+	    Apache->request->header_out(Last_modified => scalar gmtime($moddate) . " GMT");
 	}
 	else {
 	    print "Last-Modified: " . scalar gmtime($moddate) . " GMT\r\n";
@@ -2784,7 +2702,8 @@ sub http_header(;$) {
 	    print "Content-type: $content_type\r\n";
     }
     if ($allow_compress && $maycompress) {
-	if ($has_zlib || (defined($GZIPBIN) && open(GZIP, "|$GZIPBIN -1 -c"))) {
+	my $fh = do {local(*FH);};
+	if (defined($GZIPBIN) && open($fh, "|$GZIPBIN -1 -c")) {
 	    if ($is_mod_perl) {
 		    Apache->request->content_encoding("x-gzip");
 		    Apache->request->header_out(Vary => "Accept-Encoding");
@@ -2796,11 +2715,7 @@ sub http_header(;$) {
 		    print "\r\n"; # Close headers
 	    }
 	    $| = 1; $| = 0; # Flush header output
-	    if ($has_zlib) {
-	    	tie *GZIP, __PACKAGE__, \*STDOUT;
-	    }
-	    select(GZIP);
-	    $gzip_open = 1;
+	    select ($fh);
 #	    print "" if ($content_type eq "text/html");
 	}
 	else {
@@ -2825,7 +2740,7 @@ sub http_header(;$) {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.103 $  $kRevision: 1.26 $'; #'
+    my $version = '$zRevision: 1.94 $  $Revision: 3.21 $'; #'
     http_header();
     print < Compress::Zlib::Z_BEST_COMPRESSION(),
-		-WindowBits => -Compress::Zlib::MAX_WBITS()) or return undef;
-	my ($o) = {
-		handle => $out,
-		dh => $d,
-		crc => 0,
-		len => 0,
-	};
-	my ($header) = pack("c10", MAGIC1, MAGIC2, Compress::Zlib::Z_DEFLATED(), 0,0,0,0,0,0, OSCODE);
-	print {$o->{handle}} $header;
-	return bless($o, $class);
-}
-
-sub PRINT {
-	my ($o) = shift;
-	my ($buf) = join(defined $, ? $, : "",@_);
-	my ($len) = length($buf);
-	my ($compressed, $status) = $o->{dh}->deflate($buf);
-	print {$o->{handle}} $compressed if defined($compressed);
-	$o->{crc} = Compress::Zlib::crc32($buf, $o->{crc});
-	$o->{len} += $len;
-	return $len;
-}
-
-sub PRINTF {
-	my ($o) = shift;
-	my ($fmt) = shift;
-	my ($buf) = sprintf($fmt, @_);
-	my ($len) = length($buf);
-	my ($compressed, $status) = $o->{dh}->deflate($buf);
-	print {$o->{handle}} $compressed if defined($compressed);
-	$o->{crc} = Compress::Zlib::crc32($buf, $o->{crc});
-	$o->{len} += $len;
-	return $len;
-}
-
-sub WRITE {
-	my ($o, $buf, $len, $off) = @_;
-	my ($compressed, $status) = $o->{dh}->deflate(substr($buf, 0, $len));
-	print {$o->{handle}} $compressed if defined($compressed);
-	$o->{crc} = Compress::Zlib::crc32(substr($buf, 0, $len), $o->{crc});
-	$o->{len} += $len;
-	return $len;
-}
-
-sub CLOSE {
-	my ($o) = @_;
-	return if !defined( $o->{dh});
-	my ($buf) = $o->{dh}->flush();
-	$buf .= pack("V V", $o->{crc}, $o->{len});
-	print {$o->{handle}} $buf;
-	undef $o->{dh};
-}
-
-sub DESTROY {
-	my ($o) = @_;
-	CLOSE($o);
 }