===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.1.1.7
retrieving revision 1.1.1.25
diff -u -p -r1.1.1.7 -r1.1.1.25
--- cvsweb/cvsweb.cgi	2000/09/23 20:23:34	1.1.1.7
+++ cvsweb/cvsweb.cgi	2001/05/07 17:19:27	1.1.1.25
@@ -1,4 +1,4 @@
-#!/usr/bin/perl5 -ws
+#!/usr/bin/perl -wT
 #
 # cvsweb - a CGI interface to CVS trees.
 #
@@ -18,7 +18,7 @@
 # Copyright (c) 1996-1998 Bill Fenner
 #           (c) 1998-1999 Henner Zeller
 #	    (c) 1999      Henrik Nordstrom
-#	    (c) 2000      Akinori MUSHA
+#	    (c) 2000-2001 Akinori MUSHA
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -42,30 +42,36 @@
 # 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.106 2001/03/10 01:16:27 hnordstrom Exp $
+# $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.71 2001/05/07 17:13:42 knu Exp $
 #
 ###
 
+require 5.000;
+
 use strict;
 
 use vars qw (
-    $config $allow_version_select $verbose
-    %CVSROOT %CVSROOTdescr %MIRRORS %DEFAULTVALUE %ICONS %MTYPES
+    $cvsweb_revision
+    $mydir $uname $config $allow_version_select $verbose
+    @CVSrepositories @CVSROOT %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
-    $prcgi @prcategories $prcategories $mancgi
+    $prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword $mancgi
     $checkoutMagic $doCheckout $scriptname $scriptwhere
     $where $pathinfo $Browser $nofilelinks $maycompress @stickyvars
     %funcline_regexp $is_mod_perl
-    $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased
+    $is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased
     %input $query $barequery $sortby $bydate $byrev $byauthor
-    $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
+    $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot
+    $mimetype $charset $defaultTextPlain $defaultViewable
+    $command_path %CMD $allow_compress
+    $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
@@ -74,15 +80,20 @@ 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
-    $checkout_magic $show_subdir_lastmod $show_log_in_markup $v
+    $show_subdir_lastmod $show_log_in_markup $preformat_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
+    $allow_tar @tar_options @gzip_options @cvs_options
+    $LOG_FILESEPARATOR $LOG_REVSEPARATOR
 );
 
 sub printDiffSelect($);
+sub printDiffLinks($$);
+sub printLogSortSelect($);
 sub findLastModifiedSubdirs(@);
+sub htmlify_sub(&$);
 sub htmlify($;$);
 sub spacedHtmlText($;$);
 sub link($$);
@@ -90,6 +101,7 @@ sub revcmp($$);
 sub fatal($$);
 sub redirect($);
 sub safeglob($);
+sub search_path($);
 sub getMimeTypeFromSuffix($);
 sub head($;$);
 sub scan_directives(@);
@@ -115,6 +127,9 @@ sub download_url($$;$);
 sub download_link($$$;$);
 sub toggleQuery($$);
 sub urlencode($);
+sub htmlquote($);
+sub htmlunquote($);
+sub hrefquote($);
 sub http_header(;$);
 sub html_header($);
 sub html_footer();
@@ -122,17 +137,26 @@ sub link_tags($);
 sub forbidden_module($);
 
 ##### Start of Configuration Area ########
-use Cwd;
+delete $ENV{PATH};
 
-# == EDIT this ==
-# User configuration is stored in
-$config = undef;
+$cvsweb_revision = '1.106' . '.' . (split(/ /,
+ q$Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.71 2001/05/07 17:13:42 knu Exp $
+))[2];
 
