===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.1.1.12
retrieving revision 3.23
diff -u -p -r1.1.1.12 -r3.23
--- cvsweb/cvsweb.cgi	2000/11/04 19:19:48	1.1.1.12
+++ 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.104 2000/11/01 22:05:12 hnordstrom Exp $
-# $kId: cvsweb.cgi,v 1.39 2000/11/04 15:32: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 $
 #
 ###
 
@@ -52,7 +52,6 @@ use strict;
 use vars qw (
     $config $allow_version_select $verbose
     %CVSROOT %CVSROOTdescr %MIRRORS %DEFAULTVALUE %ICONS %MTYPES
-    @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS
     %alltags @tabcolors %fileinfo %tags @branchnames %nameprinted
     %symrev %revsym @allrevisions %date %author @revdisplayorder
     @revisions %state %difflines %log %branchpoint @revorder
@@ -60,14 +59,13 @@ use vars qw (
     $checkoutMagic $doCheckout $scriptname $scriptwhere
     $where $pathinfo $Browser $nofilelinks $maycompress @stickyvars
     %funcline_regexp $is_mod_perl
-    $is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased
+    $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased
     %input $query $barequery $sortby $bydate $byrev $byauthor
-    $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot
+    $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
@@ -75,19 +73,15 @@ use vars qw (
     $difffontsize $inputTextSize $mime_types $allow_annotate
     $allow_markup $use_java_script $open_extern_window
     $extern_window_width $extern_window_height $edit_option_form
-    $show_subdir_lastmod $show_log_in_markup $v
+    $checkout_magic $show_subdir_lastmod $show_log_in_markup $v
     $navigationHeaderColor $tableBorderColor $markupLogColor
     $tabstop $state $annTable $sel $curbranch @HideModules
     $module $use_descriptions %descriptions @mytz $dwhere $moddate
     $use_moddate $has_zlib $gzip_open
-    $LOG_FILESEPARATOR $LOG_REVSEPARATOR
 );
 
 sub printDiffSelect($);
-sub printDiffLinks($$);
-sub printLogSortSelect($);
 sub findLastModifiedSubdirs(@);
-sub htmlify_sub(&$);
 sub htmlify($;$);
 sub spacedHtmlText($;$);
 sub link($$);
@@ -96,8 +90,6 @@ sub fatal($$);
 sub redirect($);
 sub safeglob($);
 sub getMimeTypeFromSuffix($);
-sub head($;$);
-sub scan_directives(@);
 sub doAnnotate($$);
 sub doCheckout($$);
 sub cvswebMarkup($$$);
@@ -120,8 +112,6 @@ sub download_url($$;$);
 sub download_link($$$;$);
 sub toggleQuery($$);
 sub urlencode($);
-sub htmlquote($);
-sub htmlunquote($);
 sub http_header(;$);
 sub html_header($);
 sub html_footer();
@@ -132,13 +122,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 ==
@@ -152,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 =
@@ -162,56 +152,10 @@ $diffcolorChange = $diffcolorAdd = $diffcolorDarkChang
 $difffontsize = $inputTextSize = $mime_types = $allow_annotate =
 $allow_markup = $use_java_script = $open_extern_window =
 $extern_window_width = $extern_window_height = $edit_option_form =
-$show_subdir_lastmod = $show_log_in_markup = $v =
+$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;
 
-$LOG_FILESEPARATOR = q/^={77}$/;
-$LOG_REVSEPARATOR = q/^-{28}$/;
-
-@DIFFTYPES = qw(h H u c s);
-@DIFFTYPES{@DIFFTYPES} = (
-			  {
-			   'descr'   => 'colored',
-			   'opts'    => [ '-u' ],
-			   'colored' => 1,
-			  },
-			  {
-			   'descr'   => 'long colored',
-			   'opts'    => [ '--unified=15' ],
-			   'colored' => 1,
-			  },
-			  {
-			   'descr'   => 'unified',
-			   'opts'    => [ '-u' ],
-			   'colored' => 0,
-			  },
-			  {
-			   'descr'   => 'context',
-			   'opts'    => [ '-c' ],
-			   'colored' => 0,
-			  },
-			  {
-			   'descr'   => 'side by side',
-			   'opts'    => [ '--side-by-side', '--width=164' ],
-			   'colored' => 0,
-			  },
-			 );
-
-@LOGSORTKEYS = qw(cvs date rev);
-@LOGSORTKEYS{@LOGSORTKEYS} = (
-			      {
-			       'descr' => 'Not sorted',
-			      },
-			      {
-			       'descr' => 'Commit date',
-			      },
-			      {
-			       'descr' => 'Revision',
-			      },
-			     );
-
-
 ##### End of configuration variables #####
 
 use Time::Local;
@@ -245,13 +189,12 @@ $is_mod_perl = defined($ENV{MOD_PERL});
 # per file, so disable the link at the icon
 # in this case:
 $Browser = $ENV{HTTP_USER_AGENT};
-$is_links = ($Browser =~ m`^Links `);
 $is_lynx = ($Browser =~ m`^Lynx/`i);
 $is_w3m = ($Browser =~ m`^w3m/`i);
 $is_msie = ($Browser =~ m`MSIE`);
 $is_mozilla3 = ($Browser =~ m`^Mozilla/[3-9]`);
 
-$is_textbased = ($is_links || $is_lynx || $is_w3m);
+$is_textbased = ($is_lynx || $is_w3m);
 
 $nofilelinks = $is_textbased;
 
@@ -264,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));
@@ -277,11 +219,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 '
@@ -333,24 +273,25 @@ foreach (keys %DEFAULTVALUE)
 }
 
 $barequery = "";
-my @barequery;
 foreach (@stickyvars) {
     # construct a query string with the sticky non default parameters set
     if (defined($input{$_}) && $input{$_} ne '' &&
 	!(defined($DEFAULTVALUE{$_}) && $input{$_} eq $DEFAULTVALUE{$_})) {
-	push @barequery, join('=', urlencode($_), urlencode($input{$_}));
+        if ($barequery) {
+	    $barequery = $barequery . "&amp;";
+	}
+	my $thisval = urlencode($_) . "=" . urlencode($input{$_});
+	$barequery .= $thisval;
     }
 }
 # is there any query ?
-if (@barequery) {
-    $barequery = join('&', @barequery);
+if ($barequery) {
     $query = "?$barequery";
-    $barequery = "&$barequery";
+    $barequery = "&amp;" . $barequery;
 }
 else {
     $query = "";
 }
-undef @barequery;
 
 # get actual parameters
 $sortby = $input{"sortby"};
@@ -375,7 +316,7 @@ else {
     $byfile = 1;
 }
 
-$defaultDiffType = $input{'f'};
+$hr_default = $input{'f'} eq 'h';
 
 $logsort = $input{'logsort'};
 
@@ -398,30 +339,19 @@ if ($input{'cvsroot'} && $CVSROOT{$input{'cvsroot'}}) 
 $cvsroot = $CVSROOT{$cvstree};
 
 # create icons out of description
-my $k;
-foreach $k (keys %ICONS) {
+foreach my $k (keys %ICONS) {
     no strict 'refs';
     my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}};
     if ($ipath) {
-	${"${k}icon"} = sprintf('<IMG SRC="%s" ALT="%s" BORDER="0" WIDTH="%d" HEIGHT="%d">',
-				htmlquote($ipath), htmlquote($itxt), $iwidth, $iheight)
+	${"${k}icon"} = "<IMG SRC=\"$ipath\" ALT=\"$itxt\" BORDER=\"0\" WIDTH=\"$iwidth\" HEIGHT=\"$iheight\">";
     }
     else {
 	${"${k}icon"} = $itxt;
     }
 }
