===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.1.1.9
retrieving revision 3.24
diff -u -p -r1.1.1.9 -r3.24
--- cvsweb/cvsweb.cgi	2000/09/30 20:17:23	1.1.1.9
+++ cvsweb/cvsweb.cgi	2000/09/19 20:07:16	3.24
@@ -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.30 2000/09/30 20:10:01 knu Exp $
+# $zId: cvsweb.cgi,v 1.101 2000/09/13 22:44:05 jumager Exp $
+# $Id: cvsweb.cgi,v 3.24 2000/09/19 20:07:16 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
@@ -125,13 +124,14 @@ sub forbidden_module($);
 use Cwd;
 
 # == EDIT this ==
-# Locations to search for user configuration, in order:
-for (
-     $ENV{CVSWEB_CONFIG},
+# User configuration is stored in
+$config = undef;
+
+for ($ENV{CVSWEB_CONFIG},
+#     '/home/knu/etc/cvsweb.conf',
      '/usr/local/etc/cvsweb.conf',
-     getcwd() . '/cvsweb.conf'
-    ) {
-    $config = $_ if defined($_) && -r $_;
+     getcwd . '/cvsweb.conf') {
+  $config = $_ if defined($_) && -r $_;
 }
 
 # == Configuration defaults ==
@@ -145,9 +145,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 =
@@ -157,7 +156,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 #####
 
@@ -210,8 +209,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));
@@ -223,11 +221,9 @@ $maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING})
 @stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag);
 
 if (-f $config) {
-   do $config
-     || &fatal("500 Internal Error",
-	       sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>',
-		       $config, &htmlify($@)));
-} else {
+    do $config;
+}
+else {
    &fatal("500 Internal Error",
 	  'Configuration not found.  Set the variable <code>$config</code> '
           . 'in cvsweb.cgi, or the environment variable '
@@ -356,15 +352,8 @@ foreach my $k (keys %ICONS) {
     }
 }
 
-my $config_cvstree = "$config-$cvstree";
-
 # Do some special configuration for cvstrees
-if (-f $config_cvstree) {
-   do $config_cvstree
-     || &fatal("500 Internal Error",
-	       sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>',
-		       $config_cvstree, &htmlify($@)));
-}
+do "$config-$cvstree" if (-f "$config-$cvstree");
 
 $prcategories = '(?:' . join('|', @prcategories) . ')';
 $prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/;
@@ -793,18 +782,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);
@@ -827,7 +816,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| &&
@@ -862,7 +851,7 @@ elsif (-d $fullname) {
 	&fatal("404 Not Found","$where: no such file or directory");
     }
 
-gzipclose();
+close(GZIP) if ($gzip_open);
 ## End MAIN
 
 sub printDiffSelect($) {
@@ -1141,6 +1130,11 @@ sub doAnnotate($$) {
     ($pathname = $where) =~ s/(Attic\/)?[^\/]*$//;
     ($filename = $where) =~ s/^.*\///;
 
+    http_header();
+
+    navigateHeader($scriptwhere,$pathname,$filename,$rev, "annotate");
+    print "<h3 align=center>Annotation of $pathname$filename, Revision $rev</h3>\n";
+
     # this seems to be necessary
     $| = 1; $| = 0; # Flush
 
@@ -1150,7 +1144,7 @@ sub doAnnotate($$) {
     # the public domain.
     # we could abandon the use of rlog, rcsdiff and co using
     # the cvsserver in a similiar way one day (..after rewrite)
-    $pid = open2($reader, $writer, "cvs -Rl server") || fatal ("500 Internal Error",
+    $pid = open2($reader, $writer, "cvs server") || fatal ("500 Internal Error",
 							       "Fatal Error - unable to open cvs for annotation");
 
     # OK, first send the request to the server.  A simplified example is:
@@ -1202,11 +1196,6 @@ sub doAnnotate($$) {
     # were nicer about buffering, then we could just leave it open, I think.
     close ($writer) || die "cannot close: $!";
 
-    http_header();
-
-    navigateHeader($scriptwhere,$pathname,$filename,$rev, "annotate");
-    print "<h3 align=center>Annotation of $pathname$filename, Revision $rev</h3>\n";
-
     # Ready to get the responses from the server.
     # For example:
     #     E Annotations for foo/xx
@@ -1239,41 +1228,33 @@ sub doAnnotate($$) {
 	}
 	elsif ($words[0] eq "M") {
 	    $lineNr++;
-	    (my $lrev = substr($_, 2, 13)) =~ y/ //d;
-	    (my $lusr = substr($_, 16,  9)) =~ y/ //d;
-	    my $line = substr($_, 36);
-	    my $isCurrentRev = ($rev eq $lrev);
+	    my $lrev = substr ($_, 2, 13);
+	    my $lusr = substr ($_, 16,  9);
+	    my $line = substr ($_, 36);
 	    # we should parse the date here ..
 	    if ($lrev eq $oldLrev) {
-		$revprint = sprintf('%-8s', '');
+		$revprint = "             ";
 	    }
 	    else {
-		$revprint = sprintf('%-8s', $lrev);
-		$revprint =~ s`\S+`<a href="${scriptwhere}${barequery}#rev$1">$&</A>`;	# `		
-		$oldLusr = '';
+		$revprint = $lrev; $oldLusr = "";
+		$revprint =~ s`^(\S+)`<a href="${scriptwhere}${barequery}#rev$1">$1</A>`;	# `		
 	    }
 	    if ($lusr eq $oldLusr) {
-		$usrprint = '';
+		$usrprint = "         ";
 	    }
 	    else {
 		$usrprint = $lusr;
 	    }
 	    $oldLrev = $lrev;
 	    $oldLusr = $lusr;
+	    # is there a less timeconsuming way to strip spaces ?
+	    ($lrev = $lrev) =~ s/\s+//g;
+	    my $isCurrentRev = ($rev eq $lrev);
 
-	    # Set bold for text-based browsers only - graphical
-	    # browsers show bold fonts a bit wider than regular fonts,
-	    # so it looks irregular.
-	    print "<b>" if ($isCurrentRev && $is_textbased);
-
-	    printf ("%s%s %-8s %4d:",
-		    $revprint,
-		    $isCurrentRev ? '!' : ' ',
-		    $usrprint,
-		    $lineNr);
+	    print "<b>" if ($isCurrentRev);
+	    printf ("%8s%s%8s %4d:", $revprint, ($isCurrentRev ? "|" : " "), $usrprint, $lineNr);
 	    print spacedHtmlText($line, $d{'tabstop'});
-
-	    print "</b>" if ($isCurrentRev && $is_textbased);
+	    print "</b>" if ($isCurrentRev);
 	}
 	elsif ($words[0] eq "ok") {
 	    # We could complain about any text received after this, like the
@@ -1541,7 +1522,7 @@ sub doDiff($$$$$$) {
 	if ($human_readable) {
 	    http_header();
 	    &human_readable_diff($fh, $rev2);
-	    gzipclose();
+	    close(GZIP) if ($gzip_open);
 	    exit;
 	}
 	else {
@@ -2486,9 +2467,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 $  $lRevision: 1.30 $ -->';
+    print '<!-- CVSweb $zRevision: 1.101 $  $Revision: 3.24 $ -->';
     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";
@@ -2841,7 +2822,7 @@ sub http_header(;$) {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.103 $  $kRevision: 1.30 $'; #'
+    my $version = '$zRevision: 1.101 $  $Revision: 3.24 $'; #'
     http_header();
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"
@@ -2886,17 +2867,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