-for ($ENV{CVSWEB_CONFIG},
-#     '/home/knu/etc/cvsweb.conf',
-     '/usr/local/etc/cvsweb.conf',
-     getcwd . '/cvsweb.conf') {
-  $config = $_ if defined($_) && -r $_;
+use File::Basename;
+
+($mydir) = (dirname($0) =~ /(.*)/); # untaint
+
+# == EDIT this ==
+# Locations to search for user configuration, in order:
+for (
+     "$mydir/cvsweb.conf",
+     '/usr/local/etc/cvsweb/cvsweb.conf'
+    ) {
+    if (defined($_) && -r $_) {
+	$config = $_;
+	last;
+    }
 }
 
 # == Configuration defaults ==
@@ -144,9 +168,10 @@ $allow_version_select = 1;
 
 ######## Configuration variables #########
 # These are defined to allow checking with perl -cw
-%CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES =
+@CVSrepositories = @CVSROOT = %CVSROOT =
+%MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES =
 %tags = %alltags = @tabcolors = ();
-$cvstreedefault = $body_tag = $body_tag_for_src = 
+$cvstreedefault = $body_tag = $body_tag_for_src =
 $logo = $defaulttitle = $address =
 $long_intro = $short_instruction = $shortLogLen =
 $show_author = $dirtable = $tablepadding = $columnHeaderColorDefault =
@@ -156,10 +181,56 @@ $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 =
-$checkout_magic = $show_subdir_lastmod = $show_log_in_markup = $v =
+$show_subdir_lastmod = $show_log_in_markup = $v =
 $navigationHeaderColor = $tableBorderColor = $markupLogColor =
 $tabstop = $use_moddate = $moddate = $gzip_open = 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;
@@ -176,29 +247,36 @@ $verbose = $v;
 $checkoutMagic = "~checkout~";
 $pathinfo = defined($ENV{PATH_INFO}) ? $ENV{PATH_INFO} : '';
 $where = $pathinfo;
-$doCheckout = ($where =~ /^\/$checkoutMagic/);
-$where =~ s|^/($checkoutMagic)?||;
-$where =~ s|/+$||;
+$doCheckout = ($where =~ m|^/$checkoutMagic/|);
+$where =~ s|^/$checkoutMagic/|/|;
+$where =~ s|^/||;
 $scriptname = defined($ENV{SCRIPT_NAME}) ? $ENV{SCRIPT_NAME} : '';
-$scriptname =~ s|^/?|/|;
-$scriptname =~ s|/+$||;
-$scriptwhere = $scriptname;
-if ($where) {
-    $scriptwhere .= '/' . urlencode($where);
+$scriptname =~ s|^/*|/|;
+
+# Let's workaround thttpd's stupidity..
+if ($scriptname =~ m|/$|) {
+    $pathinfo .= '/';
+    my $re = quotemeta $pathinfo;
+    $scriptname =~ s/$re$//;
 }
 
+$scriptwhere = $scriptname;
+$scriptwhere .= '/' . urlencode($where);
+$where = '/' if ($where eq '');
+
 $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);
 $is_msie = ($Browser =~ m`MSIE`);
 $is_mozilla3 = ($Browser =~ m`^Mozilla/[3-9]`);
 
-$is_textbased = ($is_lynx || $is_w3m);
+$is_textbased = ($is_links || $is_lynx || $is_w3m);
 
 $nofilelinks = $is_textbased;
 
@@ -224,14 +302,14 @@ $maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING})
 @stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag);
 
 if (-f $config) {
-    do $config;
-}
-else {
+   require $config
+     || &fatal("500 Internal Error",
+	       sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>',
+		       $config, &htmlify($@)));
+} else {
    &fatal("500 Internal Error",
 	  'Configuration not found.  Set the variable <code>$config</code> '
-          . 'in cvsweb.cgi, or the environment variable '
-          . '<code>CVSWEB_CONFIG</code>, to your <b>cvsweb.conf</b> '
-          . 'configuration file first.');
+          . 'in cvsweb.cgi to your <b>cvsweb.conf</b> configuration file first.');
 }
 
 undef %input;
@@ -239,6 +317,7 @@ $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 "");
@@ -278,26 +357,29 @@ 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{$_})) {
-        if ($barequery) {
-	    $barequery = $barequery . "&amp;";
-	}
-	my $thisval = urlencode($_) . "=" . urlencode($input{$_});
-	$barequery .= $thisval;
+	push @barequery, join('=', urlencode($_), urlencode($input{$_}));
     }
 }
 # is there any query ?
-if ($barequery) {
+if (@barequery) {
+    $barequery = join('&', @barequery);
     $query = "?$barequery";
-    $barequery = "&amp;" . $barequery;
+    $barequery = "&$barequery";
 }
 else {
     $query = "";
 }
+undef @barequery;
 
+if (defined($input{path})) {
+    redirect("$scriptname/$input{path}$query");
+}
+
 # get actual parameters
 $sortby = $input{"sortby"};
 $bydate = 0;
@@ -321,11 +403,26 @@ else {
     $byfile = 1;
 }
 
-$hr_default = $input{'f'} eq 'h';
+$defaultDiffType = $input{'f'};
 
 $logsort = $input{'logsort'};
 
+my @tmp = @CVSrepositories;
+my @pair;
 
+while (@pair = splice(@tmp, 0, 2)) {
+    my($key, $val) = @pair;
+    my($descr, $cvsroot) = @$val;
+
+    next if !-d $cvsroot;
+
+    $CVSROOTdescr{$key} = $descr;
+    $CVSROOT{$key} = $cvsroot;
+    push @CVSROOT, $key;
+}
+undef @tmp;
+undef @pair;
+
 ## Default CVS-Tree
 if (!defined($CVSROOT{$cvstreedefault})) {
    &fatal("500 Internal Error",
@@ -344,56 +441,63 @@ if ($input{'cvsroot'} && $CVSROOT{$input{'cvsroot'}}) 
 $cvsroot = $CVSROOT{$cvstree};
 
 # create icons out of description
-foreach my $k (keys %ICONS) {
+my $k;
+foreach $k (keys %ICONS) {
     no strict 'refs';
     my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}};
     if ($ipath) {
-	${"${k}icon"} = "<IMG SRC=\"$ipath\" ALT=\"$itxt\" BORDER=\"0\" WIDTH=\"$iwidth\" HEIGHT=\"$iheight\">";
+	${"${k}icon"} = sprintf('<IMG SRC="%s" ALT="%s" BORDER="0" WIDTH="%d" HEIGHT="%d">',
+				hrefquote($ipath), htmlquote($itxt), $iwidth, $iheight)
     }
     else {
 	${"${k}icon"} = $itxt;
     }
 }
+undef $k;
 
+my $config_cvstree = "$config-$cvstree";
+
 # Do some special configuration for cvstrees
-do "$config-$cvstree" if (-f "$config-$cvstree");
+if (-f $config_cvstree) {
+   require $config_cvstree
+     || &fatal("500 Internal Error",
+	       sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>',
+		       $config_cvstree, &htmlify($@)));
+}
+undef $config_cvstree;
 
-$prcategories = '(?:' . join('|', @prcategories) . ')';
+$re_prcategories = '(?:' . join('|', @prcategories) . ')' if @prcategories;
+$re_prkeyword = quotemeta($prkeyword) if defined($prkeyword);
 $prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/;
 
-$fullname = $cvsroot . '/' . $where;
+$fullname = "$cvsroot/$where";
 $mimetype = &getMimeTypeFromSuffix ($fullname);
 $defaultTextPlain = ($mimetype eq "text/plain");
 $defaultViewable = $allow_markup && viewable($mimetype);
 
-# search for GZIP if compression allowed
-# We've to find out if the GZIP-binary exists .. otherwise
-# 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) {
-    foreach (split(/:/, $ENV{PATH})) {
-	if (-x "$_/gzip") {
-	    $GZIPBIN = "$_/gzip";
-	    last;
-	}
-    }
+my $rewrite = 0;
+
+if ($pathinfo =~ m|//|) {
+    $pathinfo =~ y|/|/|s;
+    $rewrite = 1;
 }
 
-if (-d $fullname) {
-    #
-    # ensure, that directories always end with (exactly) one '/'
-    # to allow relative URL's. If they're not, make a redirect.
-    ##
-    if (!($pathinfo =~ m|/$|) || ($pathinfo =~ m |/{2,}$|)) {
-	redirect ($scriptwhere . '/' . $query);
-    }
-    else {
-	$where .= '/';
-	$scriptwhere .= '/';
-    }
+if (-d $fullname && $pathinfo !~ m|/$|) {
+    $pathinfo .= '/';
+    $rewrite = 1;
 }
 
+if (!-d $fullname && $pathinfo =~ m|/$|) {
+    chop $pathinfo;
+    $rewrite = 1;
+}
+
+if ($rewrite) {
+    redirect($scriptname . urlencode($pathinfo) . $query);
+}
+
+undef $rewrite;
+
 if (!-d $cvsroot) {
     &fatal("500 Internal Error",'$CVSROOT not found!<P>The server on which the CVS tree lives is probably down.  Please try again in a few minutes.');
 }
@@ -406,10 +510,58 @@ $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;
+    my($module) = ($where =~ m,^/?(.*),);	# untaint
+    $module =~ s,/[^/]*$,,;
+    my($basedir) = ($module =~ m,([^/]+)$,);
+
+    if ($basedir eq '' || $module 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 = '';
+
+    while (1) {
+	my $tag = (exists $input{only_with_tag} && length $input{only_with_tag})
+	  ? $input{only_with_tag} : "HEAD";
+
+	system $CMD{cvs}, @cvs_options, '-Qd', $cvsroot, 'export', '-r', $tag, '-d', "$tmpdir/$basedir", $module
+	  and $fatal = "500 Internal Error","cvs co failure: $!: $module"
+	    && last;
+
+	$| = 1; # Essential to get the buffering right.
+
+	print "Content-type: application/x-gzip\r\n\r\n";
+
+	system "$CMD{tar} @tar_options -cf - -C $tmpdir $basedir | $CMD{gzip} @gzip_options -c"
+	  and $fatal = "500 Internal Error","tar zc failure: $!: $basedir"
+	    && last;
+
+	last;
+    }
+
+    system $CMD{rm}, '-rf', $tmpdir if -d $tmpdir;
+
+    &fatal($fatal) if $fatal;
+
+    exit;
+}
+
 ##############################
 # View a directory
 ###############################
-elsif (-d $fullname) {
+if (-d $fullname) {
 	my $dh = do {local(*DH);};
 	opendir($dh, $fullname) || &fatal("404 Not Found","$where: $!");
 	my @dir = readdir($dh);
@@ -465,57 +617,63 @@ elsif (-d $fullname) {
 	    }
 	    print "<table  width=\"100%\" border=0 cellspacing=1 cellpadding=$tablepadding>\n";
 	    $infocols++;
-	    print "<tr><th align=left bgcolor=\"" . (($byfile) ?
-						   $columnHeaderColorSorted :
-						   $columnHeaderColorDefault) . "\">";
-	    print "<a href=\"./" . &toggleQuery("sortby","file") .
-		"#dirlist\">" if (!$byfile);
-	    print "File";
-	    print "</a>" if (!$byfile);
+	    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 "</th>";
 	    # do not display the other column-headers, if we do not have any files
 	    # with revision information:
 	    if (scalar(%fileinfo)) {
 		$infocols++;
-		print "<th align=left bgcolor=\"" . (($byrev) ?
-						   $columnHeaderColorSorted :
-						   $columnHeaderColorDefault) . "\">";
-		print "<a href=\"./" . &toggleQuery ("sortby","rev") .
-		    "#dirlist\">" if (!$byrev);
-		print "Rev.";
-		print "</a>" if (!$byrev);
+		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>";
 		$infocols++;
-		print "<th align=left bgcolor=\"" . (($bydate) ?
-						   $columnHeaderColorSorted :
-						   $columnHeaderColorDefault) . "\">";
-		print "<a href=\"./" . &toggleQuery ("sortby","date") .
-		    "#dirlist\">" if (!$bydate);
-		print "Age";
-		print "</a>" if (!$bydate);
+		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>";
 		if ($show_author) {
 		    $infocols++;
-		    print "<th align=left bgcolor=\"" . (($byauthor) ?
-						   $columnHeaderColorSorted :
-						   $columnHeaderColorDefault) . "\">";
-		    print "<a href=\"./" . &toggleQuery ("sortby","author") .
-			    "#dirlist\">" if (!$byauthor);
-		    print "Author";
-		    print "</a>" if (!$byauthor);
+		    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>";
 		}
 		$infocols++;
-		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);
+		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>";
 	    }
 	    elsif ($use_descriptions) {
-		print "<th align=left bgcolor=\"". $columnHeaderColorDefault . "\">";
+		printf '<th align=left bgcolor="%s">', $columnHeaderColorDefault;
 		print "Description";
 		$infocols++;
 	    }
@@ -540,9 +698,9 @@ elsif (-d $fullname) {
 	    closedir($dh);
 	}
 
-	my $hideAtticToggleLink = "<a href=\"./" .
-	        &toggleQuery ("hideattic") .
-		"#dirlist\">[Hide]</a>" if (!$input{'hideattic'});
+	my $hideAtticToggleLink = $input{'hideattic'} ? '' :
+	  &link('[Hide]', sprintf('./%s#dirlist',
+				  &toggleQuery ("hideattic")));
 
 	# Sort without the Attic/ pathname.
 	# place directories first
@@ -578,40 +736,41 @@ elsif (-d $fullname) {
 
 	    if ($_ eq '..' || -d "$fullname/$_") {
 		next if ($_ eq '..' && $where eq '/');
-		my ($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}}
+		my ($rev,$date,$log,$author,$filename);
+		($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}}
 		    if (defined($fileinfo{$_}));
-		print "<tr bgcolor=\"" . @tabcolors[$dirrow%2] . "\"><td>" if ($dirtable);
+		printf '<tr bgcolor="%s"><td>', $tabcolors[$dirrow % 2] 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; <a href=\"./" .
-			    &toggleQuery ("hideattic") .
-				"#dirlist\">[Don't hide]</a>";
+			print "&nbsp; ";
+			print &link("[Don't hide]", sprintf('./%s#dirlist',
+							    &toggleQuery ("hideattic")));
 		    }
 		}
 		# 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);
@@ -622,8 +781,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 "...";
 			}
@@ -633,7 +792,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
@@ -655,7 +814,7 @@ elsif (-d $fullname) {
 	    }
 	    elsif (s/,v$//) {
 		$fileurl = ($attic ? "Attic/" : "") . urlencode($_);
-		$url = $fileurl . $query;
+		$url = './' . $fileurl . $query;
 		my $rev = '';
 		my $date = '';
 		my $log = '';
@@ -664,7 +823,7 @@ elsif (-d $fullname) {
 		next if (!defined($fileinfo{$_}));
 		($rev,$date,$log,$author) = @{$fileinfo{$_}};
 		$filesfound++;
-		print "<tr bgcolor=\"" . @tabcolors[$dirrow%2] . "\"><td>" if ($dirtable);
+		printf '<tr bgcolor="%s"><td>', $tabcolors[$dirrow % 2] if $dirtable;
 		print "<A NAME=\"$_\"></A>";
 		if ($nofilelinks) {
 		    print $fileicon;
@@ -675,11 +834,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);
@@ -687,7 +846,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 "...";
 		    }
@@ -702,7 +861,7 @@ elsif (-d $fullname) {
 	if ($dirtable && defined($tableBorderColor)) {
 	    print "</td></tr></table>";
 	}
-	print "". ($dirtable == 1) ? "</table>" : "</menu>" . "\n";
+	print( $dirtable == 1 ? "</table>\n" : "</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";
@@ -738,9 +897,27 @@ elsif (-d $fullname) {
 		       ">$tag\n";
 	    }
 	    print "</SELECT>\n";
+	    print " Module path or alias:\n";
+	    printf "<INPUT TYPE=TEXT NAME=\"path\" VALUE=\"%s\" SIZE=15>\n", htmlquote($where);
 	    print "<INPUT TYPE=SUBMIT VALUE=\"Go\">\n";
 	    print "</FORM>\n";
 	}
+
+	if ($allow_tar) {
+	    my($basefile) = ($where =~ m,(?:.*/)?([^/]+),);
+
+	    if (defined($basefile) && $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'});
 
@@ -760,12 +937,9 @@ elsif (-d $fullname) {
 	    print "<OPTION",$byrev ? " SELECTED" : ""," VALUE=rev>Revision";
 	    print "<OPTION",$bylog ? " SELECTED" : ""," VALUE=log>Log message";
 	    print "</SELECT></td>";
-	    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 "<td>Sort log by: ";
+	    printLogSortSelect(0);
+	    print "</td></tr>";
 	    print "<tr><td>Diff format: ";
 	    printDiffSelect(0);
 	    print "</td>";
@@ -827,7 +1001,7 @@ elsif (-d $fullname) {
 	# The file has been removed and is in the Attic.
 	# Send a redirect pointing to the file in the Attic.
 	(my $newplace = $scriptwhere) =~ s|/([^/]+)$|/Attic/$1|;
-	&redirect($newplace);
+	redirect("$newplace$query");
 	exit;
     }
     elsif (0 && (my @files = &safeglob($fullname . ",v"))) {
@@ -841,13 +1015,13 @@ elsif (-d $fullname) {
 	my $fh = do {local(*FH);};
 	my ($xtra, $module);
 	# Assume it's a module name with a potential path following it.
-	$xtra = $& if (($module = $where) =~ s|/.*||);
+	$xtra = (($module = $where) =~ s|/.*||) ? $& : '';
 	# Is there an indexed version of modules?
-	if (open($fh, "$cvsroot/CVSROOT/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$query");
 		}
 	    }
 	}
@@ -859,18 +1033,43 @@ gzipclose();
 
 sub printDiffSelect($) {
     my ($use_java_script) = @_;
-    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";
+    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'}"
+	      );
+    }
+
     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);