-undef $k;
 
-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($@)));
-}
-undef $config_cvstree;
+do "$config-$cvstree" if (-f "$config-$cvstree");
 
 $prcategories = '(?:' . join('|', @prcategories) . ')';
 $prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/;
@@ -530,63 +460,57 @@ elsif (-d $fullname) {
 	    }
 	    print "<table  width=\"100%\" border=0 cellspacing=1 cellpadding=$tablepadding>\n";
 	    $infocols++;
-	    printf '<tr><th align=left bgcolor="%s">',
-	      $byfile ? $columnHeaderColorSorted : $columnHeaderColorDefault;
-	    if ($byfile) {
-		print 'File';
-	    } else {
-		print &link('File', sprintf('./%s#dirlist',
-					    &toggleQuery("sortby", "file")));
-	    }
+	    print "<tr><th align=left bgcolor=\"" . (($byfile) ?
+						   $columnHeaderColorSorted :
+						   $columnHeaderColorDefault) . "\">";
+	    print "<a href=\"./" . &toggleQuery("sortby","file") .
+		"#dirlist\">" if (!$byfile);
+	    print "File";
+	    print "</a>" if (!$byfile);
 	    print "</th>";
 	    # do not display the other column-headers, if we do not have any files
 	    # with revision information:
 	    if (scalar(%fileinfo)) {
 		$infocols++;
-		printf '<th align=left bgcolor="%s">',
-		  $byrev ? $columnHeaderColorSorted : $columnHeaderColorDefault;
-		if ($byrev) {
-		    print 'Rev.';
-		} else {
-		    print &link('Rev.', sprintf('./%s#dirlist',
-						&toggleQuery("sortby", "rev")));
-		}
+		print "<th align=left bgcolor=\"" . (($byrev) ?
+						   $columnHeaderColorSorted :
+						   $columnHeaderColorDefault) . "\">";
+		print "<a href=\"./" . &toggleQuery ("sortby","rev") .
+		    "#dirlist\">" if (!$byrev);
+		print "Rev.";
+		print "</a>" if (!$byrev);
 		print "</th>";
 		$infocols++;
-		printf '<th align=left bgcolor="%s">',
-		  $bydate ? $columnHeaderColorSorted : $columnHeaderColorDefault;
-		if ($bydate) {
-		    print 'Age';
-		} else {
-		    print &link('Age', sprintf('./%s#dirlist',
-					       &toggleQuery("sortby", "date")));
-		}
+		print "<th align=left bgcolor=\"" . (($bydate) ?
+						   $columnHeaderColorSorted :
+						   $columnHeaderColorDefault) . "\">";
+		print "<a href=\"./" . &toggleQuery ("sortby","date") .
+		    "#dirlist\">" if (!$bydate);
+		print "Age";
+		print "</a>" if (!$bydate);
 		print "</th>";
 		if ($show_author) {
 		    $infocols++;
-		    printf '<th align=left bgcolor="%s">',
-		      $byauthor ? $columnHeaderColorSorted : $columnHeaderColorDefault;
-		    if ($byauthor) {
-			print 'Author';
-		    } else {
-			print &link('Author', sprintf('./%s#dirlist',
-						      &toggleQuery("sortby", "author")));
-		    }
+		    print "<th align=left bgcolor=\"" . (($byauthor) ?
+						   $columnHeaderColorSorted :
+						   $columnHeaderColorDefault) . "\">";
+		    print "<a href=\"./" . &toggleQuery ("sortby","author") .
+			    "#dirlist\">" if (!$byauthor);
+		    print "Author";
+		    print "</a>" if (!$byauthor);
 		    print "</th>";
 		}
 		$infocols++;
-		printf '<th align=left bgcolor="%s">',
-		  $bylog ? $columnHeaderColorSorted : $columnHeaderColorDefault;
-		if ($bylog) {
-		    print 'Last log entry';
-		} else {
-		    print &link('Last log entry', sprintf('./%s#dirlist',
-							  &toggleQuery("sortby", "log")));
-		}
+		print "<th align=left bgcolor=\"" . (($bylog) ?
+					       $columnHeaderColorSorted :
+					       $columnHeaderColorDefault) . "\">";
+		print "<a href=\"./", toggleQuery("sortby","log"), "#dirlist\">" if (!$bylog);
+		print "Last log entry";
+		print "</a>" if (!$bylog);
 		print "</th>";
 	    }
 	    elsif ($use_descriptions) {
-		printf '<th align=left bgcolor="%s">', $columnHeaderColorDefault;
+		print "<th align=left bgcolor=\"". $columnHeaderColorDefault . "\">";
 		print "Description";
 		$infocols++;
 	    }
@@ -611,9 +535,9 @@ elsif (-d $fullname) {
 	    closedir($dh);
 	}
 
-	my $hideAtticToggleLink = $input{'hideattic'} ? '' :
-	  &link('[Hide]', sprintf('./%s#dirlist',
-				  &toggleQuery ("hideattic")));
+	my $hideAtticToggleLink = "<a href=\"./" .
+	        &toggleQuery ("hideattic") .
+		"#dirlist\">[Hide]</a>" if (!$input{'hideattic'});
 
 	# Sort without the Attic/ pathname.
 	# place directories first
@@ -651,38 +575,38 @@ elsif (-d $fullname) {
 		next if ($_ eq '..' && $where eq '/');
 		my ($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}}
 		    if (defined($fileinfo{$_}));
