===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.1.1.10
retrieving revision 3.31
diff -u -p -r1.1.1.10 -r3.31
--- cvsweb/cvsweb.cgi	2000/10/07 07:50:18	1.1.1.10
+++ cvsweb/cvsweb.cgi	2000/10/02 19:07:08	3.31
@@ -43,7 +43,7 @@
 # SUCH DAMAGE.
 #
 # $zId: cvsweb.cgi,v 1.103 2000/09/20 17:02:29 jumager Exp $
-# $kId: cvsweb.cgi,v 1.33 2000/10/07 07:44:12 knu Exp $
+# $Id: cvsweb.cgi,v 3.31 2000/10/02 19:07:08 knu Exp $
 #
 ###
 
@@ -79,7 +79,6 @@ use vars qw (
     $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($);
@@ -160,9 +159,6 @@ $checkout_magic = $show_subdir_lastmod = $show_log_in_
 $navigationHeaderColor = $tableBorderColor = $markupLogColor =
 $tabstop = $use_moddate = $moddate = $gzip_open = undef;
 
-$LOG_FILESEPARATOR = q/^={77}$/;
-$LOG_REVSEPARATOR = q/^-{28}$/;
-
 ##### End of configuration variables #####
 
 use Time::Local;
@@ -288,7 +284,7 @@ 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{$_}));
+	push @barequery, join('=', urlencode($_), urlencode($input{$_});
     }
 }
 # is there any query ?
@@ -348,7 +344,7 @@ if ($input{'cvsroot'} && $CVSROOT{$input{'cvsroot'}}) 
 $cvsroot = $CVSROOT{$cvstree};
 
 # create icons out of description
-my $k;
+my $k
 foreach $k (keys %ICONS) {
     no strict 'refs';
     my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}};
@@ -936,13 +932,13 @@ sub htmlify($;$) {
 	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;	# `;
+		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 manpage specs as link ..
 	    if (defined($mancgi)) {
-		$string =~ s`\b([a-zA-Z]\w+)(?:\(([0-9n])\)\B|\.([0-9n])\b)`&link($&, sprintf($mancgi, $2 ne '' ? $2 : $3, $1))`ge; # `x;
+		$string =~ s`\b([a-zA-Z]\w+)\(([0-9n])\)\B`&link($&, sprintf($mancgi, $2, $1))`ge; # `
 	    }
 	}
 
@@ -982,7 +978,7 @@ sub spacedHtmlText($;$) {
 sub link($$) {
 	my($name, $where) = @_;
 
-	return "<A HREF=\"$where\">$name</A>";
+	return "<A HREF=\"$where\">$name</A>\n";
 }
 
 sub revcmp($$) {
@@ -1272,11 +1268,11 @@ sub doAnnotate($$) {
 	    # so it looks irregular.
 	    print "<b>" if ($isCurrentRev && $is_textbased);
 
-	    printf "%s%s %-8s %4d:",
+	    printf ("%s%s %-8s %4d:",
 		    $revprint,
 		    $isCurrentRev ? '!' : ' ',
 		    $usrprint,
-		    $lineNr;
+		    $lineNr);
 	    print spacedHtmlText($line, $d{'tabstop'});
 
 	    print "</b>" if ($isCurrentRev && $is_textbased);
@@ -1698,7 +1694,7 @@ again:
 	    $state = "head";
 	    goto again;
 	}
-	if ($state eq "head" && /$LOG_REVSEPARATOR/o) {
+	if ($state eq "head" && /^----------------------------$/) {
 	    $state = "log";
 	    $rev = undef;
 	    $date = undef;
@@ -1708,7 +1704,8 @@ 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+$//;
@@ -1755,7 +1752,7 @@ again:
 		$log = $log . $_;
 	    }
 	}
-	if (/$LOG_FILESEPARATOR/o) {
+	if (/^===============/) {
 	    $state = "start";
 	    next;
 	}
@@ -1829,7 +1826,7 @@ sub readLog($;$) {
 # log info
 # ----------------------------
 	logentry:
-	while (!/$LOG_FILESEPARATOR/o) {
+	while (!/^=========/) {
 	    $_ = <$fh>;
 	    last logentry if (!defined($_));	# EOF
 	    print "R:", $_ if ($verbose);
@@ -1837,7 +1834,7 @@ sub readLog($;$) {
 		$rev = $1;
 		unshift(@allrevisions,$rev);
 	    }
-	    elsif (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o) {
+	    elsif (/^========/ || /^----------------------------$/) {
 		next logentry;
 	    }
 	    else {
@@ -1871,7 +1868,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);
@@ -2491,7 +2488,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 $zRevision: 1.103 $  $kRevision: 1.33 $ -->';
+    print '<!-- CVSweb $zRevision: 1.103 $  $Revision: 3.31 $ -->';
     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\">";
@@ -2846,7 +2843,7 @@ sub http_header(;$) {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.103 $  $kRevision: 1.33 $'; #'
+    my $version = '$zRevision: 1.103 $  $Revision: 3.31 $'; #'
     http_header();
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"