@@ -905,34 +1104,93 @@ 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($;$) {
-	my($string, $extra) = @_;
+    (local $_, my $extra) = @_;
 
-	# Special Characters; RFC 1866
-	$string =~ s/&/&amp;/g;
-	$string =~ s/\"/&quot;/g;
-	$string =~ s/</&lt;/g;
-	$string =~ s/>/&gt;/g;
+    $_ = htmlquote($_);
 
-	# 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 URL's as link
+    s{
+      (http|ftp|https)://\S+
+     }{
+	 &link($&, htmlunquote($&))
+     }egx;
 
-	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;	# `
-	    }
+    # get e-mails as link
+    $_ = htmlify_sub {
+	s<
+	  [\w+=\-.!]+@[\w\-]+(\.[\w\-]+)+
+	    ><
+	      &link($&, "mailto:$&")
+		>egix;
+    } $_;
 
-	    # get manpage specs as link ..
-	    if (defined($mancgi)) {
-		$string =~ s`\b([a-zA-Z]\w+)\(([0-9n])\)\B`&link($&, sprintf($mancgi, $2, $1))`ge; # `
-	    }
+    if ($extra) {
+	# get PR #'s as link: "PR#nnnn" "PR: nnnn, ..." "PR nnnn, ..." "bin/nnnn"
+	if (defined($prcgi) && defined($re_prcategories) && defined($re_prkeyword)) {
+	    my $prev;
+
+	    do {
+		$prev = $_;
+
+		$_ = htmlify_sub {
+		    s{
+		      (\b$re_prkeyword[:\#]?\s*
+		       (?:
+			\#?
+			\d+[,\s]\s*
+		       )*
+		       \#?)
+		      (\d+)\b
+		     }{
+			 $1 . &link($2, sprintf($prcgi, $2))
+		     }egix;
+		} $_;
+	    } while ($_ ne $prev);
+
+	    $_ = htmlify_sub {
+		s{
+		  (\b$re_prcategories/(\d+)\b)
+		 }{
+		     &link($1, sprintf($prcgi, $2))
+		 }egox;
+	    } $_;
 	}
 
-	return $string;
+	# 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, defined($3) ? $3 : $4, $2))
+		 }egx;
+	    } $_;
+	}
+    }
+
+    $_;
 }
 
 sub spacedHtmlText($;$) {
@@ -966,9 +1224,11 @@ sub spacedHtmlText($;$) {
 }
 
 sub link($$) {
-	my($name, $where) = @_;
+	my($name, $url) = @_;
 
-	return "<A HREF=\"$where\">$name</A>\n";
+	$url =~ s/:/sprintf("%%%02x", ord($&))/eg if $url =~ /^[^a-z]/;	# relative
+
+	sprintf '<A HREF="%s">%s</A>', hrefquote($url), $name;
 }
 
 sub revcmp($$) {
@@ -1016,7 +1276,7 @@ sub redirect($) {
 		print "Location: $url\r\n";
 	}
 	html_header("Moved");
-	print "This document is located <A HREF=$url>here</A>.\n";
+	print "This document is located ", &link('here', $url), "\n";
 	print &html_footer;
 	exit(1);
 }
@@ -1042,14 +1302,26 @@ sub safeglob($) {
 		$glob =~ s/{([^}]+)}/($t = $1) =~ s-,-|-g; "($t)"/eg;
 		foreach (readdir($dh)) {
 			if (/^${glob}$/) {
-				push(@results, $dirname . "/" .$_);
+				push(@results, "$dirname/" .$_);
 			}
 		}
+ 		closedir($dh);
 	}
 
 	@results;
 }
 
