From owner-freebsd-cvsweb@FreeBSD.ORG  Fri May 30 10:28:57 2003
Return-Path: <owner-freebsd-cvsweb@FreeBSD.ORG>
Delivered-To: freebsd-cvsweb@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D414137B405
	for <freebsd-cvsweb@FreeBSD.org>;
	Fri, 30 May 2003 10:28:57 -0700 (PDT)
Received: from bzz.taranis.org (bzz.taranis.org [207.251.100.17])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0F5E343F93
	for <freebsd-cvsweb@FreeBSD.org>;
	Fri, 30 May 2003 10:28:57 -0700 (PDT)
	(envelope-from kalt@taranis.org)
Received: by bzz.taranis.org (Postfix, from userid 100)
	id B9F351104; Fri, 30 May 2003 13:28:55 -0400 (EDT)
From: Christophe Kalt <kalt@taranis.org>
To: freebsd-cvsweb@FreeBSD.org
Message-ID: <20030530172855.GA25514@bzz.taranis.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="Q68bSM7Ycu6FN28Q"
Content-Disposition: inline
User-Agent: Mutt/1.4.1i
X-Spring: flower
X-Mailman-Approved-At: Mon, 16 Jun 2003 16:09:13 -0700
Subject: couple minor bugs
X-BeenThere: freebsd-cvsweb@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS Web maintenance mailing list [restricted posting]
	<freebsd-cvsweb.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-cvsweb>,
	<mailto:freebsd-cvsweb-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-cvsweb>
List-Post: <mailto:freebsd-cvsweb@freebsd.org>
List-Help: <mailto:freebsd-cvsweb-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-cvsweb>,
	<mailto:freebsd-cvsweb-request@freebsd.org?subject=subscribe>
Date: Fri, 30 May 2003 17:28:58 -0000
X-Original-Date: Fri, 30 May 2003 13:28:55 -0400
X-List-Received-Date: Fri, 30 May 2003 17:28:58 -0000


--Q68bSM7Ycu6FN28Q
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

You need to set stdout to be automatically flushed to avoid
having a child (such as cvsgraph) flushing the same content
as the parent a second time.

a "$| = 1;" well placed (may be in BEGIN) does the trick.

The attached diff also fixes a small problem with DoGraphView.

Finally, having working annotations w/o read-write access is
awesome, finally, thanks!  You may want to update the comments
for $allow_annotate.

Christophe

--Q68bSM7Ycu6FN28Q
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="cvsweb.diff"

--- cvsweb.cgi	2003-05-30 12:17:20.171957009 -0400
+++ /tmp/cvsweb.cgi	2003-05-30 13:25:30.821001000 -0400
@@ -136,6 +136,8 @@
   $LOG_REVSEPARATOR  = qr/^-{28}$/o;
 
   $CvsWebMarkupRE = qr/^text\/(x-cvsweb|vnd\.viewcvs)-markup$/io;
+
+  $| = 1;
 }
 
 # -----------------------------------------------------------------------------
@@ -2775,9 +2777,9 @@
   my $mapname = 'CvsGraphMap';
   my $ctype = $defaultViewable ? '&amp;content-type=text/x-cvsweb-markup' : '';
 
-  printf(<<EOF, $title, $mapname, $rev, $title);
+  printf(<<EOF, $title, $mapname, $cvsroot, $rev, $title);
 <h3 style="text-align: center">%s</h3>
-<div align="center"><img border="0" usemap="#%s" src="?graph=%s&amp;makeimage=1" alt="%s"></div>
+<div align="center"><img border="0" usemap="#%s" src="?cvsroot=%s&graph=%s&amp;makeimage=1" alt="%s"></div>
 EOF
 
   my @graph_cmd =

--Q68bSM7Ycu6FN28Q--