-		printf '<tr bgcolor="%s"><td>', $tabcolors[$dirrow % 2] if $dirtable;
+		print "<tr bgcolor=\"" . @tabcolors[$dirrow%2] . "\"><td>" if ($dirtable);
 		if ($_ eq '..') {
-		    $url = "../$query";
+		    $url = "../" . $query;
 		    if ($nofilelinks) {
 			print $backicon;
 		    }
 		    else {
-			print &link($backicon, $url);
+			print &link($backicon,$url);
 		    }
-		    print " ", &link("Previous Directory", $url);
+		    print " ", &link("Previous Directory",$url);
 		}
 		else {
-		    $url = urlencode($_) . "/$query";
+		    $url = urlencode($_) . '/' . $query;
 		    print "<A NAME=\"$_\"></A>";
 		    if ($nofilelinks) {
 			print $diricon;
 		    }
 		    else {
-			print &link($diricon, $url);
+			print &link($diricon,$url);
 		    }
-		    print " ", &link("$_/", $url), $attic;
+		    print " ", &link($_ . "/", $url), $attic;
 		    if ($_ eq "Attic") {
-			print "&nbsp; ";
-			print &link("[Don't hide]", sprintf('./%s#dirlist',
-							    &toggleQuery ("hideattic")));
+			print "&nbsp; <a href=\"./" .
+			    &toggleQuery ("hideattic") .
+				"#dirlist\">[Don't hide]</a>";
 		    }
 		}
 		# Show last change in dir
 		if ($filename) {
 		    print "</td><td>&nbsp;</td><td>&nbsp;" if ($dirtable);
 		    if ($date) {
-			print " <i>", readableTime(time() - $date,0), "</i>";
+			print " <i>" . readableTime(time() - $date,0) . "</i>";
 		    }
 		    if ($show_author) {
 			print "</td><td>&nbsp;" if ($dirtable);
@@ -693,8 +617,8 @@ elsif (-d $fullname) {
 		    print "$filename/$rev";
 		    print "<BR>" if ($dirtable);
 		    if ($log) {
-			print "&nbsp;<font size=-1>",
-			  &htmlify(substr($log,0,$shortLogLen));
+			print "&nbsp;<font size=-1>"
+			    . &htmlify(substr($log,0,$shortLogLen));
 			if (length $log > 80) {
 			    print "...";
 			}
@@ -704,7 +628,7 @@ elsif (-d $fullname) {
 		else {
 		    my ($dwhere) = ($where ne "/" ? $where : "") . $_;
 		    if ($use_descriptions && defined $descriptions{$dwhere}) {
-			print "<TD COLSPAN=", ($infocols-1), ">&nbsp;" if $dirtable;
+			print "<TD COLSPAN=" . ($infocols-1) . ">&nbsp;" if $dirtable;
 			print $descriptions{$dwhere};
 		    } elsif ($dirtable && $infocols > 1) {
 			# close the row with the appropriate number of
@@ -735,7 +659,7 @@ elsif (-d $fullname) {
 		next if (!defined($fileinfo{$_}));
 		($rev,$date,$log,$author) = @{$fileinfo{$_}};
 		$filesfound++;
-		printf '<tr bgcolor="%s"><td>', $tabcolors[$dirrow % 2] if $dirtable;
+		print "<tr bgcolor=\"" . @tabcolors[$dirrow%2] . "\"><td>" if ($dirtable);
 		print "<A NAME=\"$_\"></A>";
 		if ($nofilelinks) {
 		    print $fileicon;
@@ -746,11 +670,11 @@ elsif (-d $fullname) {
 		print " ", &link($_, $url), $attic;
 		print "</td><td>&nbsp;" if ($dirtable);
 		download_link($fileurl,
-			      $rev, $rev,
-			      $defaultViewable ? "text/x-cvsweb-markup" : undef);
+			$rev, $rev,
+			$defaultViewable ? "text/x-cvsweb-markup" : undef);
 		print "</td><td>&nbsp;" if ($dirtable);
 		if ($date) {
-		    print " <i>", readableTime(time() - $date,0), "</i>";
+		    print " <i>" . readableTime(time() - $date,0) . "</i>";
 		}
 		if ($show_author) {
 		    print "</td><td>&nbsp;" if ($dirtable);
@@ -758,7 +682,7 @@ elsif (-d $fullname) {
 		}
 		print "</td><td>&nbsp;" if ($dirtable);
 		if ($log) {
-		    print " <font size=-1>", &htmlify(substr($log,0,$shortLogLen));
+		    print " <font size=-1>" . &htmlify(substr($log,0,$shortLogLen));
 		    if (length $log > 80) {
 			print "...";
 		    }
@@ -773,7 +697,7 @@ elsif (-d $fullname) {
 	if ($dirtable && defined($tableBorderColor)) {
 	    print "</td></tr></table>";
 	}
-	print( $dirtable == 1 ? "</table>\n" : "</menu>\n" );
+	print "". ($dirtable == 1) ? "</table>" : "</menu>" . "\n";
 
 	if ($filesexists && !$filesfound) {
 	    print "<P><B>NOTE:</B> There are $filesexists files, but none matches the current tag ($input{only_with_tag})\n";
@@ -831,9 +755,12 @@ elsif (-d $fullname) {
 	    print "<OPTION",$byrev ? " SELECTED" : ""," VALUE=rev>Revision";
 	    print "<OPTION",$bylog ? " SELECTED" : ""," VALUE=log>Log message";
 	    print "</SELECT></td>";
-	    print "<td>Sort log by: ";
-	    printLogSortSelect(0);
-	    print "</td></tr>";
+	    print "<td>revisions by: \n";
+	    print "<SELECT NAME=logsort>\n";
+	    print "<OPTION VALUE=cvs",$logsort eq "cvs" ? " SELECTED" : "", ">Not sorted";
+	    print "<OPTION VALUE=date",$logsort eq "date" ? " SELECTED" : "", ">Commit date";
+	    print "<OPTION VALUE=rev",$logsort eq "rev" ? " SELECTED" : "", ">Revision";
+	    print "</SELECT></td></tr>";
 	    print "<tr><td>Diff format: ";
 	    printDiffSelect(0);
 	    print "</td>";
@@ -853,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);
@@ -887,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| &&
@@ -922,48 +849,23 @@ elsif (-d $fullname) {
 	&fatal("404 Not Found","$where: no such file or directory");
     }
 
-gzipclose();
+close(GZIP) if ($gzip_open);
 ## End MAIN
 
 sub printDiffSelect($) {
     my ($use_java_script) = @_;
-    my $f = $input{'f'};
-
-    print '<SELECT NAME="f"';
-    print ' onchange="submit()"' if $use_java_script;
-    print '>';
-
-    local $_;
-    for (@DIFFTYPES) {
-	printf('<OPTION VALUE="%s"%s>%s',
-	       $_,
-	       $f eq $_ ? ' SELECTED' : '',
-	       "\u$DIFFTYPES{$_}{'descr'}"
-	      );
-    }
-
+    my ($f) = $input{'f'};
+    print "<SELECT NAME=\"f\"";
+    print " onchange=\"submit()\"" if ($use_java_script);
+    print ">\n";
+    print "<OPTION VALUE=h",$f eq "h" ? " SELECTED" : "", ">Colored Diff";
+    print "<OPTION VALUE=H",$f eq "H" ? " SELECTED" : "", ">Long Colored Diff";
+    print "<OPTION VALUE=u",$f eq "u" ? " SELECTED" : "", ">Unidiff";
+    print "<OPTION VALUE=c",$f eq "c" ? " SELECTED" : "", ">Context Diff";
+    print "<OPTION VALUE=s",$f eq "s" ? " SELECTED" : "", ">Side by Side";
     print "</SELECT>";
 }
 
-sub printLogSortSelect($) {
-    my ($use_java_script) = @_;
-
-    print '<SELECT NAME="logsort"';
-    print ' onchange="submit()"' if $use_java_script;
-    print '>';
-
-    local $_;
-    for (@LOGSORTKEYS) {
-	printf('<OPTION VALUE="%s"%s>%s',
-	       $_,
-	       $logsort eq $_ ? ' SELECTED' : '',
-	       "\u$LOGSORTKEYS{$_}{'descr'}"
-	      );
-    }
-
-    print "</SELECT>";
-}
-
 sub findLastModifiedSubdirs(@) {
     my (@dirs) = @_;
     my ($dirname, @files);
@@ -998,93 +900,34 @@ sub findLastModifiedSubdirs(@) {
     return @files;
 }
 
-sub htmlify_sub(&$) {
-    (my $proc, local $_) = @_;
-    local @_ = split(m`(<a [^>]+>[^<]*</a>)`i);
-    my $linked;
-    my $result = '';
-
-    while (($_, $linked) = splice(@_, 0, 2)) {
-	&$proc();
-	$result .= $_ if defined($_);
-	$result .= $linked if defined($linked);
-    }
-
-    $result;
-}
-
 sub htmlify($;$) {
-    (local $_, my $extra) = @_;
+	my($string, $extra) = @_;
 
-    $_ = htmlquote($_);
+	# Special Characters; RFC 1866
+	$string =~ s/&/&amp;/g;
+	$string =~ s/\"/&quot;/g;
+	$string =~ s/</&lt;/g;
+	$string =~ s/>/&gt;/g;
 
-    # get URL's as link
-    s{
-      (http|ftp|https)://\S+
-     }{
-	 &link($&, htmlunquote($&))
-     }egx;
+	# get URL's as link ..
+	$string =~ s`(http|ftp|https)(://[-a-zA-Z0-9%.~:_/]+)([?&]([-a-zA-Z0-9%.~:_]+)=([-a-zA-Z0-9%.~:_])+)*`<A HREF="$1$2$3">$1$2$3</A>`g;	# `
+	# get e-mails as link
+	$string =~ s`([-a-zA-Z0-9_.]+@([-a-zA-Z0-9]+\.)+[A-Za-z]{2,4})`<A HREF="mailto:$1">$1</A>`g;	# `
 
-    # get e-mails as link
-    $_ = htmlify_sub {
-	s<
-	  [\w+=\-.!]+@[\w\-]+(\.[\w\-]+)+
-	    ><
-	      &link($&, "mailto:$&")
-		>egix;
-    } $_;
+	if ($extra) {
+	    # get PR #'s as link ..
+	    if (defined($prcgi)) {
+		1 while $string =~ s`\b(pr[:#]?\s*(?:#?\d+[,\s]\s*)*#?)(\d+)\b`$1 . &link($2, sprintf($prcgi, $2))`ie; # `
+		$string =~ s`\b${prcategories}/(\d+)\b`&link($&, sprintf($prcgi, $1))`igeo;	# `
+	    }
 
-    if ($extra) {
-	# get PR #'s as link: "PR#nnnn" "PR: nnnn, ..." "PR nnnn, ..." "bin/nnnn"
-	if (defined($prcgi)) {
-	    my $prev;
-
-	    do {
-		$prev = $_;
-
-		$_ = htmlify_sub {
-		    s{
-		      (\bPR[:\#]?\s*
-		       (?:
-			\#?
-			\d+[,\s]\s*
-		       )*
-		       \#?)
-		      (\d+)\b
-		     }{
-			 $1 . &link($2, sprintf($prcgi, $2)) . $3
-		     }egix;
-		} $_;
-	    } while ($_ ne $prev);
-
-	    $_ = htmlify_sub {
-		s{
-		  (\b$prcategories/(\d+)\b)
-		 }{
-		     &link($1, sprintf($prcgi, $2)) . $3
-		 }egox;
-	    } $_;
+	    # get manpage specs as link ..
+	    if (defined($mancgi)) {
+		$string =~ s`\b([a-zA-Z]\w+)\(([0-9n])\)\B`&link($&, sprintf($mancgi, $2, $1))`ge; # `
+	    }
 	}
 
-	# get manpage specs as link: "foo.1" "foo(1)"
-	if (defined($mancgi)) {
-	    $_ = htmlify_sub {
-		s{
-		  (\b([a-zA-Z][\w_.]+)
-		   (?:
-		    \( ([0-9n]) \)\B
-		    |
-		    \.([0-9n])\b
-		   )
-		  )
-		 }{
-		     &link($1, sprintf($mancgi, $3 ne '' ? $3 : $4, $2)) . $5
-		 }egx;
-	    } $_;
-	}
-    }
-
-    $_;
+	return $string;
 }
 
 sub spacedHtmlText($;$) {
@@ -1120,7 +963,7 @@ sub spacedHtmlText($;$) {
 sub link($$) {
 	my($name, $where) = @_;
 
-	sprintf '<A HREF="%s">%s</A>', htmlquote($where), $name;
+	return "<A HREF=\"$where\">$name</A>\n";
 }
 
 sub revcmp($$) {
@@ -1168,7 +1011,7 @@ sub redirect($) {
 		print "Location: $url\r\n";
 	}
 	html_header("Moved");
-	print "This document is located ", &link('here', $url), "\n";
+	print "This document is located <A HREF=$url>here</A>.\n";
 	print &html_footer;
 	exit(1);
 }
@@ -1194,7 +1037,7 @@ sub safeglob($) {
 		$glob =~ s/{([^}]+)}/($t = $1) =~ s-,-|-g; "($t)"/eg;
 		foreach (readdir($dh)) {
 			if (/^${glob}$/) {
-				push(@results, "$dirname/" .$_);
+				push(@results, $dirname . "/" .$_);
 			}
 		}
 	}
@@ -1232,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($$) {
@@ -1285,6 +1094,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
 
@@ -1294,7 +1108,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:
@@ -1346,11 +1160,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
@@ -1366,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);
@@ -1383,48 +1184,40 @@ 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+`&link($&, "$scriptwhere$query#rev$&")`e;	# `
-		$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 spacedHtmlText($line, $d{'tabstop'});
-
-	    print "</b>" if ($isCurrentRev && $is_textbased);
+	    print "<b>" if ($isCurrentRev);
+	    printf ("%8s%s%8s %4d:", $revprint, ($isCurrentRev ? "|" : " "), $usrprint, $lineNr);
+	    print spacedHtmlText($line);
+	    print "</b>" if ($isCurrentRev);
 	}
 	elsif ($words[0] eq "ok") {
 	    # We could complain about any text received after this, like the
 	    # CVS command line client.  But for simplicity, we don't.
 	}
 	elsif ($words[0] eq "error") {
-	    fatal("500 Internal Error", "Error occured during annotate: <b>$_</b>");
+	    fatal ("500 Internal Error", "Error occured during annotate: <b>$_</b>");
 	}
     }
     if ($annTable) {
@@ -1541,14 +1334,12 @@ sub cvswebMarkup($$$) {
     print "<HR noshade>";
     print "<table width=\"100%\"><tr><td bgcolor=\"$markupLogColor\">";
     print "File: ", &clickablePath($where, 1);
-    print "&nbsp;(";
-    &download_link($fileurl, $revision, "download");
-    print ")";
+    print "&nbsp;";
+    &download_link(urlencode($fileurl), $revision, "(download)");
     if (!$defaultTextPlain) {
-	print "&nbsp;(";
-	&download_link($fileurl, $revision, "as text",
+	print "&nbsp;";
+	&download_link(urlencode($fileurl), $revision, "(as text)",
 	       "text/plain");
-	print ")";
     }
     print "<BR>\n";
     if ($show_log_in_markup) {
@@ -1561,26 +1352,19 @@ 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/) {
-	printf '<IMG SRC="%s"><BR>', htmlquote("$url$barequery");
+	print "<IMG SRC=\"$url$barequery\"><BR>";
     }
     elsif ($mimetype =~ m%^application/pdf%) {
-	printf '<EMBED SRC="%s" WIDTH="100%"><BR>', htmlquote("$url$barequery");
+	print "<EMBED SRC=\"$url$barequery\" WIDTH=\"100%\"><BR>";
     }
     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>";
     }
@@ -1598,7 +1382,7 @@ sub viewable($) {
 sub doDiff($$$$$$) {
 	my($fullname, $r1, $tr1, $r2, $tr2, $f) = @_;
         my $fh = do {local(*FH);};
-	my ($rev1, $rev2, $sym1, $sym2, $f1, $f2);
+	my ($rev1, $rev2, $sym1, $sym2, @difftype, $diffname, $f1, $f2);
 
 	if ($r1 =~ /([^:]+)(:(.+))?/) {
 	    $rev1 = $1;
@@ -1632,18 +1416,36 @@ sub doDiff($$$$$$) {
 	    ($rev1, $sym1) = ($rev2, $sym2);
 	    ($rev2, $sym2) = ($tmp1, $tmp2);
 	}
-	my $difftype = $DIFFTYPES{$f};
-
-	if (!$difftype) {
+	my $human_readable = 0;
+	if ($f eq 'c') {
+	    @difftype = qw{-c};
+	    $diffname = "Context diff";
+	}
+	elsif ($f eq 's') {
+	    @difftype = qw{--side-by-side --width=164};
+	    $diffname = "Side by Side";
+	}
+	elsif ($f eq 'H') {
+	    $human_readable = 1;
+	    @difftype = qw{--unified=15};
+	    $diffname = "Long Human readable";
+	}
+	elsif ($f eq 'h') {
+	    @difftype =qw{-u};
+	    $human_readable = 1;
+	    $diffname = "Human readable";
+	}
+	elsif ($f eq 'u') {
+	    @difftype = qw{-u};
+	    $diffname = "Unidiff";
+	}
+	else {
 	    fatal ("400 Bad arguments", "Diff format $f not understood");
 	}
 
-	my @difftype       = @{$difftype->{'opts'}};
-	my $human_readable = $difftype->{'colored'};
-
 	# apply special options
 	if ($showfunc) {
-	    push @difftype, '-p' if $f ne 's';
+	    push @difftype, '-p' if $f =~ /^[cHhu]$/;
 
 	    my($re1, $re2);
 
@@ -1669,7 +1471,7 @@ sub doDiff($$$$$$) {
 	if ($human_readable) {
 	    http_header();
 	    &human_readable_diff($fh, $rev2);
-	    gzipclose();
+	    close(GZIP) if ($gzip_open);
 	    exit;
 	}
 	else {
@@ -1705,14 +1507,14 @@ sub doDiff($$$$$$) {
 		s|$cvsroot/||o;
 		if ($sym1) {
 		    chop;
-		    $_ .= " $sym1\n";
+		    $_ .= " " . $sym1 . "\n";
 		}
 	    }
 	    elsif (m|^$f2 $cvsroot|o) {
 		s|$cvsroot/||o;
 		if ($sym2) {
 		    chop;
-		    $_ .= " $sym2\n";
+		    $_ .= " " . $sym2 . "\n";
 		}
 	    }
 	    print $_;
@@ -1805,7 +1607,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/\.0\././;
+		($branch = $revwanted) =~ s/\b0\.//;
 		($branchpoint = $branch) =~ s/\.?\d+$//;
 		$revwanted = undef if ($revwanted ne $branch);
 	    }
@@ -1820,7 +1622,7 @@ again:
 	    $state = "head";
 	    goto again;
 	}
-	if ($state eq "head" && /$LOG_REVSEPARATOR/o) {
+	if ($state eq "head" && /^----------------------------$/) {
 	    $state = "log";
 	    $rev = undef;
 	    $date = undef;
@@ -1830,13 +1632,14 @@ again:
 	    next;
 	}
 	if ($state eq "log") {
-	    if (/$LOG_REVSEPARATOR/o || /$LOG_FILESEPARATOR/o) {
+	    if (/^----------------------------$/
+		|| /^=============================/) {
 		# End of a log entry.
 		my $revbranch;
 		($revbranch = $rev) =~ s/\.\d+$//;
-		print "$filename $rev Wanted: $revwanted ",
-		  "Revbranch: $revbranch Branch: $branch ",
-		    "Branchpoint: $branchpoint\n" if ($verbose);
+		print "$filename $rev Wanted: $revwanted "
+		    . "Revbranch: $revbranch Branch: $branch "
+		    . "Branchpoint: $branchpoint\n" if ($verbose);
 		if (!defined($revwanted) && defined($branch)
 		    && $branch eq $revbranch || !defined($tag)) {
 		    print "File revision $rev found for branch $branch\n"
@@ -1874,10 +1677,10 @@ again:
 		next;
 	    }
 	    else {
-		$log .= $_;
+		$log = $log . $_;
 	    }
 	}
-	if (/$LOG_FILESEPARATOR/o) {
+	if (/^===============/) {
 	    $state = "start";
 	    next;
 	}
@@ -1951,7 +1754,7 @@ sub readLog($;$) {
 # log info
 # ----------------------------
 	logentry:
-	while (!/$LOG_FILESEPARATOR/o) {
+	while (!/^=========/) {
 	    $_ = <$fh>;
 	    last logentry if (!defined($_));	# EOF
 	    print "R:", $_ if ($verbose);
@@ -1959,7 +1762,7 @@ sub readLog($;$) {
 		$rev = $1;
 		unshift(@allrevisions,$rev);
 	    }
-	    elsif (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o) {
+	    elsif (/^========/ || /^----------------------------$/) {
 		next logentry;
 	    }
 	    else {
@@ -1993,7 +1796,7 @@ sub readLog($;$) {
 	    while (<$fh>) {
 		print "L:", $_ if ($verbose);
 		next line if (/^branches:\s/);
-		last line if (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o);
+		last line if (/^----------------------------$/ || /^=========/);
 		$log{$rev} .= $_;
 	    }
 	    print "E:", $_ if ($verbose);
@@ -2034,7 +1837,7 @@ sub readLog($;$) {
 
 	foreach (reverse sort keys %symrev) {
 	    $rev = $symrev{$_};
-	    if ($rev =~ /^((.*)\.)0\.(\d+)$/) {
+	    if ($rev =~ /^((.*)\.)?\b0\.(\d+)$/) {
 		push(@branchnames, $_);
 		#
 		# A revision number of A.B.0.D really translates into
@@ -2047,11 +1850,9 @@ 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;
@@ -2081,7 +1882,7 @@ sub readLog($;$) {
 	my ($onlyonbranch, $onlybranchpoint);
 	if ($onlyonbranch = $input{'only_with_tag'}) {
 	    $onlyonbranch = $symrev{$onlyonbranch};
-	    if ($onlyonbranch =~ s/\.0\././) {
+	    if ($onlyonbranch =~ s/\b0\.//) {
 		($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//;
 	    }
             else {
@@ -2119,20 +1920,6 @@ sub readLog($;$) {
 
 }
 
-sub printDiffLinks($$) {
-    my($text, $url) = @_;
-    my @extra;
-
-    local $_;
-    for ($DIFFTYPES{$defaultDiffType}{'colored'} ? qw(u) : qw(h)) {
-	my $f = $_ eq $defaultDiffType ? '' : $_;
-
-	push @extra, &link(lc $DIFFTYPES{$_}{'descr'}, "$url&f=$f");
-    }
-
-    print &link($text, $url), ' (', join(', ', @extra), ')';
-}
-
 sub printLog($;$) {
 	my ($link, $br, $brp);
 	($_,$link) = @_;
@@ -2161,40 +1948,29 @@ sub printLog($;$) {
 	    }
 	    print "\n Revision ";
 	    &download_link($fileurl, $_, $_,
-			   $defaultViewable ? "text/x-cvsweb-markup" : undef);
+		$defaultViewable ? "text/x-cvsweb-markup" : undef);
 	    if ($defaultViewable) {
-		print " / (";
-		&download_link($fileurl, $_, "download", $mimetype);
-		print ")";
+		print " / ";
+		&download_link($fileurl, $_, "(download)", $mimetype);
 	    }
 	    if (not $defaultTextPlain) {
-		print " / (";
-		&download_link($fileurl, $_, "as text", "text/plain");
-		print ")";
+		print " / ";
+		&download_link($fileurl, $_, "(as text)",
+			   "text/plain");
 	    }
 	    if (!$defaultViewable) {
-		print " / (";
-		&download_link($fileurl, $_, "view", "text/x-cvsweb-markup");
-		print ")";
+		print " / ";
+		&download_link($fileurl, $_, "(view)", "text/x-cvsweb-markup");
 	    }
 	    if ($allow_annotate) {
-		print " - ";
-		print &link('annotate',
-			    sprintf('%s/%s?annotate=%s%s',
-				    $scriptname,
-				    urlencode($where),
-				    $_,
-				    $barequery));
+		print " - <a href=\"" . $scriptname . "/" . urlencode($where) . "?annotate=$_$barequery\">";
+		print "annotate</a>";
 	    }
 	    # Plus a select link if enabled, and this version isn't selected
 	    if ($allow_version_select) {
 		if ((!defined($input{"r1"}) || $input{"r1"} ne $_)) {
-		    print " - ";
-		    print &link('[select for diffs]',
-				sprintf('%s?r1=%s%s',
-					$scriptwhere,
-					$_,
-					$barequery));
+		    print " - <A HREF=\"${scriptwhere}?r1=$_$barequery" .
+			"\">[select for diffs]</A>\n";
 		}
 		else {
 		    print " - <b>[selected]</b>";
@@ -2209,13 +1985,13 @@ sub printLog($;$) {
 	}
 	if (defined @mytz) {
 	    my ($est) = $mytz[(localtime($date{$_}))[8]];
-	    print ", <i>", scalar localtime($date{$_}), " $est</i> (";
+	    print ", <i>" . scalar localtime($date{$_}) . " $est</i> (";
 	} else {
-	    print ", <i>", scalar gmtime($date{$_}), " UTC</i> (";
+	    print ", <i>" . scalar gmtime($date{$_}) . " UTC</i> (";
 	}
-	print readableTime(time() - $date{$_},1), " ago)";
+	print readableTime(time() - $date{$_},1) . " ago)";
 	print " by ";
-	print "<i>", $author{$_}, "</i>\n";
+	print "<i>" . $author{$_} . "</i>\n";
 	print "<BR>Branch: <b>",$link?link_tags($revsym{$br}):$revsym{$br},"</b>\n"
 	    if ($revsym{$br});
 	print "<BR>CVS Tags: <b>",$link?link_tags($revsym{$_}):$revsym{$_},"</b>"
@@ -2249,28 +2025,23 @@ sub printLog($;$) {
 	    # Offer diff to previous revision
 	    if ($prev) {
 		$diffrev{$prev} = 1;
-
-		my $url = sprintf('%s.diff?r1=%s&r2=%s%s',
-				  $scriptwhere,
-				  $prev,
-				  $_,
-				  $barequery);
-
-		print " to previous ";
-		printDiffLinks($prev, $url);
+		print " to previous <A HREF=\"${scriptwhere}.diff?r1=$prev";
+		print "&amp;r2=$_" . $barequery . "\">$prev</A>\n";
+		if (!$hr_default) { # offer a human readable version if not default
+		    print "(<A HREF=\"${scriptwhere}.diff?r1=$prev";
+		    print "&amp;r2=$_" . $barequery . "&amp;f=h\">colored</A>)\n";
+		}
 	    }
 	    #
 	    # Plus, if it's on a branch, and it's not a vendor branch,
 	    # offer a diff with the branch point.
 	    if ($revsym{$brp} && !/^1\.1\.1\.\d+$/ && !defined($diffrev{$brp})) {
-		my $url = sprintf('%s.diff?r1=%s&r2=%s%s',
-				  $scriptwhere,
-				  $brp,
-				  $_,
-				  $barequery);
-
-		print " to branchpoint ";
-		printDiffLinks($brp, $url);
+		print " to branchpoint <A HREF=\"${scriptwhere}.diff?r1=$brp";
+		print "&amp;r2=$_" . $barequery . "\">$brp</A>\n";
+		if (!$hr_default) { # offer a human readable version if not default
+		print "(<A HREF=\"${scriptwhere}.diff?r1=$brp";
+		print "&amp;r2=$_" . $barequery . "&amp;f=h\">colored</A>)\n";
+		}
 	    }
 	    #
 	    # Plus, if it's on a branch, and it's not a vendor branch,
@@ -2295,30 +2066,29 @@ sub printLog($;$) {
 		}
 		if (!defined($diffrev{$nextmain})) {
 		    $diffrev{$nextmain} = 1;
-
-		    my $url = sprintf('%s.diff?r1=%s&r2=%s%s',
-				      $scriptwhere,
-				      $nextmain,
-				      $_,
-				      $barequery);
-
-		    print " next main ";
-		    printDiffLinks($nextmain, $url);
+		    print " next main <A HREF=\"${scriptwhere}.diff?r1=$nextmain";
+		    print "&amp;r2=$_" . $barequery .
+			"\">$nextmain</A>\n";
+		    if (!$hr_default) { # offer a human readable version if not default
+			print "(<A HREF=\"${scriptwhere}.diff?r1=$nextmain";
+			print "&amp;r2=$_" . $barequery .
+			    "&amp;f=h\">colored</A>)\n";
+		    }
 		}
 	    }
 	    # Plus if user has selected only r1, then present a link
 	    # to make a diff to that revision
 	    if (defined($input{"r1"}) && !defined($diffrev{$input{"r1"}})) {
 		$diffrev{$input{"r1"}} = 1;
+		print " to selected <A HREF=\"${scriptwhere}.diff?"
+			. "r1=$input{'r1'}&amp;r2=$_" . $barequery
+			. "\">$input{'r1'}</A>\n";
+		if (!$hr_default) { # offer a human readable version if not default
+		    print "(<A HREF=\"${scriptwhere}.diff?r1=$input{'r1'}";
+		    print "&amp;r2=$_" . $barequery .
+			"&amp;f=h\">colored</A>)\n";
 
-		my $url = sprintf('%s.diff?r1=%s&r2=%s%s',
-				  $scriptwhere,
-				  $input{'r1'},
-				  $_,
-				  $barequery);
-
-		print " to selected ";
-		printDiffLinks($input{'r1'}, $url);
+		}
 	    }
 	}
 	print "<PRE>\n";
@@ -2337,10 +2107,11 @@ sub doLog($) {
         ($filename = $where) =~ s|^.*/||;
         $backurl = $scriptname . "/" . urlencode($upwhere) . $query;
 	print &link($backicon, "$backurl#$filename"),
-	  " <b>Up to ", &clickablePath($upwhere, 1), "</b><p>\n";
-	print &link('Request diff between arbitrary revisions', '#diff');
-        print '<HR NOSHADE>';
-
+              " <b>Up to ", &clickablePath($upwhere, 1), "</b><p>\n";
+	print <<EOF;
+<A HREF="#diff">Request diff between arbitrary revisions</A>
+<HR NOSHADE>
+EOF
 	if ($curbranch) {
 	    print "Default branch: ", ($revsym{$curbranch} || $curbranch);
 	}
@@ -2368,7 +2139,7 @@ sub doLog($) {
 	print "</A><P>\n";
 	print "<FORM METHOD=\"GET\" ACTION=\"${scriptwhere}.diff\" NAME=\"diff_select\">\n";
         foreach (@stickyvars) {
-	    printf('<INPUT TYPE=HIDDEN NAME="%s" VALUE="%s">',  $_, $input{$_})
+	    print "<INPUT TYPE=HIDDEN NAME=\"$_\" VALUE=\"$input{$_}\">\n"
 		if (defined($input{$_})
 		    && ((!defined($DEFAULTVALUE{$_})
 		         || $input{$_} ne $DEFAULTVALUE{$_})
@@ -2398,8 +2169,8 @@ sub doLog($) {
 	print "<HR noshade>\n";
 	print "<TABLE>";
 	print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n";
-	print "<TR><TD align=right>Preferred Diff type:</TD>";
-	print "<TD>";
+        print "<TR><TD align=right>Preferred Diff type:</TD>";
+        print "<TD>";
 	printDiffSelect($use_java_script);
 	print "</TD><TD></TD></TR>\n";
         if (@branchnames) {
@@ -2434,9 +2205,13 @@ sub doLog($) {
 	print "<TR><TD align=right>";
 	print "<A name=logsort></A>\n";
 	print "Sort log by:</TD>";
-	print "<TD>";
-	printLogSortSelect($use_java_script);
-	print "</TD>";
+	print "<TD><SELECT NAME=\"logsort\"";
+	print " onchange=\"submit()\"" if ($use_java_script);
+	print ">\n";
+	print "<OPTION VALUE=cvs",$logsort eq "cvs" ? " SELECTED" : "", ">Not sorted";
+	print "<OPTION VALUE=date",$logsort eq "date" ? " SELECTED" : "", ">Commit date";
+	print "<OPTION VALUE=rev",$logsort eq "rev" ? " SELECTED" : "", ">Revision";
+	print "</SELECT></TD>";
 	print "<TD><INPUT TYPE=SUBMIT VALUE=\"  Set  \"></TD>";
 	print "</FORM>\n";
 	print "</TR></TABLE>";
@@ -2479,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);
@@ -2506,16 +2281,17 @@ sub human_readable_diff($){
     $date2 = $r2d;
   }
 
-  print "<h3 align=center>Diff for /$where_nd between version $rev1 and $rev2</h3>\n",
-    "<table border=0 cellspacing=0 cellpadding=0 width=\"100%\">\n",
-      "<tr bgcolor=\"#ffffff\">\n",
-	"<th width=\"50%\" valign=TOP>",
-	  "version $rev1";
+  print "<h3 align=center>Diff for /$where_nd between version $rev1 and $rev2</h3>\n";
+
+  print "<table border=0 cellspacing=0 cellpadding=0 width=\"100%\">\n";
+  print "<tr bgcolor=\"#ffffff\">\n";
+  print "<th width=\"50%\" valign=TOP>";
+  print "version $rev1";
   print ", $date1" if (defined($date1));
   print "<br>Tag: $sym1\n" if ($sym1);
-  print "</th>\n",
-    "<th width=\"50%\" valign=TOP>",
-      "version $rev2";
+  print "</th>\n";
+  print "<th width=\"50%\" valign=TOP>";
+  print "version $rev2";
   print ", $date2" if (defined($date2));
   print "<br>Tag: $sym2\n" if ($sym1);
   print "</th>\n";
@@ -2532,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%\">";
@@ -2556,7 +2326,7 @@ sub human_readable_diff($){
       }
       else {
 	  ($diffcode,$rest) = $difftxt =~ /^([-+ ])(.*)/;
-	  $_ = spacedHtmlText($rest, $d{'tabstop'});
+	  $_ = spacedHtmlText ($rest);
 
 	  # Add fontface, size
 	  $_ = "$fs&nbsp;$_$fe";
@@ -2640,12 +2410,12 @@ 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.104 $  $kRevision: 1.39 $ -->';
+    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 &link($backicon, "$swhere$query#rev$rev");
+    print  "<a href=\"$swhere$query#rev$rev\">$backicon";
     print "</a> <b>Return to ", &link("$filename","$swhere$query#rev$rev")," CVS log";
     print "</b> $fileicon</td>";
 
@@ -2656,10 +2426,10 @@ sub navigateHeader($$$$$) {
 sub plural_write($$) {
     my ($num,$text) = @_;
     if ($num != 1) {
-	$text .= "s";
+	$text = $text . "s";
     }
     if ($num > 0) {
-	return join(' ', $num, $text);
+	return $num . " " . $text;
     }
     else {
 	return "";
@@ -2703,7 +2473,7 @@ sub readableTime($$) {
 	my $resttime = plural_write(int ($rest / $break),
 				$desc{$break});
 	if ($resttime) {
-	    $retval .= ", $resttime";
+	    $retval = $retval . ", " . $resttime;
 	}
     }
 
@@ -2727,26 +2497,24 @@ sub clickablePath($$) {
 	$retval = "[$cvstree]";
     }
     else {
-	$retval .= ' ' . &link("[$cvstree]", sprintf('%s/%s#dirlist',
-						     $scriptname,
-						     $query));
+	$retval = $retval . " <a href=\"${scriptname}/${query}#dirlist\">[$cvstree]</a>";
 	my $wherepath = '';
 	my ($lastslash) = $pathname =~ m|/$|;
 	foreach (split(/\//, $pathname)) {
-	    $retval .= " / ";
-	    $wherepath .= "/$_";
+	    $retval = $retval . " / ";
+	    $wherepath = $wherepath . '/' . $_;
 	    my ($last) = "$wherepath/" eq "/$pathname"
 		|| $wherepath eq "/$pathname";
 	    if ($clickLast || !$last) {
-		$retval .= &link($_, join('',
-					  $scriptname,
-					  urlencode($wherepath),
-					  (!$last || $lastslash ? '/' : ''),
-					  $query,
-					  (!$last || $lastslash ? "#dirlist" : "")));
+		$retval = $retval . "<a href=\"${scriptname}"
+		    . urlencode($wherepath)
+		    . (!$last || $lastslash ? '/' : '')
+		    . ${query}
+	            . (!$last || $lastslash ? "#dirlist" : "")
+		    . "\">$_</a>";
 	    }
 	    else { # do not make a link to the current dir
-		$retval .= $_;
+		$retval = $retval .  $_;
 	    }
 	}
     }
@@ -2778,7 +2546,8 @@ sub chooseCVSRoot() {
 	foreach $k (@foo) {
 	    print "<option value=\"$k\"";
 	    print " selected" if ($k eq $cvstree);
-	    print ">", ($CVSROOTdescr{$k} ? $CVSROOTdescr{$k} : $k), "</option>\n";
+	    print ">" . ($CVSROOTdescr{$k} ? $CVSROOTdescr{$k} :
+	    		$k). "</option>\n";
 	}
 	print "</select>\n</td>";
 	print "<td><input type=submit value=\"Go\"></td>";
@@ -2802,7 +2571,7 @@ sub chooseMirror() {
 	print "\nThis cvsweb is mirrored in:\n";
 	foreach $mirror (keys %MIRRORS) {
 	    print ", " if ($moremirrors);
-	    print &link(htmlquote($mirror),$MIRRORS{$mirror});
+	    print qq(<a href="$MIRRORS{$mirror}">$mirror</A>\n);
 	    $moremirrors = 1;
 	}
 	print "<p>\n";
@@ -2843,30 +2612,34 @@ sub fileSortCmp() {
 sub download_url($$;$) {
     my ($url,$revision,$mimetype) = @_;
 
-    $revision =~ s/\.0\././;
+    $revision =~ s/\b0\.//;
 
-    if (defined($checkoutMagic)
+    if (defined($checkout_magic)
 	&& (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) {
-	my $path = $where;
-	$path =~ s|/[^/]*$|/|;
+	my ($path);
+	($path = $where) =~ s|/[^/]*$|/|;
 	$url = "$scriptname/$checkoutMagic/${path}$url";
     }
     $url .= "?rev=$revision";
-    $url .= '&content-type=' . urlencode($mimetype) if (defined($mimetype));
+    $url .= "&amp;content-type=$mimetype" if (defined($mimetype));
 
-    $url;
+    return $url;
 }
 
 # Presents a link to download the
 # selected revision
 sub download_link($$$;$) {
-    my ($url, $revision, $textlink, $mimetype) = @_;
-    my ($fullurl) = download_url($url, $revision, $mimetype);
-
-    printf '<A HREF="%s"', htmlquote("$fullurl$barequery");
-
+    my ($url,$revision,$textlink,$mimetype) = @_;
+    my ($fullurl) = download_url($url,$revision,$mimetype);
+    my ($paren) = $textlink =~ /^\(/;
+    $textlink =~ s/^\(// if ($paren);
+    $textlink =~ s/\)$// if ($paren);
+    print "(" if ($paren);
+    print "<A HREF=\"$fullurl";
+    print $barequery;
+    print "\"";
     if ($open_extern_window && (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) {
-	print ' target="cvs_checkout"';
+	print " target=\"cvs_checkout\"";
 	# we should have
 	#   'if (document.cvswin==null) document.cvswin=window.open(...'
 	# in order to allow the user to resize the window; otherwise
@@ -2885,22 +2658,17 @@ sub download_link($$$;$) {
 	# currently, the best way is to comment out the size parameters
 	# ($extern_window...) in cvsweb.conf.
 	if ($use_java_script) {
-	    my @attr = qw(resizeable scrollbars);
-
-	    push @attr, qw(status toolbar)
-	      if (defined($mimetype) && $mimetype eq "text/html");
-
-	    push @attr, "width=$extern_window_width"
-	      if (defined($extern_window_width));
-
-	    push @attr, "height=$extern_window_height"
-	      if (defined($extern_window_height));
-
-	    printf q` onClick="window.open('%s','cvs_checkout','%s');"`,
-	      htmlquote($fullurl), join(',', @attr);
+	    print " onClick=\"window.open('$fullurl','cvs_checkout',";
+	    print "'resizeable,scrollbars";
+	    print ",status,toolbar" if (defined($mimetype)
+	        && $mimetype eq "text/html");
+	    print ",width=$extern_window_width" if (defined($extern_window_width));
+	    print ",height=$extern_window_height" if (defined($extern_window_height));
+	    print"');\"";
 	}
     }
     print "><b>$textlink</b></A>";
+    print ")" if ($paren);
 }
 
 # Returns a Query string with the
@@ -2922,7 +2690,7 @@ sub toggleQuery($$) {
 	my ($value) = defined($vars{$var}) ? $vars{$var} : "";
 	my ($default) = defined($DEFAULTVALUE{$var}) ? $DEFAULTVALUE{$var} : "";
 	if ($value ne $default) {
-	    $newquery .= "&" if ($newquery ne "");
+	    $newquery .= "&amp;" if ($newquery ne "");
 	    $newquery .= urlencode($var) . "=" . urlencode($value);
 	}
     }
@@ -2933,38 +2701,12 @@ sub toggleQuery($$) {
 }
 
 sub urlencode($) {
-    local($_) = @_;
-
-    s/[\000-+{-\377]/sprintf("%%%02x", ord($&))/ge;
-
-
-       $_;
+    my ($in) = @_;
+    my ($out);
+    ($out = $in) =~ s/([\000-+{-\377])/sprintf("%%%02x", ord($1))/ge;
+    return $out;
 }
 
-sub htmlquote($) {
-    local($_) = @_;
-
-    # Special Characters; RFC 1866
-    s/&/&amp;/g;
-    s/\"/&quot;/g;
-    s/</&lt;/g;
-    s/>/&gt;/g;
-
-    $_;
-}
-
-sub htmlunquote($) {
-    local($_) = @_;
-
-    # Special Characters; RFC 1866
-    s/&quot;/\"/g;
-    s/&lt;/</g;
-    s/&gt;/>/g;
-    s/&amp;/&/g;
-
-    $_;
-}
-
 sub http_header(;$) {
     my $content_type = shift || "text/html";
     if (defined($moddate)) {
@@ -2972,7 +2714,7 @@ sub http_header(;$) {
 	    Apache->request->header_out("Last-Modified" => scalar gmtime($moddate) . " GMT");
 	}
 	else {
-	    print "Last-Modified: ", scalar gmtime($moddate), " GMT\r\n";
+	    print "Last-Modified: " . scalar gmtime($moddate) . " GMT\r\n";
 	}
     }
     if ($is_mod_perl) {
@@ -3023,7 +2765,7 @@ sub http_header(;$) {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.104 $  $kRevision: 1.39 $'; #'
+    my $version = '$zRevision: 1.101 $  $Revision: 3.23 $'; #'
     http_header();
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"
@@ -3051,9 +2793,10 @@ sub link_tags($) {
 
     foreach my $sym (split(", ", $tags)) {
 	$ret .= ",\n" if ($ret ne "");
-	$ret .= &link($sym, $fileurl . toggleQuery('only_with_tag',$sym));
+	$ret .= "<A HREF=\"$fileurl"
+		. toggleQuery('only_with_tag',$sym) . "\">$sym</A>";
     }
-    return "$ret\n";
+    return $ret."\n";
 }
 
 #
@@ -3067,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