===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 3.3
retrieving revision 3.10
diff -u -p -r3.3 -r3.10
--- cvsweb/cvsweb.cgi	2000/07/27 16:16:41	3.3
+++ cvsweb/cvsweb.cgi	2000/08/01 12:42:07	3.10
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -ws
+#!/usr/bin/perl5 -ws
 #
 # cvsweb - a CGI interface to CVS trees.
 #
@@ -12,7 +12,7 @@
 #
 # Based on:
 # * Bill Fenners cvsweb.cgi revision 1.28 available from:
-#   http://www.freebsd.org/cgi/cvsweb.cgi/www/en/cgi/cvsweb.cgi
+#   http://www.FreeBSD.org/cgi/cvsweb.cgi/www/en/cgi/cvsweb.cgi
 #
 # Copyright (c) 1996-1998 Bill Fenner
 #           (c) 1998-1999 Henner Zeller
@@ -41,7 +41,8 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $Id: cvsweb.cgi,v 3.3 2000/07/27 16:16:41 knu Exp $
+# $zId: cvsweb.cgi,v 1.93 2000/07/27 17:42:28 hzeller Exp $
+# $Id: cvsweb.cgi,v 3.10 2000/08/01 12:42:07 knu Exp $
 #
 ###
 
@@ -57,7 +58,7 @@ use vars qw (
     $checkoutMagic $doCheckout $scriptname $scriptwhere
     $where $pathinfo $Browser $nofilelinks $maycompress @stickyvars
     %funcline_regexp $is_mod_perl
-    $is_lynx $is_msie $is_mozilla3
+    $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
@@ -133,12 +134,15 @@ $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_lynx = ($Browser =~ m`^Lynx/`);
+$is_lynx = ($Browser =~ m`^Lynx/`i);
+$is_w3m = ($Browser =~ m`^w3m/`i);
 $is_msie = ($Browser =~ m`MSIE`);
-$is_mozilla3 = ($Browser =~ m`^Mozilla/[3456789]`);
+$is_mozilla3 = ($Browser =~ m`^Mozilla/[3-9]`);
 
-$nofilelinks = $is_lynx;
+$is_textbased = ($is_lynx || $is_w3m);
 
+$nofilelinks = $is_textbased;
+
 # newer browsers accept gzip content encoding
 # and state this in a header
 # (netscape did always but didn't state it)
@@ -158,7 +162,7 @@ $maycompress =(($ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`
 # to hold our state - they will be added (with
 # their current value) to any link/query string 
 # you construct
-@stickyvars = qw(cvsroot hideattic sortby logsort fonly_with_tag);
+@stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag);
 
 if (-f $config) {
     do $config;
@@ -217,8 +221,9 @@ foreach (keys %DEFAULTVALUE)
 $barequery = "";
 foreach (@stickyvars) {
     # construct a query string with the sticky non default parameters set
-    if (defined($input{$_}) && $input{$_} ne "" && $input{$_} ne $DEFAULTVALUE{$_}) { 
-	if ($barequery) {
+    if (defined($input{$_}) && $input{$_} ne '' && 
+	!(defined($DEFAULTVALUE{$_}) && $input{$_} eq $DEFAULTVALUE{$_})) {
+        if ($barequery) {
 	    $barequery = $barequery . "&";
 	}
 	my $thisval = urlencode($_) . "=" . urlencode($input{$_});
@@ -850,8 +855,8 @@ sub htmlify {
 
 	# get #PR as link ..
 	if ($pr && defined($prcgi)) {
-	    1 while $string =~ s`\b(pr[:#]?\s*(?:#?\d+[,\s]\s*)*#?)(\d+)\b`$1<A HREF="$prcgi?pr=$2">$2</A>`i;
-	    $string =~ s`\b${prcategories}/(\d+)\b`<A HREF="$prcgi?pr=$1">$&</A>`igo;
+	    1 while $string =~ s`\b(pr[:#]?\s*(?:#?\d+[,\s]\s*)*#?)(\d+)\b`$1<A HREF="$prcgi$2">$2</A>`i;
+	    $string =~ s`\b${prcategories}/(\d+)\b`<A HREF="$prcgi$1">$&</A>`igo;
 	}
 
 	return $string;
@@ -918,7 +923,7 @@ sub fatal {
 		Apache->request->status((split(/ /, $errcode))[0]);
 	}
 	else {
-		print "Status: $errcode\n";
+		print "Status: $errcode\r\n";
 	}
 	html_header("Error");
 	print "Error: $errmsg\n";
@@ -933,8 +938,8 @@ sub redirect {
 		Apache->request->header_out(Location => $url);
 	}
 	else {
-		print "Status: 301 Moved\n";
-		print "Location: $url\n";
+		print "Status: 301 Moved\r\n";
+		print "Location: $url\r\n";
 	}
 	html_header("Moved");
 	print "This document is located <A HREF=$url>here</A>.\n";
@@ -1468,15 +1473,15 @@ sub getDirLogs {
     if ($tag) {
 	#can't use -r<tag> as - is allowed in tagnames, but misinterpreated by rlog..
 	if (! open($fh, "-|")) {
-		close(STDERR); # rlog may complain; ignore.
-		exec("rlog",@files);
+		open(STDERR, '>/dev/null'); # rlog may complain; ignore.
+		exec('rlog', @files);
 	}
     }
     else {
     	my $kidpid = open($fh, "-|");
 	if (! $kidpid) {
-		close(STDERR); # rlog may complain; ignore.
-		exec("rlog","-r",@files);
+		open(STDERR, '>/dev/null'); # rlog may complain; ignore.
+		exec('rlog', '-r', @files);
 	}
     }
     $state = "start";
@@ -2325,7 +2330,7 @@ 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 $Revision: 3.3 $ -->';
+    print '<!-- CVSweb $zRevision: 1.93 $  $Revision: 3.10 $ -->';
     print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n";
     print  "<BODY BGCOLOR=\"$backcolor\">\n";
     print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">";
@@ -2631,14 +2636,14 @@ sub http_header {
 	    Apache->request->header_out(Last_modified => scalar gmtime($moddate) . " GMT");
 	}
 	else {
-	    print "Last-Modified: " . scalar gmtime($moddate) . " GMT\n";
+	    print "Last-Modified: " . scalar gmtime($moddate) . " GMT\r\n";
 	}
     }
     if ($is_mod_perl) {
 	Apache->request->content_type($content_type);
     }
     else {
-	    print "Content-type: $content_type\n";
+	    print "Content-type: $content_type\r\n";
     }
     if ($allow_compress && $maycompress) {
 	my $fh = do {local(*FH);};
@@ -2649,9 +2654,9 @@ sub http_header {
 		    Apache->request->send_http_header;
 	    }
 	    else {
-		    print "Content-encoding: x-gzip\n";
-		    print "Vary: Accept-Encoding\n";  #RFC 2068, 14.43
-		    print "\n"; # Close headers
+		    print "Content-encoding: x-gzip\r\n";
+		    print "Vary: Accept-Encoding\r\n";  #RFC 2068, 14.43
+		    print "\r\n"; # Close headers
 	    }
 	    $| = 1; $| = 0; # Flush header output
 	    select ($fh);
@@ -2662,7 +2667,7 @@ sub http_header {
 		    Apache->request->send_http_header;
 	    }
 	    else {
-		    print "\n"; # Close headers
+		    print "\r\n"; # Close headers
 	    }
 	    print "<font size=-1>Unable to find gzip binary in the \$PATH to compress output</font><br>";
 	}
@@ -2672,14 +2677,14 @@ sub http_header {
 		    Apache->request->send_http_header;
 	    }
 	    else {
-		    print "\n"; # Close headers
+		    print "\r\n"; # Close headers
 	    }
     }
 }
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$Revision: 3.3 $';
+    my $version = '$zRevision: 1.93 $  $Revision: 3.10 $';
     http_header();
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"