From owner-freebsd-cvsweb@FreeBSD.ORG  Mon Feb 23 11:26:53 2004
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 780B216A4CE
	for <freebsd-cvsweb@FreeBSD.org>;
	Mon, 23 Feb 2004 11:26:53 -0800 (PST)
Received: from smtp3.pp.htv.fi (smtp3.pp.htv.fi [213.243.153.173])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 461A843D1F
	for <freebsd-cvsweb@FreeBSD.org>;
	Mon, 23 Feb 2004 11:26:53 -0800 (PST)
	(envelope-from scop@FreeBSD.org)
Received: from posti.pp.htv.fi (posti.pp.htv.fi [212.90.64.50])
	by smtp3.pp.htv.fi (Postfix) with ESMTP id 1E05F27C0EF
	for <freebsd-cvsweb@FreeBSD.org>;
	Mon, 23 Feb 2004 21:26:52 +0200 (EET)
Received: from [62.78.131.215] (cs78131215.pp.htv.fi [62.78.131.215])
	/8.11.1) with ESMTP id i1NJQph06856	for <freebsd-cvsweb@freebsd.org>;
	Mon, 23 Feb 2004 21:26:51 +0200 (EET)
From: Ville =?ISO-8859-1?Q?Skytt=E4?= <scop@FreeBSD.org>
To: freebsd-cvsweb@FreeBSD.org
In-Reply-To: <4039F04F.7030504@alumni.rice.edu>
References: <4039F04F.7030504@alumni.rice.edu>
Content-Type: multipart/mixed; boundary="=-99CIFUAfevnjpF+M5rD0"
Organization: FreeBSD
Message-Id: <1077564410.14512.74.camel@bobcat.mine.nu>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-7) 
Date: Mon, 23 Feb 2004 21:26:50 +0200
Subject: Re: "f" => "sc" gives diff error
X-BeenThere: freebsd-cvsweb@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS Web maintenance mailing list <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>
X-List-Received-Date: Mon, 23 Feb 2004 19:26:53 -0000


--=-99CIFUAfevnjpF+M5rD0
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

On Mon, 2004-02-23 at 14:21, Jon Noack wrote:
> Setting "f" => "sc" results in this error when attempting to view a 
> preferred diff:
> /usr/bin/diff: conflicting specifications of output style
[...]
> diff - GNU diffutils version 2.7 (FreeBSD base system)

Yep, with Enscript colored side by side diffs, the -p option is
erroneously passed to rcsdiff (and thus to diff).  And diff(1) from
diffutils < 2.8 does not like that, while at least 2.8.1 seems to ignore
it.  A quick fix against CVSweb 2.9.3 is attached.  Thanks for the
report!

--=-99CIFUAfevnjpF+M5rD0
Content-Disposition: inline; filename=cvsweb-sc.patch
Content-Type: text/x-patch; name=cvsweb-sc.patch; charset=iso-8859-1
Content-Transfer-Encoding: 7bit

--- cvsweb.cgi~	2004-02-15 14:31:38.000000000 +0200
+++ cvsweb.cgi	2004-02-23 21:10:43.000000000 +0200
@@ -2314,7 +2314,7 @@
 
   # apply special options
   if ($showfunc) {
-    push @difftype, '-p' if $f ne 's';
+    push @difftype, '-p' if $f !~ /^s/;
 
     my ($re1, $re2);
 

--=-99CIFUAfevnjpF+M5rD0--