+sub search_path($) {
+    my($command) = @_;
+    my $d;
+
+    for $d (split(/:/, $command_path)) {
+	return "$d/$command" if -x "$d/$command";
+    }
+
+    $command;
+}
+
 sub getMimeTypeFromSuffix($) {
     my ($fullname) = @_;
     my ($mimetype, $suffix);
@@ -1123,7 +1395,7 @@ sub doAnnotate($$) {
     my $reader = do {local(*FH);};
     my $writer = do {local(*FH);};
 
-    # make sure the revisions a wellformed, for security
+    # make sure the revisions are wellformed, for security
     # reasons ..
     if ($rev =~ /[^\w.]/) {
 	&fatal("404 Not Found",
@@ -1133,11 +1405,6 @@ 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
 
@@ -1147,8 +1414,8 @@ 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 server") || fatal ("500 Internal Error",
-							       "Fatal Error - unable to open cvs for annotation");
+    $pid = open2($reader, $writer, $CMD{cvs}, @cvs_options, "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:
     #     Root /home/kingdon/zwork/cvsroot
@@ -1199,6 +1466,11 @@ 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
@@ -1231,40 +1503,48 @@ sub doAnnotate($$) {
 	}
 	elsif ($words[0] eq "M") {
 	    $lineNr++;
-	    my $lrev = substr ($_, 2, 13);
-	    my $lusr = substr ($_, 16,  9);
-	    my $line = substr ($_, 36);
+	    (my $lrev = substr($_, 2, 13)) =~ y/ //d;
+	    (my $lusr = substr($_, 16,  9)) =~ y/ //d;
+	    my $line = substr($_, 36);
+	    my $isCurrentRev = ($rev eq $lrev);
 	    # we should parse the date here ..
 	    if ($lrev eq $oldLrev) {
-		$revprint = "             ";
+		$revprint = sprintf('%-8s', '');
 	    }
 	    else {
-		$revprint = $lrev; $oldLusr = "";
-		$revprint =~ s`^(\S+)`<a href="${scriptwhere}${barequery}#rev$1">$1</A>`;	# `		
+		$revprint = sprintf('%-8s', $lrev);
+		$revprint =~ s`\S+`&link($&, "$scriptwhere$query#rev$&")`e;	# `
+		$oldLusr = '';
 	    }
 	    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);
 
-	    print "<b>" if ($isCurrentRev);
-	    printf ("%8s%s%8s %4d:", $revprint, ($isCurrentRev ? "|" : " "), $usrprint, $lineNr);
+	    # 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);
+
+	    print "</b>" if ($isCurrentRev && $is_textbased);
 	}
 	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) {
@@ -1326,9 +1606,14 @@ sub doCheckout($$) {
     #
     # Safely for a child process to read from.
     if (! open($fh, "-|")) { # child
-      open(STDERR, ">&STDOUT"); # Redirect stderr to stdout
-      exec("cvs", "-Rld", $cvsroot, "co", "-p", $revopt, $where);
+	open(STDERR, ">&STDOUT"); # Redirect stderr to stdout
+	exec($CMD{cvs}, @cvs_options, '-d', $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
@@ -1348,12 +1633,7 @@ sub doCheckout($$) {
     }
     if ($filename ne $where) {
 	&fatal("500 Internal Error",
-	       "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>");
+	       "Unexpected output from cvs co: $cvsheader");
     }
     $| = 1;
 
@@ -1381,12 +1661,14 @@ sub cvswebMarkup($$$) {
     print "<HR noshade>";
     print "<table width=\"100%\"><tr><td bgcolor=\"$markupLogColor\">";
     print "File: ", &clickablePath($where, 1);
-    print "&nbsp;";
-    &download_link(urlencode($fileurl), $revision, "(download)");
+    print "&nbsp;(";
+    &download_link($fileurl, $revision, "download");
+    print ")";
     if (!$defaultTextPlain) {
-	print "&nbsp;";
-	&download_link(urlencode($fileurl), $revision, "(as text)",
+	print "&nbsp;(";
+	&download_link($fileurl, $revision, "as text",
 	       "text/plain");
+	print ")";
     }
     print "<BR>\n";
     if ($show_log_in_markup) {
@@ -1402,12 +1684,12 @@ sub cvswebMarkup($$$) {
     my $url = download_url($fileurl, $revision, $mimetype);
     print "<HR noshade>";
     if ($mimetype =~ /^image/) {
-	print "<IMG SRC=\"$url$barequery\"><BR>";
+	printf '<IMG SRC="%s"><BR>', hrefquote("$url$barequery");
     }
     elsif ($mimetype =~ m%^application/pdf%) {
-	print "<EMBED SRC=\"$url$barequery\" WIDTH=\"100%\"><BR>";
+	printf '<EMBED SRC="%s" WIDTH="100%"><BR>', hrefquote("$url$barequery");
     }
-    else {
+    elsif ($preformat_in_markup) {
 	print "<PRE>";
 
 	# prefetch several lines
@@ -1422,6 +1704,13 @@ sub cvswebMarkup($$$) {
 	}
 	print "</PRE>";
     }
+    else {
+	print "<PRE>";
+	while (<$filehandle>) {
+	    print htmlquote($_);
+	}
+	print "</PRE>";
+    }
 }
 
 sub viewable($) {
@@ -1436,7 +1725,7 @@ sub viewable($) {
 sub doDiff($$$$$$) {
 	my($fullname, $r1, $tr1, $r2, $tr2, $f) = @_;
         my $fh = do {local(*FH);};
-	my ($rev1, $rev2, $sym1, $sym2, @difftype, $diffname, $f1, $f2);
+	my ($rev1, $rev2, $sym1, $sym2, $f1, $f2);
 
 	if ($r1 =~ /([^:]+)(:(.+))?/) {
 	    $rev1 = $1;
@@ -1470,42 +1759,24 @@ sub doDiff($$$$$$) {
 	    ($rev1, $sym1) = ($rev2, $sym2);
 	    ($rev2, $sym2) = ($tmp1, $tmp2);
 	}
-	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 {
+	my $difftype = $DIFFTYPES{$f};
+
+	if (!$difftype) {
 	    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 =~ /^[cHhu]$/;
+	    push @difftype, '-p' if $f ne 's';
 
 	    my($re1, $re2);
 
 	    while (($re1, $re2) = each %funcline_regexp) {
 		if ($fullname =~ /$re1/) {
-		    push @difftype, '-F', '$re2';
+		    push @difftype, '-F', $re2;
 		    last;
 		}
 	    }
@@ -1520,7 +1791,7 @@ sub doDiff($$$$$$) {
 	}
 	if (! open($fh, "-|")) { # child
 	    open(STDERR, ">&STDOUT"); # Redirect stderr to stdout
-	    exec("rcsdiff",@difftype,"-r$rev1","-r$rev2",$fullname);
+	    exec($CMD{rcsdiff}, @difftype, "-r$rev1", "-r$rev2", $fullname);
 	}
 	if ($human_readable) {
 	    http_header();
@@ -1561,14 +1832,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 $_;
@@ -1601,32 +1872,30 @@ sub getDirLogs($$@) {
 	return;
     }
 
-    if ($tag) {
+    if (defined($tag)) {
 	#can't use -r<tag> as - is allowed in tagnames, but misinterpreated by rlog..
 	if (! open($fh, "-|")) {
-		open(STDERR, '>/dev/null'); # rlog may complain; ignore.
-		exec('rlog', @files);
+	    open(STDERR, '>/dev/null'); # rlog may complain; ignore.
+	    exec($CMD{rlog}, @files);
 	}
     }
     else {
-    	my $kidpid = open($fh, "-|");
-	if (! $kidpid) {
-		open(STDERR, '>/dev/null'); # rlog may complain; ignore.
-		exec('rlog', '-r', @files);
+	if (! open($fh, "-|")) {
+	    open(STDERR, '>/dev/null'); # rlog may complain; ignore.
+	    exec($CMD{rlog}, '-r', @files);
 	}
     }
     $state = "start";
     while (<$fh>) {
 	if ($state eq "start") {
 	    #Next file. Initialize file variables
-	    $rev = undef;
-	    $revwanted = undef;
-	    $branch = undef;
-	    $branchpoint = undef;
-	    $filename = undef;
-	    $log = undef;
-	    $revision = undef;
-	    $branch = undef;
+	    $rev = '';
+	    $revwanted = '';
+	    $branch = '';
+	    $branchpoint = '';
+	    $filename = '';
+	    $log = '';
+	    $revision = '';
 	    %symrev = ();
 	    @filetags = ();
 	    #jump to head state
@@ -1636,72 +1905,74 @@ sub getDirLogs($$@) {
 again:
 	if ($state eq "head") {
 	    #$rcsfile = $1 if (/^RCS file: (.+)$/); #not used (yet)
-	    $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");
+
+	    if (/^Working file: (.+)$/) {
+		$filename = $1;
+	    } elsif (/^head: (.+)$/) {
+		$head = $1;
+	    } elsif (/^branch: (.+)$/) {
+		$branch = $1 
+	    } elsif (/^symbolic names:/) {
+		$state = "tags";
+		($branch = $head) =~ s/\.\d+$// if $branch eq '';
+		$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 = '';
+		$date = '';
+		$log = '';
+		# Try to reconstruct the relative filename if RCS spits out a full path
+		$filename =~ s%^\Q$DirName\E/%%;
+	    }
 	    next;
 	}
-	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";
+	if ($state eq "tags") {
+	    if (/^\s+(.+):\s+([\d\.]+)\s+$/) {
+		push (@filetags, $1);
+		$symrev{$1} = $2;
+		$alltags{$1} = 1;
 		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 = '' 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" && /^----------------------------$/) {
-	    $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 (/^----------------------------$/
-		|| /^=============================/) {
+	    if (/$LOG_REVSEPARATOR/o || /$LOG_FILESEPARATOR/o) {
 		# 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);
-		if (!defined($revwanted) && defined($branch)
+		my $revbranch = $rev;
+		$revbranch =~ s/\.\d+$//;
+		print "$filename $rev Wanted: $revwanted ",
+		  "Revbranch: $revbranch Branch: $branch ",
+		    "Branchpoint: $branchpoint\n" if ($verbose);
+		if ($revwanted eq '' && $branch ne ''
 		    && $branch eq $revbranch || !defined($tag)) {
 		    print "File revision $rev found for branch $branch\n"
 			if ($verbose);
 		    $revwanted = $rev;
 		}
-		if (defined($revwanted) ? $rev eq $revwanted :
-		    defined($branchpoint) ? $rev eq $branchpoint :
+		if ($revwanted ne '' ? $rev eq $revwanted :
+		    $branchpoint ne '' ? $rev eq $branchpoint :
 		    0 && ($rev eq $head)) { # Don't think head is needed here..
 		    print "File info $rev found for $filename\n" if ($verbose);
 		    my @finfo = ($rev,$date,$log,$author,$filename);
@@ -1710,11 +1981,11 @@ again:
 		    $fileinfo{$name} = [ @finfo ];
 		    $state = "done" if ($rev eq $revwanted);
 		}
-		$rev = undef;
-		$date = undef;
-		$log = "";
+		$rev = '';
+		$date = '';
+		$log = '';
 	    }
-	    elsif (!defined($date) && m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);|) {
+	    elsif ($date eq '' && m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);|) {
 		my $yr = $1;
 		# damn 2-digit year routines :-)
 		if ($yr > 100) {
@@ -1726,22 +1997,22 @@ again:
 		$log = '';
 		next;
 	    }
-	    elsif (!defined($rev) && m/^revision (.*)$/) {
+	    elsif ($rev eq '' && /^revision (.*)$/) {
 		$rev = $1;
 		next;
 	    }
 	    else {
-		$log = $log . $_;
+		$log .= $_;
 	    }
 	}
-	if (/^===============/) {
+	if (/$LOG_FILESEPARATOR/o) {
 	    $state = "start";
 	    next;
 	}
     }
     if ($. == 0) {
 	fatal("500 Internal Error",
-	      "Failed to spawn GNU rlog on <em>'".join(", ", @files)."'</em><p>did you set the <b>\$ENV{PATH}</b> in your configuration file correctly ?");
+	      "Failed to spawn GNU rlog on <em>'".join(", ", @files)."'</em><p>Did you set the <b>\$command_path</b> in your configuration file correctly ? (Currently '$command_path'");
     }
     close($fh);
 }
@@ -1769,12 +2040,12 @@ sub readLog($;$) {
 
 	print("Going to rlog '$fullname'\n") if ($verbose);
 	if (! open($fh, "-|")) { # child
-		if ($revision ne '') {
-			exec("rlog",$revision,$fullname);
-		}
-		else {
-			exec("rlog",$fullname);
-		}
+	    if ($revision ne '') {
+		exec($CMD{rlog}, $revision, $fullname);
+	    }
+	    else {
+		exec($CMD{rlog}, $fullname);
+	    }
 	}
 	while (<$fh>) {
 	    print if ($verbose);
@@ -1808,7 +2079,7 @@ sub readLog($;$) {
 # log info
 # ----------------------------
 	logentry:
-	while (!/^=========/) {
+	while (!/$LOG_FILESEPARATOR/o) {
 	    $_ = <$fh>;
 	    last logentry if (!defined($_));	# EOF
 	    print "R:", $_ if ($verbose);
@@ -1816,7 +2087,7 @@ sub readLog($;$) {
 		$rev = $1;
 		unshift(@allrevisions,$rev);
 	    }
-	    elsif (/^========/ || /^----------------------------$/) {
+	    elsif (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o) {
 		next logentry;
 	    }
 	    else {
@@ -1850,7 +2121,7 @@ sub readLog($;$) {
 	    while (<$fh>) {
 		print "L:", $_ if ($verbose);
 		next line if (/^branches:\s/);
-		last line if (/^----------------------------$/ || /^=========/);
+		last line if (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o);
 		$log{$rev} .= $_;
 	    }
 	    print "E:", $_ if ($verbose);
@@ -1868,12 +2139,11 @@ 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+)$/${1}0.$2/;
-	revision:
+	($symrev{"MAIN"} = $headrev) =~ s/(\d+)$/0.$1/;
 	foreach $rev (@revorder) {
 	    if ($rev =~ /^(\S*)\.\d+$/ && $headrev eq $1) {
 		$symrev{"HEAD"} = $rev;
-		last revision;
+		last;
 	    }
 	}
 	($symrev{"HEAD"} = $headrev) =~ s/\.\d+$//
@@ -1904,6 +2174,7 @@ 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)
 		#
@@ -1911,14 +2182,13 @@ sub readLog($;$) {
 		$branch = $3;
 		$branchrev = $head . ($head ne "" ? "." : "") . $branch;
 		my $regex;
-		($regex = $branchrev) =~ s/\./\\./g;
+		$regex = quotemeta $branchrev;
 		$rev = $head;
 
-		revision:
 		foreach my $r (@revorder) {
 		    if ($r =~ /^${regex}\b/) {
 			$rev = $branchrev;
-			last revision;
+			last;
 		    }
 		}
 		next if ($rev eq "");
@@ -1974,6 +2244,20 @@ 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) = @_;
@@ -2002,29 +2286,40 @@ 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 " / (";
+		&download_link($fileurl, $_, "download", $mimetype);
+		print ")";
 	    }
 	    if (not $defaultTextPlain) {
-		print " / ";
-		&download_link($fileurl, $_, "(as text)",
-			   "text/plain");
+		print " / (";
+		&download_link($fileurl, $_, "as text", "text/plain");
+		print ")";
 	    }
 	    if (!$defaultViewable) {
-		print " / ";
-		&download_link($fileurl, $_, "(view)", "text/x-cvsweb-markup");
+		print " / (";
+		&download_link($fileurl, $_, "view", "text/x-cvsweb-markup");
+		print ")";
 	    }
 	    if ($allow_annotate) {
-		print " - <a href=\"" . $scriptname . "/" . urlencode($where) . "?annotate=$_$barequery\">";
-		print "annotate</a>";
+		print " - ";
+		print &link('annotate',
+			    sprintf('%s/%s?annotate=%s%s',
+				    $scriptname,
+				    urlencode($where),
+				    $_,
+				    $barequery));
 	    }
 	    # Plus a select link if enabled, and this version isn't selected
 	    if ($allow_version_select) {
 		if ((!defined($input{"r1"}) || $input{"r1"} ne $_)) {
-		    print " - <A HREF=\"${scriptwhere}?r1=$_$barequery" .
-			"\">[select for diffs]</A>\n";
+		    print " - ";
+		    print &link('[select for diffs]',
+				sprintf('%s?r1=%s%s',
+					$scriptwhere,
+					$_,
+					$barequery));
 		}
 		else {
 		    print " - <b>[selected]</b>";
@@ -2039,13 +2334,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>"
@@ -2079,23 +2374,28 @@ sub printLog($;$) {
 	    # Offer diff to previous revision
 	    if ($prev) {
 		$diffrev{$prev} = 1;
-		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";
-		}
+
+		my $url = sprintf('%s.diff?r1=%s&r2=%s%s',
+				  $scriptwhere,
+				  $prev,
+				  $_,
+				  $barequery);
+
+		print " to previous ";
+		printDiffLinks($prev, $url);
 	    }
 	    #
 	    # 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})) {
-		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";
-		}
+		my $url = sprintf('%s.diff?r1=%s&r2=%s%s',
+				  $scriptwhere,
+				  $brp,
+				  $_,
+				  $barequery);
+
+		print " to branchpoint ";
+		printDiffLinks($brp, $url);
 	    }
 	    #
 	    # Plus, if it's on a branch, and it's not a vendor branch,
@@ -2105,44 +2405,45 @@ sub printLog($;$) {
 	    if (/^\d+\.\d+\.\d+/ && !/^1\.1\.1\.\d+$/) {
 		my ($i,$nextmain);
 		for ($i = 0; $i < $#revorder && $revorder[$i] ne $_; $i++){}
-		my (@tmp2) = split(/\./, $_);
+		my @tmp2 = split(/\./, $_);
 		for ($nextmain = ""; $i > 0; $i--) {
-		    my ($next) = $revorder[$i-1];
-		    my (@tmp1) = split(/\./, $next);
-		    if ($#tmp1 < $#tmp2) {
+		    my $next = $revorder[$i-1];
+		    my @tmp1 = split(/\./, $next);
+		    if (@tmp1 < @tmp2) {
 			$nextmain = $next;
 			last;
 		    }
 		    # Only the highest version on a branch should have
 		    # a diff for the "next main".
-		    last if (join(".",@tmp1[0..$#tmp1-1])
-			     eq join(".",@tmp2[0..$#tmp1-1]));
+		    last if (@tmp1 - 1 <= @tmp2 &&
+			     join(".",@tmp1[0..$#tmp1-1]) eq join(".",@tmp2[0..$#tmp1-1]));
 		}
 		if (!defined($diffrev{$nextmain})) {
 		    $diffrev{$nextmain} = 1;
-		    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";
-		    }
+
+		    my $url = sprintf('%s.diff?r1=%s&r2=%s%s',
+				      $scriptwhere,
+				      $nextmain,
+				      $_,
+				      $barequery);
+
+		    print " next main ";
+		    printDiffLinks($nextmain, $url);
 		}
 	    }
 	    # 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";
@@ -2161,11 +2462,10 @@ 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 <<EOF;
-<A HREF="#diff">Request diff between arbitrary revisions</A>
-<HR NOSHADE>
-EOF
+	  " <b>Up to ", &clickablePath($upwhere, 1), "</b><p>\n";
+	print &link('Request diff between arbitrary revisions', '#diff');
+        print '<HR NOSHADE>';
+
 	if ($curbranch) {
 	    print "Default branch: ", ($revsym{$curbranch} || $curbranch);
 	}
@@ -2193,7 +2493,7 @@ EOF
 	print "</A><P>\n";
 	print "<FORM METHOD=\"GET\" ACTION=\"${scriptwhere}.diff\" NAME=\"diff_select\">\n";
         foreach (@stickyvars) {
-	    print "<INPUT TYPE=HIDDEN NAME=\"$_\" VALUE=\"$input{$_}\">\n"
+	    printf('<INPUT TYPE=HIDDEN NAME="%s" VALUE="%s">',  $_, $input{$_})
 		if (defined($input{$_})
 		    && ((!defined($DEFAULTVALUE{$_})
 		         || $input{$_} ne $DEFAULTVALUE{$_})
@@ -2223,8 +2523,8 @@ EOF
 	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) {
@@ -2259,13 +2559,9 @@ EOF
 	print "<TR><TD align=right>";
 	print "<A name=logsort></A>\n";
 	print "Sort log by:</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>";
+	printLogSortSelect($use_java_script);
+	print "</TD>";
 	print "<TD><INPUT TYPE=SUBMIT VALUE=\"  Set  \"></TD>";
 	print "</FORM>\n";
 	print "</TR></TABLE>";
@@ -2335,23 +2631,22 @@ sub human_readable_diff($){
     $date2 = $r2d;
   }
 
-  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 "<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 ", $date1" if (defined($date1));
   print "<br>Tag: $sym1\n" if ($sym1);
-  print "</th>\n";
-  print "<th width=\"50%\" valign=TOP>";
-  print "version $rev2";
+  print "</th>\n",
+    "<th width=\"50%\" valign=TOP>",
+      "version $rev2";
   print ", $date2" if (defined($date2));
   print "<br>Tag: $sym2\n" if ($sym1);
   print "</th>\n";
 
-  my $fs = "<font face=\"$difffontface\" size=\"$difffontsize\">";
-  my $fe = "</font>";
+  my $fs = "<font face=\"$difffontface\" size=\"$difffontsize\"><tt>";
+  my $fe = "</tt></font>";
 
   my $leftRow = 0;
   my $rightRow = 0;
@@ -2467,16 +2762,22 @@ sub human_readable_diff($){
 sub navigateHeader($$$$$) {
     my ($swhere,$path,$filename,$rev,$title) = @_;
     $swhere = "" if ($swhere eq $scriptwhere);
-    $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 "\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\">";
-    print "<tr valign=bottom><td>";
-    print  "<a href=\"$swhere$query#rev$rev\">$backicon";
-    print "</a> <b>Return to ", &link("$filename","$swhere$query#rev$rev")," CVS log";
+    $swhere = './', urlencode($filename) if ($swhere eq "");
+
+    print <<EOF;
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<META name="robots" content="nofollow">
+<!-- knu-cvsweb $cvsweb_revision -->
+<TITLE>$path$filename - $title - $rev</TITLE></HEAD>
+$body_tag_for_src
+<table width="100%" border=0 cellspacing=0 cellpadding=1 bgcolor="$navigationHeaderColor">
+<tr valign=bottom><td>
+EOF
+
+    print &link($backicon, "$swhere$query#rev$rev");
+    print "<b>Return to ", &link($filename,"$swhere$query#rev$rev")," CVS log";
     print "</b> $fileicon</td>";
 
     print "<td align=right>$diricon <b>Up to ", &clickablePath($path, 1), "</b></td>";
@@ -2486,10 +2787,10 @@ sub navigateHeader($$$$$) {
 sub plural_write($$) {
     my ($num,$text) = @_;
     if ($num != 1) {
-	$text = $text . "s";
+	$text .= "s";
     }
     if ($num > 0) {
-	return $num . " " . $text;
+	return join(' ', $num, $text);
     }
     else {
 	return "";
@@ -2533,7 +2834,7 @@ sub readableTime($$) {
 	my $resttime = plural_write(int ($rest / $break),
 				$desc{$break});
 	if ($resttime) {
-	    $retval = $retval . ", " . $resttime;
+	    $retval .= ", $resttime";
 	}
     }
 
@@ -2557,24 +2858,26 @@ sub clickablePath($$) {
 	$retval = "[$cvstree]";
     }
     else {
-	$retval = $retval . " <a href=\"${scriptname}/${query}#dirlist\">[$cvstree]</a>";
+	$retval .= ' ' . &link("[$cvstree]", sprintf('%s/%s#dirlist',
+						     $scriptname,
+						     $query));
 	my $wherepath = '';
 	my ($lastslash) = $pathname =~ m|/$|;
 	foreach (split(/\//, $pathname)) {
-	    $retval = $retval . " / ";
-	    $wherepath = $wherepath . '/' . $_;
+	    $retval .= " / ";
+	    $wherepath .= "/$_";
 	    my ($last) = "$wherepath/" eq "/$pathname"
 		|| $wherepath eq "/$pathname";
 	    if ($clickLast || !$last) {
-		$retval = $retval . "<a href=\"${scriptname}"
-		    . urlencode($wherepath)
-		    . (!$last || $lastslash ? '/' : '')
-		    . ${query}
-	            . (!$last || $lastslash ? "#dirlist" : "")
-		    . "\">$_</a>";
+		$retval .= &link($_, join('',
+					  $scriptname,
+					  urlencode($wherepath),
+					  (!$last || $lastslash ? '/' : ''),
+					  $query,
+					  (!$last || $lastslash ? "#dirlist" : "")));
 	    }
 	    else { # do not make a link to the current dir
-		$retval = $retval .  $_;
+		$retval .= $_;
 	    }
 	}
     }
@@ -2582,13 +2885,7 @@ sub clickablePath($$) {
 }
 
 sub chooseCVSRoot() {
-    my @foo;
-    foreach (sort keys %CVSROOT) {
-	if (-d $CVSROOT{$_}) {
-	    push(@foo, $_);
-	}
-    }
-    if (@foo > 1) {
+    if (2 <= @CVSROOT) {
 	my ($k);
 	print "<form method=\"GET\" action=\"${scriptwhere}\">\n";
 	foreach $k (keys %input) {
@@ -2603,20 +2900,26 @@ sub chooseCVSRoot() {
 	print "<td>\n<select name=\"cvsroot\"";
 	print " onchange=\"submit()\"" if ($use_java_script);
 	print ">\n";
-	foreach $k (@foo) {
+	foreach $k (@CVSROOT) {
 	    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>";
-	print "</tr></table></form>";
+	print "<td>";
     }
     else {
 	# no choice ..
 	print "CVS Root: <b>[$cvstree]</b>";
     }
+
+    print " Module path or alias:\n";
+    print "<INPUT TYPE=TEXT NAME=\"path\" VALUE=\"\" SIZE=15>\n";
+    print "<input type=submit value=\"Go\">";
+
+    if (2 <= @CVSROOT) {
+	print "</td></tr></table></form>";
+    }
 }
 
 sub chooseMirror() {
@@ -2631,7 +2934,7 @@ sub chooseMirror() {
 	print "\nThis cvsweb is mirrored in:\n";
 	foreach $mirror (keys %MIRRORS) {
 	    print ", " if ($moremirrors);
-	    print qq(<a href="$MIRRORS{$mirror}">$mirror</A>\n);
+	    print &link(htmlquote($mirror),$MIRRORS{$mirror});
 	    $moremirrors = 1;
 	}
 	print "<p>\n";
@@ -2674,32 +2977,30 @@ sub download_url($$;$) {
 
     $revision =~ s/\b0\.//;
 
-    if (defined($checkout_magic)
+    if (defined($checkoutMagic)
 	&& (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) {
-	my ($path);
-	($path = $where) =~ s|/[^/]*$|/|;
+	my $path = $where;
+	$path =~ s|/[^/]*$|/|;
 	$url = "$scriptname/$checkoutMagic/${path}$url";
     }
     $url .= "?rev=$revision";
-    $url .= "&amp;content-type=$mimetype" if (defined($mimetype));
+    $url .= '&content-type=' . urlencode($mimetype) if (defined($mimetype));
 
-    return $url;
+    $url;
 }
 
 # Presents a link to download the
 # selected revision
 sub download_link($$$;$) {
-    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 "\"";
+    my ($url, $revision, $textlink, $mimetype) = @_;
+    my ($fullurl) = download_url($url, $revision, $mimetype);
+
+    $fullurl =~ s/:/sprintf("%%%02x", ord($&))/eg;
+
+    printf '<A HREF="%s"', hrefquote("$fullurl$barequery");
+
     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
@@ -2718,17 +3019,22 @@ sub download_link($$$;$) {
 	# currently, the best way is to comment out the size parameters
 	# ($extern_window...) in cvsweb.conf.
 	if ($use_java_script) {
-	    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"');\"";
+	    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');"`,
+	      hrefquote($fullurl), join(',', @attr);
 	}
     }
     print "><b>$textlink</b></A>";
-    print ")" if ($paren);
 }
 
 # Returns a Query string with the
@@ -2750,7 +3056,7 @@ sub toggleQuery($$) {
 	my ($value) = defined($vars{$var}) ? $vars{$var} : "";
 	my ($default) = defined($DEFAULTVALUE{$var}) ? $DEFAULTVALUE{$var} : "";
 	if ($value ne $default) {
-	    $newquery .= "&amp;" if ($newquery ne "");
+	    $newquery .= "&" if ($newquery ne "");
 	    $newquery .= urlencode($var) . "=" . urlencode($value);
 	}
     }
@@ -2761,20 +3067,57 @@ sub toggleQuery($$) {
 }
 
 sub urlencode($) {
-    my ($in) = @_;
-    my ($out);
-    ($out = $in) =~ s/([\000-+{-\377])/sprintf("%%%02x", ord($1))/ge;
-    return $out;
+    local($_) = @_;
+
+    s/[\000-+{-\377]/sprintf("%%%02x", ord($&))/ge;
+
+    $_;
 }
 
+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 hrefquote($) {
+    local($_) = @_;
+
+    y/ /+/;
+
+    htmlquote($_)
+}
+
 sub http_header(;$) {
     my $content_type = shift || "text/html";
+
+    $content_type .= "; charset=$charset"
+      if $content_type =~ m,^text/, && defined($charset) && $charset;
+
     if (defined($moddate)) {
 	if ($is_mod_perl) {
 	    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) {
@@ -2784,7 +3127,7 @@ sub http_header(;$) {
 	    print "Content-type: $content_type\r\n";
     }
     if ($allow_compress && $maycompress) {
-	if ($has_zlib || (defined($GZIPBIN) && open(GZIP, "|$GZIPBIN -1 -c"))) {
+	if ($has_zlib || (defined($CMD{gzip}) && open(GZIP, "| $CMD{gzip} -1 -c"))) {
 	    if ($is_mod_perl) {
 		    Apache->request->content_encoding("x-gzip");
 		    Apache->request->header_out(Vary => "Accept-Encoding");
@@ -2801,7 +3144,7 @@ sub http_header(;$) {
 	    }
 	    select(GZIP);
 	    $gzip_open = 1;
-#	    print "<!-- gzipped -->" if ($content_type eq "text/html");
+#	    print "<!-- gzipped -->" if ($content_type =~ m|^text/html\b|);
 	}
 	else {
 	    if ($is_mod_perl) {
@@ -2810,7 +3153,7 @@ sub http_header(;$) {
 	    else {
 		    print "\r\n"; # Close headers
 	    }
-	    print "<font size=-1>Unable to find gzip binary in the \$PATH to compress output</font><br>";
+	    print "<font size=-1>Unable to find gzip binary in the <b>\$command_path</b> ($command_path) to compress output</font><br>";
 	}
     }
     else {
@@ -2825,14 +3168,15 @@ sub http_header(;$) {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.103 $  $kRevision: 1.26 $'; #'
-    http_header();
+    http_header("text/html");
     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 -->
+<!-- knu-cvsweb $cvsweb_revision -->
 </head>
 $body_tag
 $logo <h1 align="center">$title</h1>
@@ -2849,14 +3193,13 @@ sub link_tags($) {
     my ($fileurl,$filename);
 
     ($filename = $where) =~ s/^.*\///;
-    $fileurl = urlencode($filename);
+    $fileurl = './' . urlencode($filename);
 
     foreach my $sym (split(", ", $tags)) {
 	$ret .= ",\n" if ($ret ne "");
-	$ret .= "<A HREF=\"$fileurl"
-		. toggleQuery('only_with_tag',$sym) . "\">$sym</A>";
+	$ret .= &link($sym, $fileurl . toggleQuery('only_with_tag',$sym));
     }
-    return $ret."\n";
+    return "$ret\n";
 }
 
 #