From MAILER-DAEMON Thu Feb 04 15:07:28 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Nd7z6-0007k1-Da
	for mharc-bug-diffutils@gnu.org; Thu, 04 Feb 2010 15:07:28 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nd7z4-0007jq-Nk
	for bug-diffutils@gnu.org; Thu, 04 Feb 2010 15:07:26 -0500
Received: from [199.232.76.173] (port=32983 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Nd7z3-0007j2-C9
	for bug-diffutils@gnu.org; Thu, 04 Feb 2010 15:07:25 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <jim@meyering.net>) id 1Nd7z1-00084D-SH
	for bug-diffutils@gnu.org; Thu, 04 Feb 2010 15:07:25 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:50131)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <jim@meyering.net>) id 1Nd7z1-000841-4f
	for bug-diffutils@gnu.org; Thu, 04 Feb 2010 15:07:23 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id A8DED8181BC
	for <bug-diffutils@gnu.org>; Thu,  4 Feb 2010 21:07:19 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id C7319818193
	for <bug-diffutils@gnu.org>; Thu,  4 Feb 2010 21:07:16 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 6ECC921382; Thu,  4 Feb 2010 21:07:16 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Thu, 04 Feb 2010 21:07:16 +0100
Message-ID: <87ljf8ix3f.fsf@meyering.net>
Lines: 48
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3)
Subject: [bug-diffutils] new snapshot available: diffutils-2.8.7.131-cc56
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2010 20:07:27 -0000

A diffutils release is overdue, so here's a snapshot of the latest.
In the absence of new bug reports, I expect to release diffutils-2.9
some time next week.

If distributions are carrying patches that they'd
like to have included, now is the time.  Anyone can
propose patches, but those that include git-format-patch
style diffs, well-written log entries, NEWS updates (when needed),
and added test cases will get especially high priority.


diffutils snapshot: (.gz files are here, too)
  http://meyering.net/diff/diffutils-ss.tar.xz      972 KB
  http://meyering.net/diff/diffutils-ss.tar.xz.sig
  http://meyering.net/diff/diffutils-2.8.7.131-cc56.tar.xz

There are .gz and .sig files here, too:
  http://people.redhat.com/meyering/diff/diffutils-ss.tar.xz
  http://people.redhat.com/meyering/diff/diffutils-2.8.7.131-cc56.tar.xz

Here's the NEWS so far:

** New features

  New diff option --suppress-blank-empty.

  Bring back support for `diff -NUM', where NUM is a number,
  even when conforming to POSIX 1003.1-2001.  This change reverts to
  the behavior of GNU diff 2.7 and earlier.  This is a change only
  when conforming to POSIX 1003.1-2001; there is no effect when
  conforming to older POSIX versions.

  This change is in response to decisions taken in the January 2005
  Austin Group standardization meeting.  For more details, please see
  "Utility Syntax Guidelines" in the Minutes of the January 2005
  Meeting <http://www.opengroup.org/austin/docs/austin_239.html>.

  sdiff now understands '1' and '2' as synonyms for 'l' and 'r'.

** Changes in behavior

  sdiff and diff3 now invoke diff, not $(bindir)/diff

** Administrivia

  New discussion and bug-reporting address: bug-diffutils@gnu.org

  updated gnulib support



From MAILER-DAEMON Tue Feb 09 19:12:24 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Nf0Bs-0006zA-4F
	for mharc-bug-diffutils@gnu.org; Tue, 09 Feb 2010 19:12:24 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NeehK-0006s6-Qk
	for bug-diffutils@gnu.org; Mon, 08 Feb 2010 20:15:26 -0500
Received: from [199.232.76.173] (port=56109 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NeehJ-0006ry-E8
	for bug-diffutils@gnu.org; Mon, 08 Feb 2010 20:15:25 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <gcgdb-bug-diffutils@m.gmane.org>)
	id 1NeehC-0003Fo-S9
	for bug-diffutils@gnu.org; Mon, 08 Feb 2010 20:15:25 -0500
Received: from lo.gmane.org ([80.91.229.12]:47966)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <gcgdb-bug-diffutils@m.gmane.org>) id 1NeehC-0003Fe-I6
	for bug-diffutils@gnu.org; Mon, 08 Feb 2010 20:15:18 -0500
Received: from list by lo.gmane.org with local (Exim 4.69)
	(envelope-from <gcgdb-bug-diffutils@m.gmane.org>) id 1Neegz-0005qb-Lr
	for bug-diffutils@gnu.org; Tue, 09 Feb 2010 02:15:05 +0100
Received: from 65.207.248.83 ([65.207.248.83])
	by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
	id 1AlnuQ-0007hv-00
	for <bug-diffutils@gnu.org>; Tue, 09 Feb 2010 02:15:05 +0100
Received: from mw_triad by 65.207.248.83 with local (Gmexim 0.1 (Debian))
	id 1AlnuQ-0007hv-00
	for <bug-diffutils@gnu.org>; Tue, 09 Feb 2010 02:15:05 +0100
X-Injected-Via-Gmane: http://gmane.org/
To: bug-diffutils@gnu.org
From: Matthew Woehlke <mw_triad@users.sourceforge.net>
Date: Mon, 08 Feb 2010 18:43:21 -0600
Lines: 26
Message-ID: <hkqb37$dkf$1@ger.gmane.org>
References: <87ljf8ix3f.fsf@meyering.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Complaints-To: usenet@ger.gmane.org
X-Gmane-NNTP-Posting-Host: 65.207.248.83
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US;
	rv:1.8.1.23) Gecko/20090825 Fedora/2.0.0.23-1.fc10
	Thunderbird/2.0.0.23 Mnenhy/0.7.5.0
In-Reply-To: <87ljf8ix3f.fsf@meyering.net>
Sender: news <news@ger.gmane.org>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Mailman-Approved-At: Tue, 09 Feb 2010 19:12:22 -0500
Subject: [bug-diffutils] Re: new snapshot available: diffutils-2.8.7.131-cc56
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Feb 2010 01:15:27 -0000

Jim Meyering wrote:
> A diffutils release is overdue, so here's a snapshot of the latest.
> In the absence of new bug reports, I expect to release diffutils-2.9
> some time next week.
>
> diffutils snapshot: (.gz files are here, too)
>    http://meyering.net/diff/diffutils-ss.tar.xz      972 KB
>    http://meyering.net/diff/diffutils-ss.tar.xz.sig
>    http://meyering.net/diff/diffutils-2.8.7.131-cc56.tar.xz

Thanks for making .gz still available; right now I can't extract .xz on 
most boxes on which I build toolchains. (If you don't mind, could you 
point me at the source for what I should be using to extract xz? I got 
lost when it went through various name changes and not having a 
gzip-compatible interface.)

Also, I am happy to report that I was able to successfully build and 
test on Darwin/ppc. This is a significant improvement over 2.8.1 which, 
as I recall, didn't build on Darwin.

-- 
Matthew
Please do not quote my e-mail address unobfuscated in message bodies.
-- 
Q: Why doesn't Fedora provides ponies? -- Benny Amorsen
A: Because they're too big to fit in the bikeshed. -- Mat Booth




From MAILER-DAEMON Tue Feb 09 23:36:31 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Nf4JT-0005xl-MX
	for mharc-bug-diffutils@gnu.org; Tue, 09 Feb 2010 23:36:31 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nf0Yh-00028j-C6
	for bug-diffutils@gnu.org; Tue, 09 Feb 2010 19:35:59 -0500
Received: from [199.232.76.173] (port=43982 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Nf0Yg-00028L-Kf
	for bug-diffutils@gnu.org; Tue, 09 Feb 2010 19:35:58 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <karl@f7.net>) id 1Nf0Yd-0002ax-IK
	for bug-diffutils@gnu.org; Tue, 09 Feb 2010 19:35:58 -0500
Received: from b0.f7.net ([66.148.120.132]:37203 helo=f7.net)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <karl@f7.net>) id 1Nf0Yc-0002aQ-Nf
	for bug-diffutils@gnu.org; Tue, 09 Feb 2010 19:35:55 -0500
X-Envelope-From: karl@f7.net
Received: from f7.net (sls-af11p1 [127.0.0.1])
	by f7.net (8.14.4/8.14.4) with ESMTP id o1A0Zn0P019209;
	Tue, 9 Feb 2010 19:35:52 -0500
Received: (from karl@localhost)
	by f7.net (8.14.4/8.14.4/submit) id o1A0Zn6h019206;
	Wed, 10 Feb 2010 00:35:49 GMT
Date: Wed, 10 Feb 2010 00:35:49 GMT
Message-Id: <201002100035.o1A0Zn6h019206@f7.net>
From: karl@freefriends.org (Karl Berry)
To: mw_triad@users.sourceforge.net
Subject: Re: [bug-diffutils] Re: new snapshot available:
	diffutils-2.8.7.131-cc56
In-Reply-To: <hkqb37$dkf$1@ger.gmane.org>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Mailman-Approved-At: Tue, 09 Feb 2010 23:36:29 -0500
Cc: bug-diffutils@gnu.org
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Feb 2010 00:35:59 -0000

    point me at the source for what I should be using to extract xz? 

http://tukaani.org/xz/



From MAILER-DAEMON Wed Feb 10 02:17:22 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Nf6p8-0002KN-GB
	for mharc-bug-diffutils@gnu.org; Wed, 10 Feb 2010 02:17:22 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nf6p6-0002JW-UI
	for bug-diffutils@gnu.org; Wed, 10 Feb 2010 02:17:20 -0500
Received: from [199.232.76.173] (port=33790 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Nf6p6-0002J3-GJ
	for bug-diffutils@gnu.org; Wed, 10 Feb 2010 02:17:20 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <jim@meyering.net>) id 1Nf6p3-0000kG-Ee
	for bug-diffutils@gnu.org; Wed, 10 Feb 2010 02:17:20 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:34606)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <jim@meyering.net>) id 1Nf6p2-0000k3-K6
	for bug-diffutils@gnu.org; Wed, 10 Feb 2010 02:17:17 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 0227F818047;
	Wed, 10 Feb 2010 08:17:10 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 0BCB28180DA;
	Wed, 10 Feb 2010 08:17:08 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 74A47388CC; Wed, 10 Feb 2010 08:17:07 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: Matthew Woehlke <mw_triad@users.sourceforge.net>
In-Reply-To: <hkqb37$dkf$1@ger.gmane.org> (Matthew Woehlke's message of "Mon, 
	08 Feb 2010 18:43:21 -0600")
References: <87ljf8ix3f.fsf@meyering.net> <hkqb37$dkf$1@ger.gmane.org>
Date: Wed, 10 Feb 2010 08:17:07 +0100
Message-ID: <87tytpmufg.fsf@meyering.net>
Lines: 29
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3)
Cc: bug-diffutils@gnu.org
Subject: [bug-diffutils] Re: new snapshot available: diffutils-2.8.7.131-cc56
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Feb 2010 07:17:21 -0000

Matthew Woehlke wrote:
> Jim Meyering wrote:
>> A diffutils release is overdue, so here's a snapshot of the latest.
>> In the absence of new bug reports, I expect to release diffutils-2.9
>> some time next week.
>>
>> diffutils snapshot: (.gz files are here, too)
>>    http://meyering.net/diff/diffutils-ss.tar.xz      972 KB
>>    http://meyering.net/diff/diffutils-ss.tar.xz.sig
>>    http://meyering.net/diff/diffutils-2.8.7.131-cc56.tar.xz
>
> Thanks for making .gz still available; right now I can't extract .xz
> on most boxes on which I build toolchains. (If you don't mind, could
> you point me at the source for what I should be using to extract xz? I
> got lost when it went through various name changes and not having a
> gzip-compatible interface.)

Use xz-utils.
(first hit for me when I search for "xz")
http://tukaani.org/xz/

BTW, xz, and lzma before it, have always had a gzip-compatible
command-line interface.

> Also, I am happy to report that I was able to successfully build and
> test on Darwin/ppc. This is a significant improvement over 2.8.1
> which, as I recall, didn't build on Darwin.

Thanks for testing.



From MAILER-DAEMON Wed Feb 10 03:17:28 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Nf7lG-0007od-1A
	for mharc-bug-diffutils@gnu.org; Wed, 10 Feb 2010 03:17:26 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nf7l9-0007mi-VP
	for bug-diffutils@gnu.org; Wed, 10 Feb 2010 03:17:20 -0500
Received: from [199.232.76.173] (port=40134 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Nf7l8-0007m6-0u
	for bug-diffutils@gnu.org; Wed, 10 Feb 2010 03:17:18 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <jim@meyering.net>) id 1Nf7l4-0004x9-Tw
	for bug-diffutils@gnu.org; Wed, 10 Feb 2010 03:17:17 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:36982)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <jim@meyering.net>) id 1Nf7l4-0004x1-78
	for bug-diffutils@gnu.org; Wed, 10 Feb 2010 03:17:14 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 394B3818135
	for <bug-diffutils@gnu.org>; Wed, 10 Feb 2010 09:17:10 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 5DA3A81813A
	for <bug-diffutils@gnu.org>; Wed, 10 Feb 2010 09:17:08 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 4294C38182; Wed, 10 Feb 2010 09:17:08 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Wed, 10 Feb 2010 09:17:08 +0100
Message-ID: <87ocjxmrnf.fsf@meyering.net>
Lines: 31
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3)
Subject: [bug-diffutils] [PATCH] portability: avoid "diff - ..." failure at
	least on *BSD and Solaris
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Feb 2010 08:17:21 -0000

FYI, the new "stdin" test was failing on many types of systems.
This fixes it:

>From b50a16567acff496bdf3ac0004809b6dcc88c2d6 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Wed, 10 Feb 2010 09:09:55 +0100
Subject: [PATCH] portability: avoid "diff - ..." failure at least on *BSD and Solaris

The new "stdin" test was failing on many types of systems.
* src/diff.c (compare_files): Guard use of xfreopen (NULL, "rb", ...
also with O_BINARY, so as to avoid this unnecessary call on
systems where it's not needed (on some it fails with "Bad address".
---
 src/diff.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/diff.c b/src/diff.c
index 25ef986..cc1b611 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -1086,7 +1086,7 @@ compare_files (struct comparison const *parent,
 	  else if (STREQ (cmp.file[f].name, "-"))
 	    {
 	      cmp.file[f].desc = STDIN_FILENO;
-	      if (binary && ! isatty (STDIN_FILENO))
+	      if (O_BINARY && binary && ! isatty (STDIN_FILENO))
 		xfreopen (NULL, "rb", stdin);
 	      if (fstat (STDIN_FILENO, &cmp.file[f].stat) != 0)
 		cmp.file[f].desc = ERRNO_ENCODE (errno);
--
1.7.0.rc2.170.gbc565



From MAILER-DAEMON Thu Feb 11 04:45:01 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NfVbZ-0006gt-FF
	for mharc-bug-diffutils@gnu.org; Thu, 11 Feb 2010 04:45:01 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NfVbX-0006gC-W7
	for bug-diffutils@gnu.org; Thu, 11 Feb 2010 04:45:00 -0500
Received: from [199.232.76.173] (port=58920 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NfVbX-0006fr-Lb
	for bug-diffutils@gnu.org; Thu, 11 Feb 2010 04:44:59 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <jim@meyering.net>) id 1NfVbT-00017h-Ne
	for bug-diffutils@gnu.org; Thu, 11 Feb 2010 04:44:58 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:41864)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <jim@meyering.net>) id 1NfVbS-000171-TO
	for bug-diffutils@gnu.org; Thu, 11 Feb 2010 04:44:55 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 6A259818132
	for <bug-diffutils@gnu.org>; Thu, 11 Feb 2010 10:44:49 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 8A300818064
	for <bug-diffutils@gnu.org>; Thu, 11 Feb 2010 10:44:47 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 3C43521262; Thu, 11 Feb 2010 10:44:47 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Thu, 11 Feb 2010 10:44:47 +0100
Message-ID: <87pr4cf6nk.fsf@meyering.net>
Lines: 105
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3)
Subject: [bug-diffutils] [PATCH] doc: document the release procedure
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Feb 2010 09:45:00 -0000

I've just add README-release, to document the release procedure:

>From 3d041c82e82d0cd9f1c3009d0f53d9eb3da77df2 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Thu, 11 Feb 2010 09:06:02 +0100
Subject: [PATCH] doc: document the release procedure

* README-release: New file.
---
 README-release |   84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 84 insertions(+), 0 deletions(-)
 create mode 100644 README-release

diff --git a/README-release b/README-release
new file mode 100644
index 0000000..2aff91b
--- /dev/null
+++ b/README-release
@@ -0,0 +1,84 @@
+Here are most of the steps we (maintainers) follow when making a release.
+
+* start from a clean, up-to-date git directory.
+
+    git checkout master; git pull
+
+* Run ./configure && make maintainer-clean
+
+* Ensure that the desired versions of autoconf, automake, etc.
+  are in your PATH.  See the buildreq list in bootstrap.conf for
+  the complete list.
+
+* Ensure that you're on "master" with no uncommitted diffs.
+  This should produce no output: git checkout master; git diff
+
+* Run bootstrap one last time.  This downloads any new translations:
+
+    ./bootstrap
+
+* Pre-release testing:
+  Ensure that make check syntax-check succeeds.
+
+* Run "make distcheck"
+
+* Set the date, version number, and release type [stable/alpha/beta] on
+  line 3 of NEWS, commit that, and tag the release by running e.g.,
+
+    build-aux/do-release-commit-and-tag 8.1 beta
+
+* Run the following to create release tarballs.  Your choice selects the
+  corresponding upload-to destination in the emitted gnupload command.
+  The different destinations are specified in cfg.mk.  See the definitions
+  of gnu_ftp_host-{alpha,beta,stable}.
+
+    # "TYPE" must be stable, beta or alpha
+    make TYPE
+
+* Test the tarball.  copy it to a few odd-ball systems and ensure that
+  it builds and passes all tests.
+
+* While that's happening, write the release announcement that you will
+  soon post.
+
+Once all the builds and tests have passed,
+
+* Run the gnupload command that was suggested by your "make stable" run above.
+
+* Wait a few minutes (maybe up to 30?) and then use the release URLs to
+  download all tarball/signature pairs and use gpg --verify to ensure
+  that they're all valid.
+
+* Push the NEWS-updating changes and the new tag:
+
+    v=$(cat .prev-version)
+    git push origin master tag v$v
+
+* Send the gpg-signed announcement mail, e.g.,
+
+    To: info-gnu@gnu.org
+    Cc: coordinator@translationproject.org, bug-diffutils@gnu.org
+    Subject: diffutils-2.9 released [stable]
+
+* Announce it on Savannah, too:
+  From here:
+    https://savannah.gnu.org/projects/diffutils/
+  click on the "submit news", then write something like the following:
+  (If there is no such button, then enable "News" for the project via
+   the Main -> "Select Features" menu item, or via this link:
+   https://savannah.gnu.org/project/admin/editgroupfeatures.php?group=diffutils)
+
+    Subject: diffutils-1.3.13 released [stable]
+    The announcement is here:
+      http://article.gmane.org/gmane.comp.gnu.diffutils.bugs/258
+
+  Then go here to approve it:
+    https://savannah.gnu.org/news/approve.php?group=diffutils
+
+* After each non-alpha release, update the on-line manual accessible via
+
+    http://www.gnu.org/software/diffutils/manual/
+
+  by running this:
+
+    build-aux/gnu-web-doc-update
--
1.7.0.rc2.170.gbc565



From MAILER-DAEMON Thu Feb 11 04:48:30 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NfVew-00008t-4M
	for mharc-bug-diffutils@gnu.org; Thu, 11 Feb 2010 04:48:30 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NfVev-000087-3q
	for bug-diffutils@gnu.org; Thu, 11 Feb 2010 04:48:29 -0500
Received: from [199.232.76.173] (port=59006 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NfVeu-00007p-QE
	for bug-diffutils@gnu.org; Thu, 11 Feb 2010 04:48:28 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <jim@meyering.net>) id 1NfVet-0001Uo-Rp
	for bug-diffutils@gnu.org; Thu, 11 Feb 2010 04:48:28 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:50748)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <jim@meyering.net>) id 1NfVet-0001Ue-91
	for bug-diffutils@gnu.org; Thu, 11 Feb 2010 04:48:27 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 3F3BB8181B2
	for <bug-diffutils@gnu.org>; Thu, 11 Feb 2010 10:48:23 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 5D241818173
	for <bug-diffutils@gnu.org>; Thu, 11 Feb 2010 10:48:21 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 465592668E; Thu, 11 Feb 2010 10:48:21 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Thu, 11 Feb 2010 10:48:21 +0100
Message-ID: <87k4ukf6hm.fsf@meyering.net>
Lines: 3
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3)
Subject: [bug-diffutils] diffutils-2.9 today
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Feb 2010 09:48:29 -0000

I've tagged and am going through the steps in README-release.
I will upload and push in a few hours.
There's still time to untag and make additional changes, if needed.



From MAILER-DAEMON Fri Feb 12 15:59:09 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ng2bU-0006yS-Ql
	for mharc-bug-diffutils@gnu.org; Fri, 12 Feb 2010 15:59:08 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ng2bS-0006xT-SS
	for bug-diffutils@gnu.org; Fri, 12 Feb 2010 15:59:06 -0500
Received: from [140.186.70.92] (port=43083 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ng2bS-0006wx-2o
	for bug-diffutils@gnu.org; Fri, 12 Feb 2010 15:59:06 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1Ng2bO-00088K-CP
	for bug-diffutils@gnu.org; Fri, 12 Feb 2010 15:59:06 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:49145)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <jim@meyering.net>)
	id 1Ng2bN-00088B-Nh; Fri, 12 Feb 2010 15:59:02 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 213A1818068;
	Fri, 12 Feb 2010 21:58:55 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 2A286818197;
	Fri, 12 Feb 2010 21:58:53 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 048183860D; Fri, 12 Feb 2010 21:58:53 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: info-gnu@gnu.org
Date: Fri, 12 Feb 2010 21:58:47 +0100
Message-ID: <87y6iyuq60.fsf@meyering.net>
Lines: 79
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
	micalg=pgp-sha256; protocol="application/pgp-signature"
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
Cc: coordinator@translationproject.org, bug-diffutils@gnu.org
Subject: [bug-diffutils] diffutils-2.9 released [stable]
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Feb 2010 20:59:07 -0000

--=-=-=

This is to announce diffutils-2.9.  I'm calling it stable
because not much has changed, in spite of the long interval
since the last release.

Here's the diffutils home page, in case you're wondering what it is:
    http://www.gnu.org/software/diffutils/

*** Note these are not the usual URLs ***

Here are the compressed sources:
  http://meyering.net/diff/diffutils-2.9.tar.gz   (1.7MB)
  http://meyering.net/diff/diffutils-2.9.tar.xz   (976KB)

Here are the GPG detached signatures[*]:
  http://meyering.net/diff/diffutils-2.9.tar.gz.sig
  http://meyering.net/diff/diffutils-2.9.tar.xz.sig

------------------------------------------
Eventually, the usual (following) URLs will become valid,
but for now, I am unable to upload to ftp.gnu.org.

Here are the compressed sources:
  http://ftpmirror.gnu.org/diffutils/diffutils-2.9.tar.gz   (1.7MB)
  http://ftpmirror.gnu.org/diffutils/diffutils-2.9.tar.xz   (976KB)

Here are the GPG detached signatures[*]:
  http://ftpmirror.gnu.org/diffutils/diffutils-2.9.tar.gz.sig
  http://ftpmirror.gnu.org/diffutils/diffutils-2.9.tar.xz.sig

[*] You can use either of the above signature files to verify that
the corresponding file (without the .sig suffix) is intact.  First,
be sure to download both the .sig file and the corresponding tarball.
Then, run a command like this:

  gpg --verify diffutils-2.9.tar.gz.sig

If that command fails because you don't have the required public key,
then run this command to import it:

  gpg --keyserver keys.gnupg.net --recv-keys B9AB9A16

and rerun the `gpg --verify' command.

This release was bootstrapped with the following tools:
  Autoconf 2.65.35-a2889
  Automake 1.11a
  Gnulib v0.0-3425-gde4d0a3

./NEWS

* Noteworthy changes in release 2.9 (2010-02-11) [stable]

** New features

  New diff option --suppress-blank-empty.

  Bring back support for `diff -NUM', where NUM is a number,
  even when conforming to POSIX 1003.1-2001.  This change reverts to
  the behavior of GNU diff 2.7 and earlier.  This is a change only
  when conforming to POSIX 1003.1-2001; there is no effect when
  conforming to older POSIX versions.

  This change is in response to decisions taken in the January 2005
  Austin Group standardization meeting.  For more details, please see
  "Utility Syntax Guidelines" in the Minutes of the January 2005
  Meeting <http://www.opengroup.org/austin/docs/austin_239.html>.

  sdiff now understands '1' and '2' as synonyms for 'l' and 'r'.

** Changes in behavior

  sdiff and diff3 now invoke diff, not $(bindir)/diff

** Administrivia

  New discussion and bug-reporting address: bug-diffutils@gnu.org

  updated gnulib support

--=-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.10-svn4867 (GNU/Linux)

iQIcBAEBCAAGBQJLdcEMAAoJENd//eG5q5oW8pcQAJ+uihcjDxA9KCkBXWYhQ++b
KzWIY6TSkpyTW4UQbgUcpfa4QMRCN55uq7lQjncQxoin2SN0qtGKHlhUNnU1+CO1
Ih3F2rot2luqP0918u4FL7yvB6o9dOH2fELBV49QvV3SLwuPPDZEQ8ltnsoSgevv
pzbvLZHhsvfKhoz+BtGm5Bddl6J9VS3A8Ecm6w3+22WgaybnAoUPAkblVW9/nXjr
3ssP+55w6sU3HiGZ7mm0TjnkaKeImyMfggrA/Dvbg/aNilQljBanfT5K7NK5tS+M
8JQFPMDY9rkOkY9ReycCGjlOJ5ckPHRIxmdR7VOcpAUX2XJaBwwoKyLgzEHnGsjL
OhaOfQahRF/5uKs/RK1nSjDTwUBUoiwj4uu4D1t9aX900N4FGNL9H/njz9FsR8fw
zTS4utdtwOqSxFXLHCCXTRaEOn+etBF7fMz9fLj73SXTGuGLIAY6iiQpltELRsSh
2pXUu/AG0+sLzoHiJSDXbnyGTge5yEU7Y3TAEim8QHbAWrB2B5azpWs4yDC5UwUq
9Uc34B9N+BwPFZqRUeiMbL8YtjGy7QJE+yNLGvuNSFefzuZ4EYMHaCQr3RiQJK/D
uGSsbAdpea+AXKIAprSZ2FBzCe4+9KAggibrl4hrOFFmWoPv4lDQxaUxqbRbMnpu
R/GXuTohb7x/aLxZ2sN8
=mJWf
-----END PGP SIGNATURE-----
--=-=-=--



From MAILER-DAEMON Sun Feb 14 11:57:02 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NghmI-0006WP-80
	for mharc-bug-diffutils@gnu.org; Sun, 14 Feb 2010 11:57:02 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NgRVQ-0006Dt-1I
	for bug-diffutils@gnu.org; Sat, 13 Feb 2010 18:34:32 -0500
Received: from [140.186.70.92] (port=49551 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NgRVP-0006DX-Gf
	for bug-diffutils@gnu.org; Sat, 13 Feb 2010 18:34:31 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <juan.guerrero@gmx.de>) id 1NgRVP-0002qJ-4T
	for bug-diffutils@gnu.org; Sat, 13 Feb 2010 18:34:31 -0500
Received: from mail.gmx.net ([213.165.64.20]:55656)
	by eggs.gnu.org with smtp (Exim 4.69)
	(envelope-from <juan.guerrero@gmx.de>) id 1NgRVO-0002qF-On
	for bug-diffutils@gnu.org; Sat, 13 Feb 2010 18:34:31 -0500
Received: (qmail invoked by alias); 13 Feb 2010 23:34:29 -0000
Received: from HSI-KBW-095-208-010-171.hsi5.kabel-badenwuerttemberg.de (EHLO
	HSI-KBW-095-208-010-171.hsi5.kabel-badenwuerttemberg.de)
	[95.208.10.171]
	by mail.gmx.net (mp048) with SMTP; 14 Feb 2010 00:34:29 +0100
X-Authenticated: #27081556
X-Provags-ID: V01U2FsdGVkX18mEEh2aLom7K5S5wbQr7DkbTaaCxJLHVbJpJELVf
	2gHJa9kqH2FVLN
From: Juan Manuel Guerrero <juan.guerrero@gmx.de>
To: bug-diffutils@gnu.org
Date: Sun, 14 Feb 2010 00:34:02 +0100
User-Agent: KMail/1.9.10
MIME-Version: 1.0
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <201002140034.02718.juan.guerrero@gmx.de>
X-Y-GMX-Trusted: 0
X-FuHaFi: 0.59999999999999998
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Mailman-Approved-At: Sun, 14 Feb 2010 11:56:59 -0500
Subject: [bug-diffutils] Missing argument in shell_quote_copy
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Feb 2010 23:34:32 -0000

I have tried to compile diffutils using a system that uses popen/pclose to
emulate pipe support.  This has failed because the required arguments are not
passed to shell_quote_copy.  See patch below.


Regards,
Juan M. Guerrero


diff -aprNU5 diffutils-2.9.orig/src/sdiff.c diffutils-2.9/src/sdiff.c
--- diffutils-2.9.orig/src/sdiff.c	2010-02-11 09:39:16 +0000
+++ diffutils-2.9/src/sdiff.c	2010-02-14 00:16:30 +0000
@@ -627,11 +627,11 @@ main (int argc, char *argv[])
 	for (i = 0;  diffargv[i];  i++)
 	  cmdsize += shell_quote_length (diffargv[i]) + 1;
 	command = p = xmalloc (cmdsize);
 	for (i = 0;  diffargv[i];  i++)
 	  {
-	    p = shell_quote_copy (diffargv[i]);
+	    p = shell_quote_copy (p, diffargv[i]);
 	    *p++ = ' ';
 	  }
 	p[-1] = 0;
 	errno = 0;
 	diffout = popen (command, "r");
diff -aprNU5 diffutils-2.9.orig/src/util.c diffutils-2.9/src/util.c
--- diffutils-2.9.orig/src/util.c	2010-02-11 09:39:16 +0000
+++ diffutils-2.9/src/util.c	2010-02-14 00:06:30 +0000
@@ -226,11 +226,11 @@ begin_output (void)
 	char *command = xmalloc (sizeof pr_program - 1 + 7
 				 + shell_quote_length (name) + 1);
 	char *p;
 	sprintf (command, "%s -f -h ", pr_program);
 	p = command + sizeof pr_program - 1 + 7;
-	p = shell_quote_copy (name);
+	p = shell_quote_copy (p, name);
 	*p = 0;
 	errno = 0;
 	outfile = popen (command, "w");
 	if (!outfile)
 	  pfatal_with_name (command);



From MAILER-DAEMON Sun Feb 14 12:18:21 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ngi6v-0000JO-B7
	for mharc-bug-diffutils@gnu.org; Sun, 14 Feb 2010 12:18:21 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ngi6t-0000Hz-8V
	for bug-diffutils@gnu.org; Sun, 14 Feb 2010 12:18:19 -0500
Received: from [140.186.70.92] (port=40252 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ngi6s-0000H0-9w
	for bug-diffutils@gnu.org; Sun, 14 Feb 2010 12:18:18 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1Ngi6r-0006wE-24
	for bug-diffutils@gnu.org; Sun, 14 Feb 2010 12:18:17 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:36270)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1Ngi6q-0006w0-CG
	for bug-diffutils@gnu.org; Sun, 14 Feb 2010 12:18:17 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 25914818141
	for <bug-diffutils@gnu.org>; Sun, 14 Feb 2010 18:18:12 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 3F0908180BE
	for <bug-diffutils@gnu.org>; Sun, 14 Feb 2010 18:18:10 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id EBDE254FE3; Sun, 14 Feb 2010 18:18:09 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: Juan Manuel Guerrero <juan.guerrero@gmx.de>
In-Reply-To: <201002140034.02718.juan.guerrero@gmx.de> (Juan Manuel Guerrero's
	message of "Sun, 14 Feb 2010 00:34:02 +0100")
References: <201002140034.02718.juan.guerrero@gmx.de>
Date: Sun, 14 Feb 2010 18:18:09 +0100
Message-ID: <87bpfrbusu.fsf@meyering.net>
Lines: 55
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
Cc: bug-diffutils@gnu.org
Subject: [bug-diffutils] Re: Missing argument in shell_quote_copy
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Feb 2010 17:18:19 -0000

Juan Manuel Guerrero wrote:
> I have tried to compile diffutils using a system that uses popen/pclose to
> emulate pipe support.  This has failed because the required arguments are not
> passed to shell_quote_copy.  See patch below.
>
> diff -aprNU5 diffutils-2.9.orig/src/sdiff.c diffutils-2.9/src/sdiff.c
...
> diff -aprNU5 diffutils-2.9.orig/src/util.c diffutils-2.9/src/util.c
...

Thank you!
I added a log entry and pushed your change:

>From aa56d5f6d086855785d2fe83d148cf090eabee80 Mon Sep 17 00:00:00 2001
From: Juan Manuel Guerrero <juan.guerrero@gmx.de>
Date: Sun, 14 Feb 2010 18:16:25 +0100
Subject: [PATCH] avoid compilation failure on systems lacking both fork and vfork

* src/sdiff.c [!HAVE_WORKING_FORK && !HAVE_WORKING_VFORK] (main):
Pass the right number of arguments to shell_quote_copy.
* src/util.c [!HAVE_WORKING_FORK && !HAVE_WORKING_VFORK] (begin_output):
Likewise.
---
 src/sdiff.c |    2 +-
 src/util.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sdiff.c b/src/sdiff.c
index 84a9a7d..4344e8d 100644
--- a/src/sdiff.c
+++ b/src/sdiff.c
@@ -629,7 +629,7 @@ main (int argc, char *argv[])
 	command = p = xmalloc (cmdsize);
 	for (i = 0;  diffargv[i];  i++)
 	  {
-	    p = shell_quote_copy (diffargv[i]);
+	    p = shell_quote_copy (p, diffargv[i]);
 	    *p++ = ' ';
 	  }
 	p[-1] = 0;
diff --git a/src/util.c b/src/util.c
index 90b463d..3be03e9 100644
--- a/src/util.c
+++ b/src/util.c
@@ -228,7 +228,7 @@ begin_output (void)
 	char *p;
 	sprintf (command, "%s -f -h ", pr_program);
 	p = command + sizeof pr_program - 1 + 7;
-	p = shell_quote_copy (name);
+	p = shell_quote_copy (p, name);
 	*p = 0;
 	errno = 0;
 	outfile = popen (command, "w");
--
1.7.0.169.g57c99



From MAILER-DAEMON Tue Feb 16 07:23:11 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NhMSN-0000Gl-L6
	for mharc-bug-diffutils@gnu.org; Tue, 16 Feb 2010 07:23:11 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NhMSM-0000Eb-7D
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 07:23:10 -0500
Received: from [140.186.70.92] (port=38629 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NhMSL-0000Df-Mb
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 07:23:09 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1NhMSL-0002T7-58
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 07:23:09 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:34521)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1NhMSK-0002Sv-I2
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 07:23:09 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 43B0881810A
	for <bug-diffutils@gnu.org>; Tue, 16 Feb 2010 13:23:04 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 6A6F9818068
	for <bug-diffutils@gnu.org>; Tue, 16 Feb 2010 13:23:02 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id D5967211EF; Tue, 16 Feb 2010 13:23:01 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Tue, 16 Feb 2010 13:23:01 +0100
Message-ID: <878wat4bfe.fsf@meyering.net>
Lines: 15
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
Subject: [bug-diffutils] FYI, pushed a few historical tags
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Feb 2010 12:23:10 -0000

FYI, I've just tagged the following:

    v2.7
    v2.8
    v2.8.3
    v2.8.4
    v2.8.6

Determining which commit corresponded to a release was
not trivial, and for some I made the effort and examined
the corresponding tarball.  For a couple, I simply tagged
what appeared to be the latest-for-that-version commit.

There are many more test releases that remain untagged,
but for now, the above should suffice.



From MAILER-DAEMON Tue Feb 16 21:24:02 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NhZa6-0003c3-9G
	for mharc-bug-diffutils@gnu.org; Tue, 16 Feb 2010 21:24:02 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NhQLu-0008Bb-Iv
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 11:32:46 -0500
Received: from [140.186.70.92] (port=35264 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NhQLt-0008BT-Px
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 11:32:46 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <ehud@unix.mvs.co.il>) id 1NhQLt-0003as-2H
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 11:32:45 -0500
Received: from [193.16.147.12] (port=35902 helo=unix.mvs.co.il)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <ehud@unix.mvs.co.il>) id 1NhQLs-0003aM-Io
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 11:32:45 -0500
Received: from beta.mvs.co.il (beta [10.253.0.3])
	by unix.mvs.co.il (8.13.8/8.13.7) with ESMTP id o1GFtRsm026024;
	Tue, 16 Feb 2010 17:55:28 +0200
Received: from beta.mvs.co.il (localhost [127.0.0.1])
	by beta.mvs.co.il (8.14.1/8.14.1) with ESMTP id o1GFtRYk018373;
	Tue, 16 Feb 2010 17:55:27 +0200
Received: (from root@localhost)
	by beta.mvs.co.il (8.14.1/8.14.1/Submit) id o1GFtQHk018359;
	Tue, 16 Feb 2010 17:55:26 +0200
Date: Tue, 16 Feb 2010 17:55:26 +0200
Message-Id: <201002161555.o1GFtQHk018359@beta.mvs.co.il>
From: "Ehud Karni" <ehud@unix.mvs.co.il>
TO: jim@meyering.net
In-reply-to: <87y6iyuq60.fsf@meyering.net> (message from Jim Meyering on Fri, 
	12 Feb 2010 21:58:47 +0100)
Organization: Mivtach-Simon Insurance agencies
References: <87y6iyuq60.fsf@meyering.net>
X-Mailer: Emacs 21.3.1 rmail (send-msg 1.109)
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-8-i
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6
X-Mailman-Approved-At: Tue, 16 Feb 2010 21:24:00 -0500
Cc: bug-diffutils@gnu.org
Subject: [bug-diffutils] Re: diffutils-2.9 released [stable] - enhancements
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: ehud@unix.mvs.co.il
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Feb 2010 16:32:47 -0000

On Fri, 12 Feb 2010 21:58:47 Jim Meyering wrote:
>
> This is to announce diffutils-2.9.  I'm calling it stable
> because not much has changed, in spite of the long interval
> since the last release.

I added the following enhancements to diff:
  1. Option to compare file by size only - it can save a lot of time
     on directories with a lot of large files (e.g. movies).
     This option is set with -Z (for siZe).
  2. Define that files with different time stamp are different.  This
     option is especially useful when the 1st option (-Z) is used.
     This option is set with -M (for Modification time).

I use these options for over 2 years now, and it is very useful
for comparing directories and directory trees.

The patch below (against the diffutils-2.9 sources) does this
and fix the help of diff (and the man page created by help2man),
but the help.info should be fixed too (which I don't know how do).

Ehud.


diff -c ~/diffutils-2.9/src/diff.h-org ~/diffutils-2.9/src/diff.h
*** ~/diffutils-2.9/src/diff.h-org	Thu Feb 11 11:05:57 2010
--- ~/diffutils-2.9/src/diff.h		Tue Feb 16 15:05:20 2010
***************
*** 138,143 ****
--- 138,139 ----
  /* Say only whether files differ, not how (-q).  */
  XTERN bool brief;

+ /* Check by size only, do not compare files content */
+ XTERN bool check_size_only;
+
+ /* Report files as differ when their modify times are different */
+ XTERN bool check_modify_time;
+
  /* Expand tabs in the output so the text lines up properly
     despite the characters added to the front of each line (-t).  */
  XTERN bool expand_tabs;


diff -c ~/diffutils-2.9/src/diff.c-org ~/diffutils-2.9/src/diff.c
*** ~/diffutils-2.9/src/diff.c-org	Thu Feb 11 11:39:17 2010
--- ~/diffutils-2.9/src/diff.c		Tue Feb 16 15:01:19 2010
***************
*** 106,109 ****
  static bool report_identical_files;
  =0C
  static char const shortopts[] =3D
! "0123456789abBcC:dD:eEfF:hHiI:lL:nNpPqrsS:tTuU:vwW:x:X:y";

  /* Values for long options that do not have single-letter equivalents. =
 */
  enum
--- 106,109 ----
  static bool report_identical_files;
  =0C
  static char const shortopts[] =3D
! "0123456789abBcC:dD:eEfF:hHiI:lL:nMNpPqrsS:tTuU:vwW:x:X:yZ";

  /* Values for long options that do not have single-letter equivalents. =
 */
  enum
***************
*** 160,165 ****
--- 160,167 ----
    {"binary", 0, 0, BINARY_OPTION},
    {"brief", 0, 0, 'q'},
    {"changed-group-format", 1, 0, CHANGED_GROUP_FORMAT_OPTION},
+   {"check-size-only", 0, 0, 'Z'},
+   {"check-modify-time", 0, 0, 'M'},
    {"context", 2, 0, 'C'},
    {"ed", 0, 0, 'e'},
    {"exclude", 1, 0, 'x'},
***************
*** 431,436 ****
--- 433,434 ----
  	    fatal ("too many file label options");
  	  break;

+ 	case 'M':
+ 	  check_modify_time =3D 1;
+ 	  break;
+
  	case 'n':
  	  specify_style (OUTPUT_RCS);
  	  break;
***************
*** 514,519 ****
--- 520,521 ----
  	    }
  	  break;

+ 	case 'Z':
+ 	  check_size_only =3D 1;
+ 	  break;
+
  	case BINARY_OPTION:
  #if O_BINARY
  	  binary =3D true;
***************
*** 712,717 ****
--- 722,722 ----
       : (output_style !=3D OUTPUT_SDIFF) | suppress_common_lines);

    files_can_be_treated_as_binary =3D
+     check_size_only |
      (brief & binary
       & ~ (ignore_blank_lines | ignore_case | strip_trailing_cr
  	  | (ignore_regexp_list.regexps || ignore_white_space)));
***************
*** 856,861 ****
--- 867,874 ----
    N_("--binary  Read and write data in binary mode."),
  #endif
    N_("-a  --text  Treat all files as text."),
+   N_("-Z  --check-size-only   Compare by size only, Ignore byte differe=
nce."),
+   N_("-M  --check-modify-time  Consider different modify time as differ=
ent."),
    "",
    N_("-c  -C NUM  --context[=3DNUM]  Output NUM (default 3) lines of co=
pied context.\n\
  -u  -U NUM  --unified[=3DNUM]  Output NUM (default 3) lines of unified =
context.\n\


diff -c ~/diffutils-2.9/src/analyze.c-org ~/diffutils-2.9/src/analyze.c
*** ~/diffutils-2.9/src/analyze.c-org	Thu Feb 11 11:05:57 2010
--- ~/diffutils-2.9/src/analyze.c	Tue Feb 16 15:11:27 2010
***************
*** 490,495 ****
--- 490,491 ----
        else if (cmp->file[0].desc =3D=3D cmp->file[1].desc)
  	changes =3D 0;

+       /* if different modify time - files differ */
+       else if (check_modify_time
+ 	       && cmp->file[0].stat.st_mtime !=3D cmp->file[1].stat.st_mtime)
+ 	changes =3D 1;
+
+      /* if check size only - already checked */
+       else if (check_size_only)
+ 	changes =3D 0;
+
        else
  	/* Scan both files, a buffer at a time, looking for a difference.  */
  	{
***************
*** 629,634 ****
--- 638,639 ----
        else
  	changes =3D (script !=3D 0);

+       /* if different modify time - files differ */
+       if (check_modify_time &&
+ 	cmp->file[0].stat.st_mtime !=3D cmp->file[1].stat.st_mtime)
+ 	changes =3D 1;
+
        if (brief)
  	changes =3D briefly_report (changes, cmp->file);
        else



--
 Ehud Karni           Tel: +972-3-7966-561  /"\
 Mivtach - Simon      Fax: +972-3-7976-561  \ /  ASCII Ribbon Campaign
 Insurance agencies   (USA) voice mail and   X   Against   HTML   Mail
 http://www.mvs.co.il  FAX:  1-815-5509341  / \
 GnuPG: 98EA398D <http://www.keyserver.net/>    Better Safe Than Sorry



From MAILER-DAEMON Tue Feb 16 21:24:17 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NhZaL-0003fU-Dx
	for mharc-bug-diffutils@gnu.org; Tue, 16 Feb 2010 21:24:17 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NhNRk-0004el-D1
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 08:26:36 -0500
Received: from [140.186.70.92] (port=51858 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NhNRj-0004eH-Bu
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 08:26:35 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <sanvila@unex.es>) id 1NhNRi-0001vM-Ki
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 08:26:35 -0500
Received: from pizarro.unex.es ([158.49.8.2]:40214)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <sanvila@unex.es>) id 1NhNRi-0001vE-DT
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 08:26:34 -0500
Received: from localhost (lavadora.siue [192.168.1.121])
	by pizarro.unex.es (Postfix) with ESMTP id 7D49111931D;
	Tue, 16 Feb 2010 14:26:33 +0100 (CET)
X-Virus-Scanned: Debian amavisd-new at lavadora.unex.es
Received: from pizarro.unex.es ([192.168.1.103])
	by localhost (lavadora.unex.es [192.168.1.121]) (amavisd-new,
	port 10024)
	with ESMTP id dw+KE6c5MXHR; Tue, 16 Feb 2010 14:26:11 +0100 (CET)
Received: from guadiana.unex.es (guadiana.unex.es [158.49.17.23])
	by pizarro.unex.es (Postfix) with ESMTP id 5F28B11931B;
	Tue, 16 Feb 2010 14:26:33 +0100 (CET)
Received: from cantor.unex.es (cantor.unex.es [158.49.50.20])
	by guadiana.unex.es (Postfix) with ESMTP id 56E7C1FF8F;
	Tue, 16 Feb 2010 14:26:33 +0100 (CET)
Date: Tue, 16 Feb 2010 14:26:33 +0100 (CET)
From: Santiago Vila <sanvila@unex.es>
To: bug-diffutils@gnu.org
Message-ID: <Pine.LNX.4.64.1002161406420.26615@cantor.unex.es>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Mailman-Approved-At: Tue, 16 Feb 2010 21:24:15 -0500
Cc: Dpkg Developers <debian-dpkg@lists.debian.org>,
	570064-forwarded@bugs.debian.org, Raphael Hertzog <hertzog@debian.org>
Subject: [bug-diffutils] Bug#570064: diffutils 2.9 breaks dpkg-dev
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Feb 2010 13:26:36 -0000

Hello.

The recent diffutils 2.9 release, which I've uploaded for Debian
unstable, breaks dpkg-dev in a very bad way.

Raphael Hertzog, dpkg developer, has analyzed this issue. What follows
is an abridged version of a previous mail, this time sent to the
preferred address for diffutils bugs.

The source for the breakage is in this commit:

http://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=a352f09806a8606b4bbec07048da6762ce7d9afa

In Raphael's words:

 dpkg-source has been relying this specific output of diff
 since its inception (in the nineties) and I really don't agree with the
 justification of the upstream change. We need a way as users to know
 that one of the file contains binary data, saying "Files differs"
 would lead me to ask myself "but then why don't you show me the difference??".
 The binary indication was fine.

 BTW, Dan Jacobson is known to submit lots of discutable bug reports
 on cosmetic details... but here the impact is much more than cosmetic.
 Paul or Jim, can you revert this change on the uptream side?

 [...]

 Questions for the diff upstream maintainers: what's the best way to call
 diff to detect if diff considers a file as binary?

 Can we rely on "File /dev/null and bar differ" to mean that bar is a
 binary file?


Note: I also would like the change to be reverted.

While it's true that "binary files foo and bar differ" is not
completely true when one of the files is binary and the other is not,
if such message is changed to just "files foo and bar differ" then
there is clearly a loss of information.

Previoulsy, the real meaning of "binary files foo and bar differ" was
really "the files differ, at least one of them is binary so I'm not
showing you the diff".

I would suggest that this clarification is put in the manual instead of
changing the program output.

Alternatively, if the program output needs to be changed, I would suggest
that it's done in a way that does not produce loss of information.

Thanks.



From MAILER-DAEMON Tue Feb 16 21:24:17 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NhZaL-0003fd-Ko
	for mharc-bug-diffutils@gnu.org; Tue, 16 Feb 2010 21:24:17 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NhNiX-0003bw-Nh
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 08:43:57 -0500
Received: from [140.186.70.92] (port=46143 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NhNiX-0003bZ-11
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 08:43:57 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <sanvila@unex.es>) id 1NhNiW-0004SV-Fo
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 08:43:56 -0500
Received: from pizarro.unex.es ([158.49.8.2]:36264)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <sanvila@unex.es>) id 1NhNiW-0004Rx-60
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 08:43:56 -0500
Received: from localhost (lavadora.siue [192.168.1.121])
	by pizarro.unex.es (Postfix) with ESMTP id 27E0011937B;
	Tue, 16 Feb 2010 14:43:55 +0100 (CET)
X-Virus-Scanned: Debian amavisd-new at lavadora.unex.es
Received: from pizarro.unex.es ([192.168.1.103])
	by localhost (lavadora.unex.es [192.168.1.121]) (amavisd-new,
	port 10024)
	with ESMTP id 1it32EbtW6HR; Tue, 16 Feb 2010 14:43:32 +0100 (CET)
Received: from guadiana.unex.es (guadiana.unex.es [158.49.17.23])
	by pizarro.unex.es (Postfix) with ESMTP id 0DE1C119375;
	Tue, 16 Feb 2010 14:43:55 +0100 (CET)
Received: from cantor.unex.es (cantor.unex.es [158.49.50.20])
	by guadiana.unex.es (Postfix) with ESMTP id 063C81FF99;
	Tue, 16 Feb 2010 14:43:54 +0100 (CET)
Date: Tue, 16 Feb 2010 14:43:54 +0100 (CET)
From: Santiago Vila <sanvila@unex.es>
To: bug-diffutils@gnu.org
In-Reply-To: <Pine.LNX.4.64.1002161406420.26615@cantor.unex.es>
Message-ID: <Pine.LNX.4.64.1002161432320.26768@cantor.unex.es>
References: <Pine.LNX.4.64.1002161406420.26615@cantor.unex.es>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Mailman-Approved-At: Tue, 16 Feb 2010 21:24:15 -0500
Cc: 570064@bugs.debian.org, Raphael Hertzog <hertzog@debian.org>,
	Dpkg Developers <debian-dpkg@lists.debian.org>
Subject: [bug-diffutils] Re: Bug#570064: diffutils 2.9 breaks dpkg-dev
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Feb 2010 13:43:58 -0000

Raphael, this is the NEWS entry for the change:

* Diff now simply prints "Files A and B differ" instead of "Binary
  files A and B differ".  The message is output if either A or B
  appears to be a binary file, and the old wording was misleading
  because it implied that both files are binary, which is not
  necessarily the case.

Apparently, diff will show "Files A and B differ" only when at least
one of them is binary, so the "meaning" is the same as before.

My suggestion to avoid data loss would be something like this:

Files A and B differ and at least one of them is binary.

However, as long as the "meaning" is the same (upstream could confirm this)
even if the message is not changed again, I think it should be quite
easy to adapt dpkg-dev to the new behaviour if it's kept that way.


Let's see what upstream think about this.



From MAILER-DAEMON Tue Feb 16 21:24:18 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NhZaM-0003g8-9n
	for mharc-bug-diffutils@gnu.org; Tue, 16 Feb 2010 21:24:18 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NhQQE-0000I7-OQ
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 11:37:14 -0500
Received: from [140.186.70.92] (port=46887 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NhQQE-0000Hy-A2
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 11:37:14 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <sanvila@kolmogorov.unex.es>) id 1NhQQB-0004Ik-Fy
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 11:37:14 -0500
Received: from kolmogorov.unex.es ([158.49.50.5]:57531)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <sanvila@kolmogorov.unex.es>) id 1NhQQB-0004HW-6w
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 11:37:11 -0500
Received: by kolmogorov.unex.es (Postfix, from userid 1000)
	id 889DD23BD1; Tue, 16 Feb 2010 17:37:06 +0100 (CET)
Date: Tue, 16 Feb 2010 14:43:54 +0100 (CET)
From: Santiago Vila <sanvila@unex.es>
To: bug-diffutils@gnu.org
In-Reply-To: <Pine.LNX.4.64.1002161406420.26615@cantor.unex.es>
Message-ID: <Pine.LNX.4.64.1002161432320.26768@cantor.unex.es>
References: <Pine.LNX.4.64.1002161406420.26615@cantor.unex.es>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Status: R
X-Status: 
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Mailman-Approved-At: Tue, 16 Feb 2010 21:24:15 -0500
Cc: 570064@bugs.debian.org, Raphael Hertzog <hertzog@debian.org>,
	Dpkg Developers <debian-dpkg@lists.debian.org>
Subject: [bug-diffutils] Re: Bug#570064: diffutils 2.9 breaks dpkg-dev
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Feb 2010 16:37:15 -0000

Raphael, this is the NEWS entry for the change:

* Diff now simply prints "Files A and B differ" instead of "Binary
  files A and B differ".  The message is output if either A or B
  appears to be a binary file, and the old wording was misleading
  because it implied that both files are binary, which is not
  necessarily the case.

Apparently, diff will show "Files A and B differ" only when at least
one of them is binary, so the "meaning" is the same as before.

My suggestion to avoid data loss would be something like this:

Files A and B differ and at least one of them is binary.

However, as long as the "meaning" is the same (upstream could confirm this)
even if the message is not changed again, I think it should be quite
easy to adapt dpkg-dev to the new behaviour if it's kept that way.


Let's see what upstream think about this.




From MAILER-DAEMON Tue Feb 16 21:24:18 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NhZaM-0003fo-0b
	for mharc-bug-diffutils@gnu.org; Tue, 16 Feb 2010 21:24:18 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NhQQF-0000IJ-3p
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 11:37:15 -0500
Received: from [140.186.70.92] (port=46886 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NhQQE-0000Hx-A2
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 11:37:14 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <sanvila@kolmogorov.unex.es>) id 1NhQQB-0004Ii-Fy
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 11:37:13 -0500
Received: from kolmogorov.unex.es ([158.49.50.5]:57530)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <sanvila@kolmogorov.unex.es>) id 1NhQQB-0004Gq-6x
	for bug-diffutils@gnu.org; Tue, 16 Feb 2010 11:37:11 -0500
Received: by kolmogorov.unex.es (Postfix, from userid 1000)
	id 07DD123BD0; Tue, 16 Feb 2010 17:37:01 +0100 (CET)
Date: Tue, 16 Feb 2010 14:26:33 +0100 (CET)
From: Santiago Vila <sanvila@unex.es>
To: bug-diffutils@gnu.org
Message-ID: <Pine.LNX.4.64.1002161406420.26615@cantor.unex.es>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Status: R
X-Status: A
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Mailman-Approved-At: Tue, 16 Feb 2010 21:24:15 -0500
Cc: Dpkg Developers <debian-dpkg@lists.debian.org>,
	570064-forwarded@bugs.debian.org, Raphael Hertzog <hertzog@debian.org>
Subject: [bug-diffutils] Bug#570064: diffutils 2.9 breaks dpkg-dev
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Feb 2010 16:37:15 -0000

Hello.

The recent diffutils 2.9 release, which I've uploaded for Debian
unstable, breaks dpkg-dev in a very bad way.

Raphael Hertzog, dpkg developer, has analyzed this issue. What follows
is an abridged version of a previous mail, this time sent to the
preferred address for diffutils bugs.

The source for the breakage is in this commit:

http://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=a352f09806a8606b4bbec07048da6762ce7d9afa

In Raphael's words:

 dpkg-source has been relying this specific output of diff
 since its inception (in the nineties) and I really don't agree with the
 justification of the upstream change. We need a way as users to know
 that one of the file contains binary data, saying "Files differs"
 would lead me to ask myself "but then why don't you show me the difference??".
 The binary indication was fine.

 BTW, Dan Jacobson is known to submit lots of discutable bug reports
 on cosmetic details... but here the impact is much more than cosmetic.
 Paul or Jim, can you revert this change on the uptream side?

 [...]

 Questions for the diff upstream maintainers: what's the best way to call
 diff to detect if diff considers a file as binary?

 Can we rely on "File /dev/null and bar differ" to mean that bar is a
 binary file?


Note: I also would like the change to be reverted.

While it's true that "binary files foo and bar differ" is not
completely true when one of the files is binary and the other is not,
if such message is changed to just "files foo and bar differ" then
there is clearly a loss of information.

Previoulsy, the real meaning of "binary files foo and bar differ" was
really "the files differ, at least one of them is binary so I'm not
showing you the diff".

I would suggest that this clarification is put in the manual instead of
changing the program output.

Alternatively, if the program output needs to be changed, I would suggest
that it's done in a way that does not produce loss of information.

Thanks.




From MAILER-DAEMON Wed Feb 17 06:24:16 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Nhi0t-00080X-Ti
	for mharc-bug-diffutils@gnu.org; Wed, 17 Feb 2010 06:24:15 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nhi0s-00080N-NR
	for bug-diffutils@gnu.org; Wed, 17 Feb 2010 06:24:14 -0500
Received: from [140.186.70.92] (port=36529 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Nhi0r-00080E-S8
	for bug-diffutils@gnu.org; Wed, 17 Feb 2010 06:24:14 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1Nhi0q-0005Ml-S1
	for bug-diffutils@gnu.org; Wed, 17 Feb 2010 06:24:13 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:50116)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1Nhi0q-0005MT-69
	for bug-diffutils@gnu.org; Wed, 17 Feb 2010 06:24:12 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id B8D3C818047;
	Wed, 17 Feb 2010 12:24:07 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id CFBC58180F0;
	Wed, 17 Feb 2010 12:24:04 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 48F1736776; Wed, 17 Feb 2010 12:24:04 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: Raphael Hertzog <hertzog@debian.org>
In-Reply-To: <20100216073049.GB3364@rivendell> (Raphael Hertzog's message of
	"Tue, 16 Feb 2010 08:30:49 +0100")
References: <20100215200135.3101.3580.reportbug@manetheren.home>
	<20100216073049.GB3364@rivendell>
Date: Wed, 17 Feb 2010 12:24:04 +0100
Message-ID: <873a10yujv.fsf@meyering.net>
Lines: 93
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
Cc: 570008@bugs.debian.org, Santiago Vila <sanvila@debian.org>,
	Andreas Hoenen <andreas@hoenen-terstappen.de>, bug-diffutils@gnu.org
Subject: [bug-diffutils] Re: Bug#570008: dpkg-source: doesn't work together
	with diffutils 1:2.9-1
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Feb 2010 11:24:14 -0000

Raphael Hertzog wrote:
> clone 570008 -1
> reassign -1 diffutils 1:2.9-1
> severity -1 serious
> retitle -1 non-backwards compatible change in diff output with binary files
> thanks
>
> On Mon, 15 Feb 2010, Andreas Hoenen wrote:
>> Building a binary package for dblatex 0.2.12-3 (which has been built and
>> distributed successfully before) fails after the diffutils upgrade 1:2.8.1-18 ->
>> 1:2.9-1, as dpkg-source fails on the changed diff output:
> [...]
>> dpkg-source: error: unknown line from diff -u on dblatex-0.2.12/examples/dblatex/example.pdf: `Files /dev/null and dblatex-0.2.12/examples/dblatex/example.pdf differ'
>> dpkg-buildpackage: error: dpkg-source -b dblatex-0.2.12 gave error exit status 2
>>
>> The problem is the changed diff output:
>>
>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>> dblatex-0.2.12$ diff --version | head -1
>> diff (GNU diffutils) 2.9
>> dblatex-0.2.12$ diff -u /dev/null examples/dblatex/example.pdf
>> Files /dev/null and examples/dblatex/example.pdf differ
>> <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
>>
>> After downgrading package diffutils the output is (with dblatex bulding fine):
>>
>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>> dblatex-0.2.12$ diff --version | head -1
>> diff (GNU diffutils) 2.8.1
>> dblatex-0.2.12$ diff -u /dev/null examples/dblatex/example.pdf
>> Binary files /dev/null and examples/dblatex/example.pdf differ
>> <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
>
> Indeed:
> http://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=a352f09806a8606b4bbec07048da6762ce7d9afa
>
> dpkg-source has been relying this specific output of diff
> since its inception (in the nineties) and I really don't agree with the

Hi Raphael,

I'm willing to revert the change, even though it has been nearly 8
years (albeit only in "alpha releases"), and there's a risk that
some application now requires the other/current-in-2.9 syntax.

> justification of the upstream change. We need a way as users to know
> that one of the file contains binary data, saying "Files differs"
> would lead me to ask myself "but then why don't you show me the difference??".
> The binary indication was fine.
...
> Paul or Jim, can you revert this change on the uptream side?

If no one objects, that's just what I'll do.
Paul replied privately that he too is ok with reverting that change.

> Santiago, can you revert this commit in the debian package of diffutils
> at least for now? Just revert the patch linked above.
>
> If upstream doesn't want to revert the change, we'll adapt dpkg-source
> but you will have to keep the patch until a fixed dpkg-dev is available in
> all distributions and/or add a Breaks on the dpkg-dev version that are
> not compatible.
>
> BTW, the change above dates back to 2002 according to git but it was first
> part of diffutils 2.8.4 (2004?) and we just switched from 2.8.1 to 2.9 in
> Debian sid (whoa, what happened Santiago?).
>
>> /usr/share/perl5/Dpkg/Source/Patch.pm needs the leading "Binary" to match the
>> regexp at line 111, without it the code falls through the switch into the error
>> case.
>
> Yes and also the is_binary() function in
> /usr/share/perl5/Dpkg/Source/Functions.pm uses "diff -u /dev/null
> <filetotest>" to detect whether diff would consider <filetotest> as a
> binary file.
>
> Questions for the diff upstream maintainers: what's the best way to call
> diff to detect if diff considers a file as binary?

Here's one way:

  some_file=/dev/zero
  $ echo |diff - $some_file
  Files - and /dev/zero differ
  [Exit 2]

Note that you'd have to check stderr for /.* differ$/ only when
that command exits with status 2.

> Can we rely on "File /dev/null and bar differ" to mean that bar is a
> binary file?

Yes, for diff's definition of "binary".



From MAILER-DAEMON Thu Feb 18 02:49:37 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ni18j-0008Cg-7x
	for mharc-bug-diffutils@gnu.org; Thu, 18 Feb 2010 02:49:37 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ni18g-0008CL-SZ
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 02:49:34 -0500
Received: from [140.186.70.92] (port=49420 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ni18e-0008CD-TG
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 02:49:33 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1Ni18d-0006mo-RF
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 02:49:32 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:49582)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1Ni18d-0006mW-3r
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 02:49:31 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id A4F8881815D
	for <bug-diffutils@gnu.org>; Thu, 18 Feb 2010 08:49:26 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id C24768180E2
	for <bug-diffutils@gnu.org>; Thu, 18 Feb 2010 08:49:23 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 4CCBB21490; Thu, 18 Feb 2010 08:49:23 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: Santiago Vila <sanvila@unex.es>
In-Reply-To: <Pine.LNX.4.64.1002161432320.26768@cantor.unex.es> (Santiago
	Vila's message of "Tue, 16 Feb 2010 14:43:54 +0100 (CET)")
References: <Pine.LNX.4.64.1002161406420.26615@cantor.unex.es>
	<Pine.LNX.4.64.1002161432320.26768@cantor.unex.es>
Date: Thu, 18 Feb 2010 08:49:23 +0100
Message-ID: <87wrybq8zg.fsf@meyering.net>
Lines: 34
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
Cc: bug-diffutils@gnu.org, 570064@bugs.debian.org,
	Dpkg Developers <debian-dpkg@lists.debian.org>,
	Raphael Hertzog <hertzog@debian.org>
Subject: [bug-diffutils] Re: Bug#570064: diffutils 2.9 breaks dpkg-dev
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Feb 2010 07:49:35 -0000

Santiago Vila wrote:
> Raphael, this is the NEWS entry for the change:
>
> * Diff now simply prints "Files A and B differ" instead of "Binary
>   files A and B differ".  The message is output if either A or B
>   appears to be a binary file, and the old wording was misleading
>   because it implied that both files are binary, which is not
>   necessarily the case.
>
> Apparently, diff will show "Files A and B differ" only when at least
> one of them is binary, so the "meaning" is the same as before.

Right.

> My suggestion to avoid data loss would be something like this:
>
> Files A and B differ and at least one of them is binary.

That wording would be an improvement from the perspective
of conveying more information.  However, also changing the suffix
(before, we changed the prefix) would be disruptive to those who
matched against / differ$/.  Though note that all POSIX requires
is that the diagnostic list the two file names and the word "differ".
Speaking of conveying information, diff exits with status "2" when
it encounters differences like this that it does not display.

> However, as long as the "meaning" is the same (upstream could confirm this)
> even if the message is not changed again, I think it should be quite
> easy to adapt dpkg-dev to the new behaviour if it's kept that way.
>
> Let's see what upstream think about this.

I don't have a strong preference.
Do any of you?



From MAILER-DAEMON Thu Feb 18 04:37:08 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ni2om-0000L1-QC
	for mharc-bug-diffutils@gnu.org; Thu, 18 Feb 2010 04:37:08 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ni2ol-0000KD-2X
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 04:37:07 -0500
Received: from [140.186.70.92] (port=52737 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ni2oj-0000J0-Bb
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 04:37:05 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <sanvila@unex.es>) id 1Ni2oi-0001GD-L3
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 04:37:05 -0500
Received: from pizarro.unex.es ([158.49.8.2]:53767)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <sanvila@unex.es>) id 1Ni2oi-0001G3-FZ
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 04:37:04 -0500
Received: from localhost (lavadora.siue [192.168.1.121])
	by pizarro.unex.es (Postfix) with ESMTP id 7F4BD119592;
	Thu, 18 Feb 2010 10:37:02 +0100 (CET)
X-Virus-Scanned: Debian amavisd-new at lavadora.unex.es
Received: from pizarro.unex.es ([192.168.1.103])
	by localhost (lavadora.unex.es [192.168.1.121]) (amavisd-new,
	port 10024)
	with ESMTP id Ey4A11IPGL5h; Thu, 18 Feb 2010 10:36:51 +0100 (CET)
Received: from guadiana.unex.es (guadiana.unex.es [158.49.17.23])
	by pizarro.unex.es (Postfix) with ESMTP id 65006119527;
	Thu, 18 Feb 2010 10:37:02 +0100 (CET)
Received: from cantor.unex.es (cantor.unex.es [158.49.50.20])
	by guadiana.unex.es (Postfix) with ESMTP id E38AD1FF6F;
	Thu, 18 Feb 2010 10:37:01 +0100 (CET)
Date: Thu, 18 Feb 2010 10:37:01 +0100 (CET)
From: Santiago Vila <sanvila@unex.es>
To: Jim Meyering <jim@meyering.net>, 570064@bugs.debian.org
In-Reply-To: <87wrybq8zg.fsf@meyering.net>
Message-ID: <Pine.LNX.4.64.1002181031140.3033@cantor.unex.es>
References: <Pine.LNX.4.64.1002161406420.26615@cantor.unex.es>
	<Pine.LNX.4.64.1002161432320.26768@cantor.unex.es>
	<87wrybq8zg.fsf@meyering.net>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Cc: bug-diffutils@gnu.org, Raphael Hertzog <hertzog@debian.org>,
	Dpkg Developers <debian-dpkg@lists.debian.org>
Subject: [bug-diffutils] Re: Bug#570064: diffutils 2.9 breaks dpkg-dev
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Feb 2010 09:37:07 -0000

On Thu, 18 Feb 2010, Jim Meyering wrote:

> I don't have a strong preference.
> Do any of you?

I agree with Raphael that keeping the old string would probably be the
best solution, but that's just a preference, not necessarily strong :-)



From MAILER-DAEMON Thu Feb 18 08:15:01 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ni6Dd-0006BQ-6n
	for mharc-bug-diffutils@gnu.org; Thu, 18 Feb 2010 08:15:01 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ni6DZ-00068s-Om
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 08:14:57 -0500
Received: from [140.186.70.92] (port=36614 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ni6DY-00068T-RQ
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 08:14:57 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1Ni6DX-0007CU-RU
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 08:14:56 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:57817)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1Ni6DX-0007CL-27
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 08:14:55 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 214428181B0
	for <bug-diffutils@gnu.org>; Thu, 18 Feb 2010 14:14:51 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 3F429818186
	for <bug-diffutils@gnu.org>; Thu, 18 Feb 2010 14:14:49 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 0DEF059AD4; Thu, 18 Feb 2010 14:14:49 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: Santiago Vila <sanvila@unex.es>
In-Reply-To: <20100218085702.GA30100@rivendell> (Raphael Hertzog's message of
	"Thu, 18 Feb 2010 09:57:02 +0100")
References: <Pine.LNX.4.64.1002161406420.26615@cantor.unex.es>
	<Pine.LNX.4.64.1002161432320.26768@cantor.unex.es>
	<87wrybq8zg.fsf@meyering.net> <20100218085702.GA30100@rivendell>
Date: Thu, 18 Feb 2010 14:14:48 +0100
Message-ID: <87mxz6heif.fsf@meyering.net>
Lines: 73
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
Cc: bug-diffutils@gnu.org, 570064@bugs.debian.org,
	Dpkg Developers <debian-dpkg@lists.debian.org>
Subject: [bug-diffutils] Re: Bug#570064: diffutils 2.9 breaks dpkg-dev
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Feb 2010 13:15:00 -0000

FYI, here's what I expect to push.
I'll add a test case, too, eventually.

>From 48228e93a472613705dba6c520c7f47fc78756a5 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Thu, 18 Feb 2010 12:59:29 +0100
Subject: [PATCH 1/2] revert 2002 change that removed "Binary " from "files A and B differ"

With this change, "printf '\0'|diff - /dev/null" now prints
"Binary files - and /dev/null differ" once again.
This reverts 2002-06-28 commit a352f0980,
"(briefly_report): Don't say "Binary files differ", ...".
* src/analyze.c (briefly_report): Do include the "Binary " prefix
in the diagnostic, when !brief.
Reported by Andreas Hoenen in http://bugs.debian.org/570064.
---
 src/analyze.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/analyze.c b/src/analyze.c
index 0a18334..e797248 100644
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -454,9 +454,14 @@ briefly_report (int changes, struct file_data const filevec[])
     {
       char const *label0 = file_label[0] ? file_label[0] : filevec[0].name;
       char const *label1 = file_label[1] ? file_label[1] : filevec[1].name;
-      message ("Files %s and %s differ\n", label0, label1);
-      if (! brief)
-	changes = 2;
+
+      if (brief)
+	message ("Files %s and %s differ\n", label0, label1);
+      else
+	{
+	  message ("Binary files %s and %s differ\n", label0, label1);
+	  changes = 2;
+	}
     }

   return changes;
--
1.7.0.233.g05e1a


>From 83b8f2f56b4c89ff02ca4d0d4c130823e659c44f Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Thu, 18 Feb 2010 13:13:24 +0100
Subject: [PATCH 2/2] * NEWS (Changes in behavior): Mention the diagnostic change.

---
 NEWS |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/NEWS b/NEWS
index 0e42975..3d0d995 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,12 @@ GNU diffutils NEWS                                    -*- outline -*-

 * Noteworthy changes in release ?.? (????-??-??) [?]

+** Changes in behavior
+
+  diff once again reports a difference with the diagnostic
+  "Binary files A and B differ" when at least one of the files
+  appears to be binary.
+

 * Noteworthy changes in release 2.9 (2010-02-11) [stable]

--
1.7.0.233.g05e1a



From MAILER-DAEMON Thu Feb 18 09:40:17 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ni7Y9-0003hu-2C
	for mharc-bug-diffutils@gnu.org; Thu, 18 Feb 2010 09:40:17 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ni7Y7-0003gc-5N
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 09:40:15 -0500
Received: from [140.186.70.92] (port=47490 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ni7Y6-0003g6-HK
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 09:40:14 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <jidanni@jidanni.org>) id 1Ni7Y6-0000Nh-0a
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 09:40:14 -0500
Received: from mailbigip.dreamhost.com ([208.97.132.5]:54448
	helo=homiemail-a14.g.dreamhost.com)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <jidanni@jidanni.org>)
	id 1Ni7Y4-0000NE-DA; Thu, 18 Feb 2010 09:40:12 -0500
Received: from jidanni.org (125-230-46-90.dynamic.hinet.net [125.230.46.90])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by homiemail-a14.g.dreamhost.com (Postfix) with ESMTPSA id 0BC188C07D; 
	Thu, 18 Feb 2010 06:40:10 -0800 (PST)
From: jidanni@jidanni.org
To: bug-diffutils@gnu.org,ebb9@byu.net
References: <4B7D4C19.6040606@byu.net>
Date: Thu, 18 Feb 2010 22:40:08 +0800
Message-ID: <87ljeq620n.fsf_-_@jidanni.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
Cc: chris@cfajohnson.com, bug-coreutils@gnu.org
Subject: [bug-diffutils] diff "--git"
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Feb 2010 14:40:15 -0000

$ diff --git
diff: unrecognized option '--git'

I think diff should say at this point "real diff, at least up to year
2010, does not have a --git option, you are probably getting that idea
from git output" or something.

Or ask those git pros for a patch to give diff a --git option, or tell
them that they are overstepping their bounds...



From MAILER-DAEMON Thu Feb 18 10:08:38 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ni7za-0007UY-7k
	for mharc-bug-diffutils@gnu.org; Thu, 18 Feb 2010 10:08:38 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ni7zZ-0007Tk-02
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 10:08:37 -0500
Received: from [140.186.70.92] (port=43877 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ni7zW-0007St-Oo
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 10:08:36 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <jidanni@jidanni.org>) id 1Ni7zW-00068t-9P
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 10:08:34 -0500
Received: from caiajhbdcaib.dreamhost.com ([208.97.132.81]:43760
	helo=homiemail-a10.g.dreamhost.com)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <jidanni@jidanni.org>)
	id 1Ni7zS-000680-2f; Thu, 18 Feb 2010 10:08:30 -0500
Received: from jidanni.org (125-230-46-90.dynamic.hinet.net [125.230.46.90])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by homiemail-a10.g.dreamhost.com (Postfix) with ESMTPSA id D2FC4280076; 
	Thu, 18 Feb 2010 07:08:28 -0800 (PST)
From: jidanni@jidanni.org
To: ams@gnu.org
References: <E1Ni7dY-0005p8-Lx@fencepost.gnu.org>
Date: Thu, 18 Feb 2010 23:08:25 +0800
Message-ID: <87zl364m52.fsf@jidanni.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
Cc: bug-diffutils@gnu.org, chris@cfajohnson.com, bug-coreutils@gnu.org
Subject: [bug-diffutils] Re: diff "--git"
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Feb 2010 15:08:37 -0000

AMS> That is what it says, though not in so many words.  Having an option
AMS> for each VS would really be a headache (SCCS, RCS, CVS, hg, darcs,
AMS> bzr, tla, git, ...).

Well all I know is we then harangue the system administrator for not
installing the latest diff that the other guys are already using... when
in fact they are not using diff at all and diff --git would fail on
their machine too because they have boldly invented a fantasy unlike any
other seen there on the command line...

So maybe there should be a general disclaimer added about some people
spreading false rumors about diff options...



From MAILER-DAEMON Fri Feb 19 00:34:22 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NiLVO-0003Tz-0Q
	for mharc-bug-diffutils@gnu.org; Fri, 19 Feb 2010 00:34:22 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ni2DL-0007Mo-Em
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 03:58:27 -0500
Received: from [140.186.70.92] (port=57903 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ni2DK-0007Mf-DO
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 03:58:26 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <raphael@ouaza.com>) id 1Ni2DJ-0004Py-Jv
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 03:58:26 -0500
Received: from arrakeen.ouaza.com ([212.85.152.62]:54328)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <raphael@ouaza.com>) id 1Ni2DJ-0004LA-FD
	for bug-diffutils@gnu.org; Thu, 18 Feb 2010 03:58:25 -0500
Received: from localhost (localhost [127.0.0.1])
	by arrakeen.ouaza.com (Postfix) with ESMTP id 259713344A;
	Thu, 18 Feb 2010 09:57:13 +0100 (CET)
X-Virus-Scanned: Debian amavisd-new at ouaza.com
Received: from arrakeen.ouaza.com ([127.0.0.1])
	by localhost (arrakeen.ouaza.com [127.0.0.1]) (amavisd-new, port 10024)
	with LMTP id PkDrIfvMYb0d; Thu, 18 Feb 2010 09:57:13 +0100 (CET)
Received: from soleymieux.ouaza.com (soleymieux.ouaza.com [78.225.60.32])
	by arrakeen.ouaza.com (Postfix) with ESMTPA id F0179331B1;
	Thu, 18 Feb 2010 09:57:12 +0100 (CET)
Received: by soleymieux.ouaza.com (Postfix, from userid 1000)
	id 866D2332CDF; Thu, 18 Feb 2010 09:57:02 +0100 (CET)
Date: Thu, 18 Feb 2010 09:57:02 +0100
From: Raphael Hertzog <hertzog@debian.org>
To: Jim Meyering <jim@meyering.net>
Message-ID: <20100218085702.GA30100@rivendell>
Mail-Followup-To: Jim Meyering <jim@meyering.net>,
	Santiago Vila <sanvila@unex.es>, bug-diffutils@gnu.org,
	570064@bugs.debian.org,
	Dpkg Developers <debian-dpkg@lists.debian.org>
References: <Pine.LNX.4.64.1002161406420.26615@cantor.unex.es>
	<Pine.LNX.4.64.1002161432320.26768@cantor.unex.es>
	<87wrybq8zg.fsf@meyering.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-15
Content-Disposition: inline
In-Reply-To: <87wrybq8zg.fsf@meyering.net>
User-Agent: Mutt/1.5.20 (2009-06-14)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Mailman-Approved-At: Fri, 19 Feb 2010 00:34:20 -0500
Cc: bug-diffutils@gnu.org, 570064@bugs.debian.org,
	Santiago Vila <sanvila@unex.es>,
	Dpkg Developers <debian-dpkg@lists.debian.org>
Subject: [bug-diffutils] Re: Bug#570064: diffutils 2.9 breaks dpkg-dev
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Feb 2010 08:58:27 -0000

Hi,

On Thu, 18 Feb 2010, Jim Meyering wrote:
> That wording would be an improvement from the perspective
> of conveying more information.  However, also changing the suffix
> (before, we changed the prefix) would be disruptive to those who
> matched against / differ$/.  Though note that all POSIX requires
> is that the diagnostic list the two file names and the word "differ".

Good to hear that something is specified, I shall make sure that dpkg-sou=
rce
also matches on that then.

> > However, as long as the "meaning" is the same (upstream could confirm=
 this)
> > even if the message is not changed again, I think it should be quite
> > easy to adapt dpkg-dev to the new behaviour if it's kept that way.
> >
> > Let's see what upstream think about this.
>=20
> I don't have a strong preference.
> Do any of you?

Since dpkg-source used to match only on /^binary/i I don't care.

But if I were you, I would simply keep the same original string to avoid
any further trouble.

Cheers,
--=20
Rapha=EBl Hertzog

Like what I do? Sponsor me: http://ouaza.com/wp/2010/01/05/5-years-of-fre=
exian/
My Debian goals: http://ouaza.com/wp/2010/01/09/debian-related-goals-for-=
2010/



From MAILER-DAEMON Tue Feb 23 03:31:30 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NjqAz-0004pZ-9C
	for mharc-bug-diffutils@gnu.org; Tue, 23 Feb 2010 03:31:30 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NjqAp-0004oU-QA
	for bug-diffutils@gnu.org; Tue, 23 Feb 2010 03:31:22 -0500
Received: from [140.186.70.92] (port=51558 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NjqAl-0004nq-K1
	for bug-diffutils@gnu.org; Tue, 23 Feb 2010 03:31:18 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1NjqAi-0000xp-Cz
	for bug-diffutils@gnu.org; Tue, 23 Feb 2010 03:31:15 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:37733)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1NjqAg-0000wr-Te
	for bug-diffutils@gnu.org; Tue, 23 Feb 2010 03:31:11 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id E4E908181A1
	for <bug-diffutils@gnu.org>; Tue, 23 Feb 2010 09:31:05 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 10EFA818040
	for <bug-diffutils@gnu.org>; Tue, 23 Feb 2010 09:31:02 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 8872325254; Tue, 23 Feb 2010 09:31:02 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Tue, 23 Feb 2010 09:31:02 +0100
Message-ID: <87fx4smjzt.fsf@meyering.net>
Lines: 62
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
Subject: [bug-diffutils] [PATCH] revert 2002 change that removed "Binary "
	from "files A and B differ"
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Feb 2010 08:31:23 -0000

FYI, I've pushed this:

>From 3f591f4bb5776b4fc91573b940a9d845458cc617 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Thu, 18 Feb 2010 12:59:29 +0100
Subject: [PATCH] revert 2002 change that removed "Binary " from "files A and B differ"

With this change, "printf '\0'|diff - /dev/null" now prints
"Binary files - and /dev/null differ" once again.
This reverts 2002-06-28 commit a352f0980,
"(briefly_report): Don't say "Binary files differ", ...".
* src/analyze.c (briefly_report): Do include the "Binary " prefix
in the diagnostic, when !brief.
* NEWS (Changes in behavior): Mention the diagnostic change.
Reported by Andreas Hoenen in http://bugs.debian.org/570064.
---
 NEWS          |    7 +++++++
 src/analyze.c |   11 ++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 0e42975..569c4ef 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,13 @@ GNU diffutils NEWS                                    -*- outline -*-

 * Noteworthy changes in release ?.? (????-??-??) [?]

+** Changes in behavior
+
+  diff once again reports a difference with the diagnostic
+  "Binary files A and B differ" when at least one of the files
+  appears to be binary.  From 2.8.4 through diffutils-2.9, it printed
+  "Files A and B differ".
+

 * Noteworthy changes in release 2.9 (2010-02-11) [stable]

diff --git a/src/analyze.c b/src/analyze.c
index 0a18334..e797248 100644
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -454,9 +454,14 @@ briefly_report (int changes, struct file_data const filevec[])
     {
       char const *label0 = file_label[0] ? file_label[0] : filevec[0].name;
       char const *label1 = file_label[1] ? file_label[1] : filevec[1].name;
-      message ("Files %s and %s differ\n", label0, label1);
-      if (! brief)
-	changes = 2;
+
+      if (brief)
+	message ("Files %s and %s differ\n", label0, label1);
+      else
+	{
+	  message ("Binary files %s and %s differ\n", label0, label1);
+	  changes = 2;
+	}
     }

   return changes;
--
1.7.0.367.g566c3



From MAILER-DAEMON Wed Feb 24 10:27:19 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NkJ8x-0002iV-M7
	for mharc-bug-diffutils@gnu.org; Wed, 24 Feb 2010 10:27:19 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nk2Of-0000Qm-UV
	for bug-diffutils@gnu.org; Tue, 23 Feb 2010 16:34:25 -0500
Received: from [140.186.70.92] (port=39894 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Nk2Oe-0000QW-F8
	for bug-diffutils@gnu.org; Tue, 23 Feb 2010 16:34:25 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <matthew@linuxfromscratch.org>) id 1Nk2Oc-0004nY-AI
	for bug-diffutils@gnu.org; Tue, 23 Feb 2010 16:34:24 -0500
Received: from smtp826.mail.ukl.yahoo.com ([217.12.13.123]:48694)
	by eggs.gnu.org with smtp (Exim 4.69)
	(envelope-from <matthew@linuxfromscratch.org>) id 1Nk2Ob-0004nD-Qy
	for bug-diffutils@gnu.org; Tue, 23 Feb 2010 16:34:22 -0500
Received: (qmail 23357 invoked from network); 23 Feb 2010 21:34:19 -0000
Received: from [192.168.1.65] (matthew@86.148.44.144 with plain)
	by smtp826.mail.ukl.yahoo.com with SMTP; 23 Feb 2010 21:34:18 +0000 GMT
X-Yahoo-SMTP: wyYcNWyswBCGVL.frqMtM_78a8pWUGJ.MK0SkaS06skXXXF4cmtHuUKnLFp8
X-YMail-OSG: h8krDlcVM1kw39aPim6xORBdqMsBcxlPfSdskhXO7N0cN4_1atc.8NQ6n.sixoUVXPMMYXt.tOlkwVVRvQAhWlqdWnMBM0iAgIAZ_NOnENrNMFrBF7KJ4sPV85FXrnu5jG.P42R47KIwuXeuFZBQfjEKLWqKI6wEqnxoFF5.wPYmwYsNF0ekKkL9jh2SJ2Vxrrgwdvdd2LOHUXv3.5wA6hI7XVEMd3Pz2ccTJE4e
X-Yahoo-Newman-Property: ymail-3
Message-ID: <4B8449DB.1040401@linuxfromscratch.org>
Date: Tue, 23 Feb 2010 21:34:19 +0000
From: Matthew Burgess <matthew@linuxfromscratch.org>
Organization: Linux From Scratch
User-Agent: Thunderbird 2.0.0.23 (Windows/20090812)
MIME-Version: 1.0
To: bug-diffutils@gnu.org
Content-Type: multipart/mixed; boundary="------------030402040500080706080901"
X-detected-operating-system: by eggs.gnu.org: FreeBSD 6.x (1)
X-Mailman-Approved-At: Wed, 24 Feb 2010 10:27:18 -0500
Cc: matthew@linuxfromscratch.org
Subject: [bug-diffutils] [patch] i18n patch for diffutils
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Feb 2010 21:34:26 -0000

This is a multi-part message in MIME format.
--------------030402040500080706080901
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Hi,

Linux From Scratch is currently carrying the attached patch that we took 
verbatim from Redhat some time ago.  It apparently fixes an issue 
concerning handling whitespace in multibyte locales, but comes with no 
test case so I'm unable to figure out whether this has been fixed in 
some other way already.  I note there was some discussion at 
http://lists.gnu.org/archive/html/bug-gnu-utils/2008-01/msg00030.html 
regarding side-by-side comparisons in multibyte locales, but can't tell 
whether the fixes there may have fixed up whatever this patch is trying 
to do.

Apologies for such a wishy-washy report; I'm hoping someone with more 
knowledge of the source code and multibyte issues may be able to figure 
out quicker than I can whether the patch LFS is currently carrying is 
still required, and whether it can be applied as-is upstream.

Thanks,

Matt.

--------------030402040500080706080901
Content-Type: text/plain;
 name="diffutils-2.8.1-i18n-1.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="diffutils-2.8.1-i18n-1.patch"

Submitted by: Alexander E. Patrakov
Date: 2005-08-13
Initial Package Version: 2.8.1
Upstream Status: Unknown, but required for LSB >= 2.0 certification
Origin: RedHat
Description: Fixes treatment of whitespace in multibyte locales.

--- diffutils-2.8.4/src/diff.c.i18n	2002-06-17 01:55:42.000000000 -0400
+++ diffutils-2.8.4/src/diff.c	2002-11-16 18:41:37.000000000 -0500
@@ -275,6 +275,13 @@
   re_set_syntax (RE_SYNTAX_GREP | RE_NO_POSIX_BACKTRACKING);
   excluded = new_exclude ();
 
+#ifdef HANDLE_MULTIBYTE
+  if (MB_CUR_MAX > 1)
+    lines_differ = lines_differ_multibyte;
+  else
+#endif
+    lines_differ = lines_differ_singlebyte;
+
   /* Decode the options.  */
 
   while ((c = getopt_long (argc, argv, shortopts, longopts, 0)) != -1)
--- diffutils-2.8.4/src/diff.h.i18n	2002-11-16 18:31:32.000000000 -0500
+++ diffutils-2.8.4/src/diff.h	2002-11-16 18:48:58.000000000 -0500
@@ -23,6 +23,19 @@
 #include "system.h"
 #include <stdio.h>
 
+/* For platform which support the ISO C amendement 1 functionality we
+   support user defined character classes.  */
+#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H
+/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.  */
+# include <wchar.h>
+# include <wctype.h>
+# if defined (HAVE_MBRTOWC)
+#  define HANDLE_MULTIBYTE      1
+# endif
+#endif
+
+#define TAB_WIDTH 8
+
 /* What kind of changes a hunk contains.  */
 enum changes
 {
@@ -350,7 +363,13 @@
 extern char const pr_program[];
 char *concat (char const *, char const *, char const *);
 char *dir_file_pathname (char const *, char const *);
-bool lines_differ (char const *, char const *);
+
+bool (*lines_differ) (char const *, char const *);
+bool lines_differ_singlebyte (char const *, char const *);
+#ifdef HANDLE_MULTIBYTE
+bool lines_differ_multibyte (char const *, char const *);
+#endif
+
 lin translate_line_number (struct file_data const *, lin);
 struct change *find_change (struct change *);
 struct change *find_reverse_change (struct change *);
--- diffutils-2.8.4/src/io.c.i18n	2002-06-11 02:06:32.000000000 -0400
+++ diffutils-2.8.4/src/io.c	2002-11-16 18:57:30.000000000 -0500
@@ -26,6 +26,7 @@
 #include <regex.h>
 #include <setmode.h>
 #include <xalloc.h>
+#include <assert.h>
 
 /* Rotate an unsigned value to the left.  */
 #define ROL(v, n) ((v) << (n) | (v) >> (sizeof (v) * CHAR_BIT - (n)))
@@ -213,6 +214,28 @@
 
 /* Split the file into lines, simultaneously computing the equivalence
    class for each line.  */
+#ifdef HANDLE_MULTIBYTE
+# define MBC2WC(P, END, MBLENGTH, WC, STATE, CONVFAIL)			\
+do									\
+{									\
+    mbstate_t state_bak = STATE;					\
+									\
+    CONVFAIL = 0;							\
+    MBLENGTH = mbrtowc (&WC, P, END - (char const *)P, &STATE);		\
+									\
+    switch (MBLENGTH)							\
+      {									\
+      case (size_t)-2:							\
+      case (size_t)-1:							\
+	STATE = state_bak;						\
+	++CONVFAIL;							\
+	  /* Fall through. */						\
+      case 0:								\
+	MBLENGTH = 1;							\
+      }									\
+}									\
+while (0)
+#endif
 
 static void
 find_and_hash_each_line (struct file_data *current)
@@ -239,12 +262,280 @@
   bool same_length_diff_contents_compare_anyway =
     diff_length_compare_anyway | ignore_case;
 
+#ifdef HANDLE_MULTIBYTE
+  wchar_t   wc;
+  size_t    mblength;
+  mbstate_t state;
+  int       convfail;
+  
+  memset (&state, '\0', sizeof (mbstate_t));
+#endif
+
   while ((char const *) p < suffix_begin)
     {
       char const *ip = (char const *) p;
 
       h = 0;
+#ifdef HANDLE_MULTIBYTE
+      if (MB_CUR_MAX > 1)
+	{
+	  wchar_t   lo_wc;
+	  char	    mbc[MB_LEN_MAX];
+	  mbstate_t state_wc;
+
+	  /* Hash this line until we find a newline.  */
+	  switch (ignore_white_space)
+	    {
+	    case IGNORE_ALL_SPACE:
+	      while (1)
+		{
+		  if (*p == '\n')
+		    {
+		      ++p;
+		      break;
+		    }
+
+		  MBC2WC (p, suffix_begin, mblength, wc, state, convfail);
+
+		  if (convfail)
+		    mbc[0] = *p++;
+		  else if (!iswspace (wc))
+		    {
+		      bool flag = 0;
+
+		      if (ignore_case)
+			{
+			  lo_wc = towlower (wc);
+			  if (lo_wc != wc)
+			    {
+			      flag = 1;
+
+			      p += mblength;
+			      memset (&state_wc, '\0', sizeof(mbstate_t));
+			      mblength = wcrtomb (mbc, lo_wc, &state_wc);
+
+			      assert (mblength != (size_t)-1 &&
+				  mblength != (size_t)-2);
+
+			      mblength = (mblength < 1) ? 1 : mblength;
+			    }
+			}
+
+		      if (!flag)
+			{
+			  for (i = 0; i < mblength; i++)
+			    mbc[i] =  *p++;
+			}
+		    }
+		  else
+		    {
+		      p += mblength;
+		      continue;
+		    }
+
+		  for (i = 0; i < mblength; i++)
+		    h = HASH (h, mbc[i]);
+		}
+	      break;
+
+	    case IGNORE_SPACE_CHANGE:
+	      while (1)
+		{
+		  if (*p == '\n')
+		    {
+		      ++p;
+		      break;
+		    }
 
+		  MBC2WC (p, suffix_begin, mblength, wc, state, convfail);
+
+		  if (!convfail && iswspace (wc))
+		    {
+		      while (1)
+			{
+			  if (*p == '\n')
+			    {
+			      ++p;
+			      goto hashing_done;
+			    }
+
+			  p += mblength;
+			  MBC2WC (p, suffix_begin, mblength, wc, state, convfail);
+			  if (convfail || (!convfail && !iswspace (wc)))
+			    break;
+			}
+		      h = HASH (h, ' ');
+		    }
+
+		  /* WC is now the first non-space.  */
+		  if (convfail)
+		    mbc[0] = *p++;
+		  else
+		    {
+		      bool flag = 0;
+
+		      if (ignore_case)
+			{
+			  lo_wc = towlower (wc);
+			  if (lo_wc != wc)
+			    {
+			      flag = 1;
+
+			      p += mblength;
+			      memset (&state_wc, '\0', sizeof(mbstate_t));
+			      mblength = wcrtomb (mbc, lo_wc, &state_wc);
+
+			      assert (mblength != (size_t)-1 &&
+				  mblength != (size_t)-2);
+
+			      mblength = (mblength < 1) ? 1 : mblength;
+			    }
+			}
+
+		      if (!flag)
+			{
+			  for (i = 0; i < mblength; i++)
+			    mbc[i] = *p++;
+			}
+		    }
+
+		  for (i = 0; i < mblength; i++)
+		    h = HASH (h, mbc[i]);
+		}
+	      break;
+
+	    case IGNORE_TAB_EXPANSION:
+		{
+		  size_t column = 0;
+
+		  while (1)
+		    {
+		      if (*p == '\n')
+			{
+			  ++p;
+			  break;
+			}
+
+		      MBC2WC (p, suffix_begin, mblength, wc, state, convfail);
+
+		      if (convfail)
+			{
+			  h = HASH (h, *p++);
+			  ++column;
+			}
+		      else
+			{
+			  bool flag;
+
+			  switch (wc)
+			    {
+			    case L'\b':
+			      column -= 0 < column;
+			      h = HASH (h, '\b');
+			      ++p;
+			      break;
+
+			    case L'\t':
+				{
+				  int repetitions;
+
+				  repetitions = TAB_WIDTH - column % TAB_WIDTH;
+				  column += repetitions;
+				  do
+				    h = HASH (h, ' ');
+				  while (--repetitions != 0);
+				  ++p;
+				}
+			      break;
+
+			    case L'\r':
+			      column = 0;
+			      h = HASH (h, '\r');
+			      ++p;
+			      break;
+
+			    default:
+			      flag = 0;
+			      column += wcwidth (wc);
+			      if (ignore_case)
+				{
+				  lo_wc = towlower (wc);
+				  if (lo_wc != wc)
+				    {
+				      flag = 1;
+				      p += mblength;
+				      memset (&state_wc, '\0', sizeof(mbstate_t));
+				      mblength = wcrtomb (mbc, lo_wc, &state_wc);
+
+				      assert (mblength != (size_t)-1 &&
+					  mblength != (size_t)-2);
+
+				      mblength = (mblength < 1) ? 1 : mblength;
+				    }
+				}
+
+			      if (!flag)
+				{
+				  for (i = 0; i < mblength; i++)
+				    mbc[i] = *p++;
+				}
+
+			      for (i = 0; i < mblength; i++)
+				h = HASH (h, mbc[i]);
+			    }
+			}
+		    }
+		}
+	      break;
+
+	    default:
+	      while (1)
+		{
+		  if (*p == '\n')
+		    {
+		      ++p;
+		      break;
+		    }
+
+		  MBC2WC (p, suffix_begin, mblength, wc, state, convfail);
+
+		  if (convfail)
+		    mbc[0] = *p++;
+		  else
+		    {
+		      int flag = 0;
+
+		      if (ignore_case)
+			{
+			  lo_wc = towlower (wc);
+			  if (lo_wc != wc)
+			    {
+			      flag = 1;
+			      p += mblength;
+			      memset (&state_wc, '\0', sizeof(mbstate_t));
+			      mblength = wcrtomb (mbc, lo_wc, &state_wc);
+
+			      assert (mblength != (size_t)-1 &&
+				  mblength != (size_t)-2);
+
+			      mblength = (mblength < 1) ? 1 : mblength;
+			    }
+			}
+
+		      if (!flag)
+			{
+			  for (i = 0; i < mblength; i++)
+			    mbc[i] = *p++;
+			}
+		    }
+
+		  for (i = 0; i < mblength; i++)
+		    h = HASH (h, mbc[i]);
+		}
+	    }
+	}
+      else
+#endif
       /* Hash this line until we find a newline.  */
       if (ignore_case)
 	switch (ignore_white_space)
--- diffutils-2.8.4/src/side.c.i18n	2002-06-11 02:06:32.000000000 -0400
+++ diffutils-2.8.4/src/side.c	2002-11-16 18:41:37.000000000 -0500
@@ -73,11 +73,72 @@
   register size_t out_position = 0;
   register char const *text_pointer = line[0];
   register char const *text_limit = line[1];
+#if defined HAVE_WCHAR_H && defined HAVE_WCTYPE_H
+  unsigned char mbc[MB_LEN_MAX];
+  wchar_t wc;
+  mbstate_t state, state_bak;
+  size_t mbc_pos, mblength;
+  int mbc_loading_flag = 0;
+  int wc_width;
+
+  memset (&state, '\0', sizeof (mbstate_t));
+#endif
 
   while (text_pointer < text_limit)
     {
       register unsigned char c = *text_pointer++;
 
+#if defined HAVE_WCHAR_H && defined HAVE_WCTYPE_H
+      if (MB_CUR_MAX > 1 && mbc_loading_flag)
+	{
+	  mbc_loading_flag = 0;
+	  state_bak = state;
+	  mbc[mbc_pos++] = c;
+
+process_mbc:
+	  mblength = mbrtowc (&wc, mbc, mbc_pos, &state);
+
+	  switch (mblength)
+	    {
+	    case (size_t)-2:	/* Incomplete multibyte character. */
+	      mbc_loading_flag = 1;
+	      state = state_bak;
+	      break;
+
+	    case (size_t)-1:	/* Invalid as a multibyte character. */
+	      if (in_position++ < out_bound)
+		{
+		  out_position = in_position;
+		  putc (mbc[0], out);
+		}
+	      memmove (mbc, mbc + 1, --mbc_pos);
+	      if (mbc_pos > 0)
+		{
+		  mbc[mbc_pos] = '\0';
+		  goto process_mbc;
+		}
+	      break;
+
+	    default:
+	      wc_width = wcwidth (wc);
+	      if (wc_width < 1)	/* Unprintable multibyte character. */
+		{
+		  if (in_position <= out_bound)
+		    fprintf (out, "%lc", (wint_t)wc);
+		}
+	      else		/* Printable multibyte character. */
+		{
+		  in_position += wc_width;
+		  if (in_position <= out_bound)
+		    {
+		      out_position = in_position;
+		      fprintf (out, "%lc", (wint_t)wc);
+		    }
+		}
+	    }
+	  continue;
+	}
+#endif
       switch (c)
 	{
 	case '\t':
@@ -135,8 +196,39 @@
 	  break;
 
 	default:
-	  if (! ISPRINT (c))
-	    goto control_char;
+#if defined HAVE_WCHAR_H && defined HAVE_WCTYPE_H
+	  if (MB_CUR_MAX > 1)
+	    {
+	      memset (mbc, '\0', MB_LEN_MAX);
+	      mbc_pos = 0;
+	      mbc[mbc_pos++] = c;
+	      state_bak = state;
+
+	      mblength = mbrtowc (&wc, mbc, mbc_pos, &state);
+
+	      /* The value of mblength is always less than 2 here. */
+	      switch (mblength)
+		{
+		case (size_t)-2:	/* Incomplete multibyte character. */
+		  state = state_bak;
+		  mbc_loading_flag = 1;
+		  continue;
+
+		case (size_t)-1:	/* Invalid as a multibyte character. */
+		  state = state_bak;
+		  break;
+
+		default:
+		  if (! iswprint (wc))
+		    goto control_char;
+		}
+	    }
+	  else
+#endif
+	    {
+	      if (! ISPRINT (c))
+		goto control_char;
+	    }
 	  /* falls through */
 	case ' ':
 	  if (in_position++ < out_bound)
--- diffutils-2.8.4/src/util.c.i18n	2002-06-11 02:06:32.000000000 -0400
+++ diffutils-2.8.4/src/util.c	2002-11-16 18:41:37.000000000 -0500
@@ -321,7 +321,7 @@
    Return nonzero if the lines differ.  */
 
 bool
-lines_differ (char const *s1, char const *s2)
+lines_differ_singlebyte (char const *s1, char const *s2)
 {
   register unsigned char const *t1 = (unsigned char const *) s1;
   register unsigned char const *t2 = (unsigned char const *) s2;
@@ -450,6 +450,293 @@
 
   return 1;
 }
+
+#ifdef HANDLE_MULTIBYTE
+# define MBC2WC(T, END, MBLENGTH, WC, STATE, CONVFAIL)			\
+do									\
+{									\
+    mbstate_t bak = STATE;						\
+									\
+    CONVFAIL = 0;							\
+    MBLENGTH = mbrtowc (&WC, T, END - T, &STATE);			\
+									\
+    switch (MBLENGTH)							\
+      {									\
+      case (size_t)-2:							\
+      case (size_t)-1:							\
+	STATE = bak;							\
+	++CONVFAIL;							\
+	  /* Fall through. */						\
+      case 0:								\
+	MBLENGTH = 1;							\
+      }									\
+}									\
+while (0)
+
+bool
+lines_differ_multibyte (char const *s1, char const *s2)
+{
+  unsigned char const *end1, *end2;
+  unsigned char c1, c2;
+  wchar_t wc1, wc2, wc1_bak, wc2_bak;
+  size_t mblen1, mblen2;
+  mbstate_t state1, state2, state1_bak, state2_bak;
+  int convfail1, convfail2, convfail1_bak, convfail2_bak;
+  
+  unsigned char const *t1 = (unsigned char const *) s1;
+  unsigned char const *t2 = (unsigned char const *) s2;
+  unsigned char const *t1_bak, *t2_bak;
+  size_t column = 0;
+
+  if (ignore_white_space == IGNORE_NO_WHITE_SPACE  && !ignore_case)
+    {
+      while (*t1 != '\n')
+	if (*t1++ != * t2++)
+	  return 1;
+      return 0;
+    }
+
+  memset (&state1, '\0', sizeof (mbstate_t));
+  memset (&state2, '\0', sizeof (mbstate_t));
+
+  end1 = s1 + strlen (s1);
+  end2 = s2 + strlen (s2);
+
+  while (1)
+    {
+      c1 = *t1;
+      c2 = *t2;
+      MBC2WC (t1, end1, mblen1, wc1, state1, convfail1);
+      MBC2WC (t2, end2, mblen2, wc2, state2, convfail2);
+
+      /* Test for exact char equality first, since it's a common case.  */
+      if (convfail1 ^ convfail2)
+	break;
+      else if (convfail1 && convfail2 && c1 != c2)
+	break;
+      else if (!convfail1 && !convfail2 && wc1 != wc2)
+	{
+	  switch (ignore_white_space)
+	    {
+	    case IGNORE_ALL_SPACE:
+	      /* For -w, just skip past any white space.  */
+	      while (1)
+		{
+		  if (convfail1)
+		    break;
+		  else if (wc1 == L'\n' || !iswspace (wc1))
+		    break;
+
+		  t1 += mblen1;
+		  c1 = *t1;
+		  MBC2WC (t1, end1, mblen1, wc1, state1, convfail1);
+		}
+
+	      while (1)
+		{
+		  if (convfail2)
+		    break;
+		  else if (wc2 == L'\n' || !iswspace (wc2))
+		    break;
+
+		  t2 += mblen2;
+		  c2 = *t2;
+		  MBC2WC (t2, end2, mblen2, wc2, state2, convfail2);
+		}
+	      t1 += mblen1;
+	      t2 += mblen2;
+	      break;
+
+	    case IGNORE_SPACE_CHANGE:
+	      /* For -b, advance past any sequence of white space in
+		 line 1 and consider it just one space, or nothing at
+		 all if it is at the end of the line.  */
+	      if (wc1 != L'\n' && iswspace (wc1))
+		{
+		  size_t mblen_bak;
+		  mbstate_t state_bak;
+
+		  do
+		    {
+		      t1 += mblen1;
+		      mblen_bak = mblen1;
+		      state_bak = state1;
+		      MBC2WC (t1, end1, mblen1, wc1, state1, convfail1);
+		    }
+		  while (!convfail1 && (wc1 != L'\n' && iswspace (wc1)));
+
+		  state1 = state_bak;
+		  mblen1 = mblen_bak;
+		  t1 -= mblen1;
+		  convfail1 = 0;
+		  wc1 = L' ';
+		}
+
+	      /* Likewise for line 2.  */
+	      if (wc2 != L'\n' && iswspace (wc2))
+		{
+		  size_t mblen_bak;
+		  mbstate_t state_bak;
+
+		  do
+		    {
+		      t2 += mblen2;
+		      mblen_bak = mblen2;
+		      state_bak = state2;
+		      MBC2WC (t2, end2, mblen2, wc2, state2, convfail2);
+		    }
+		  while (!convfail2 && (wc2 != L'\n' && iswspace (wc2)));
+
+		  state2 = state_bak;
+		  mblen2 = mblen_bak;
+		  t2 -= mblen2;
+		  convfail2 = 0;
+		  wc2 = L' ';
+		}
+
+	      if (wc1 != wc2)
+		{
+		  if (wc2 == L' ' && wc1 != L'\n' &&
+		      t1 > (unsigned char const *)s1 &&
+		      !convfail1_bak && iswspace (wc1_bak))
+		    {
+		      t1 = t1_bak;
+		      wc1 = wc1_bak;
+		      state1 = state1_bak;
+		      convfail1 = convfail1_bak;
+		      continue;
+		    }
+		  if (wc1 == L' ' && wc2 != L'\n'
+		      && t2 > (unsigned char const *)s2
+		      && !convfail2_bak && iswspace (wc2_bak))
+		    {
+		      t2 = t2_bak;
+		      wc2 = wc2_bak;
+		      state2 = state2_bak;
+		      convfail2 = convfail2_bak;
+		      continue;
+		    }
+		}
+
+	      t1_bak = t1;		  t2_bak = t2;
+	      wc1_bak = wc1;		  wc2_bak = wc2;
+	      state1_bak = state1;	  state2_bak = state2;
+	      convfail1_bak = convfail1;  convfail2_bak = convfail2;
+
+	      if (wc1 == L'\n')
+		wc1 = L' ';
+	      else
+		t1 += mblen1;
+
+	      if (wc2 == L'\n')
+		wc2 = L' ';
+	      else
+		t2 += mblen2;
+
+	      break;
+
+	    case IGNORE_TAB_EXPANSION:
+	      if ((wc1 == L' ' && wc2 == L'\t')
+		  || (wc1 == L'\t' && wc2 == L' '))
+		{
+		  size_t column2 = column;
+
+		  while (1)
+		    {
+		      if (convfail1)
+			{
+			  ++t1;
+			  break;
+			}
+		      else if (wc1 == L' ')
+			column++;
+		      else if (wc1 == L'\t')
+			column += TAB_WIDTH - column % TAB_WIDTH;
+		      else
+			{
+			  t1 += mblen1;
+			  break;
+			}
+
+		      t1 += mblen1;
+		      c1 = *t1;
+		      MBC2WC (t1, end1, mblen1, wc1, state1, convfail1);
+		    }
+
+		  while (1)
+		    {
+		      if (convfail2)
+			{
+			  ++t2;
+			  break;
+			}
+		      else if (wc2 == L' ')
+			column2++;
+		      else if (wc2 == L'\t')
+			column2 += TAB_WIDTH - column2 % TAB_WIDTH;
+		      else
+			{
+			  t2 += mblen2;
+			  break;
+			}
+
+		      t2 += mblen2;
+		      c2 = *t2;
+		      MBC2WC (t2, end2, mblen2, wc2, state2, convfail2);
+		    }
+
+		  if (column != column2)
+		    return 1;
+		}
+	      else
+		{
+		  t1 += mblen1;
+		  t2 += mblen2;
+		}
+	      break;
+
+	    case IGNORE_NO_WHITE_SPACE:
+	      t1 += mblen1;
+	      t2 += mblen2;
+	      break;
+	    }
+
+	  /* Lowercase all letters if -i is specified.  */
+	  if (ignore_case)
+	    {
+	      if (!convfail1)
+		wc1 = towlower (wc1);
+	      if (!convfail2)
+		wc2 = towlower (wc2);
+	    }
+
+	  if (convfail1 ^ convfail2)
+	    break;
+	  else if (convfail1 && convfail2 && c1 != c2)
+	    break;
+	  else if (!convfail1 && !convfail2 && wc1 != wc2)
+	    break;
+	}
+      else
+	{
+	  t1_bak = t1;			t2_bak = t2;
+	  wc1_bak = wc1;		wc2_bak = wc2;
+	  state1_bak = state1;		state2_bak = state2;
+	  convfail1_bak = convfail1;	convfail2_bak = convfail2;
+
+	  t1 += mblen1;			t2 += mblen2;
+	}
+      
+      if (!convfail1 && wc1 == L'\n')
+	return 0;
+
+      column += convfail1 ? 1 :
+	(wc1 == L'\t') ? TAB_WIDTH - column % TAB_WIDTH : wcwidth (wc1);
+    }
+
+  return 1;
+}
+#endif
 
 /* Find the consecutive changes at the start of the script START.
    Return the last link before the first gap.  */

--------------030402040500080706080901--



From MAILER-DAEMON Thu Feb 25 12:02:27 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Nkh6Z-00025Q-60
	for mharc-bug-diffutils@gnu.org; Thu, 25 Feb 2010 12:02:27 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nkh6W-00024Y-UN
	for bug-diffutils@gnu.org; Thu, 25 Feb 2010 12:02:25 -0500
Received: from [140.186.70.92] (port=52886 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Nkh6V-000247-3l
	for bug-diffutils@gnu.org; Thu, 25 Feb 2010 12:02:23 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1Nkh6U-0000fg-Eh
	for bug-diffutils@gnu.org; Thu, 25 Feb 2010 12:02:23 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:34102)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1Nkh6T-0000fN-Qh
	for bug-diffutils@gnu.org; Thu, 25 Feb 2010 12:02:22 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 1C232818155
	for <bug-diffutils@gnu.org>; Thu, 25 Feb 2010 18:02:17 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 389A0818052
	for <bug-diffutils@gnu.org>; Thu, 25 Feb 2010 18:02:15 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 1569628EB4; Thu, 25 Feb 2010 18:02:15 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: Matthew Burgess <matthew@linuxfromscratch.org>
In-Reply-To: <4B8449DB.1040401@linuxfromscratch.org> (Matthew Burgess's
	message of "Tue, 23 Feb 2010 21:34:19 +0000")
References: <4B8449DB.1040401@linuxfromscratch.org>
Date: Thu, 25 Feb 2010 18:02:15 +0100
Message-ID: <87zl2x8d0o.fsf@meyering.net>
Lines: 28
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
Cc: bug-diffutils@gnu.org
Subject: [bug-diffutils] Re: [patch] i18n patch for diffutils
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Feb 2010 17:02:25 -0000

Matthew Burgess wrote:
> Linux From Scratch is currently carrying the attached patch that we
> took verbatim from Redhat some time ago.  It apparently fixes an issue
> concerning handling whitespace in multibyte locales, but comes with no
> test case so I'm unable to figure out whether this has been fixed in
> some other way already.  I note there was some discussion at
> http://lists.gnu.org/archive/html/bug-gnu-utils/2008-01/msg00030.html
> regarding side-by-side comparisons in multibyte locales, but can't
> tell whether the fixes there may have fixed up whatever this patch is
> trying to do.
>
> Apologies for such a wishy-washy report; I'm hoping someone with more
> knowledge of the source code and multibyte issues may be able to
> figure out quicker than I can whether the patch LFS is currently
> carrying is still required, and whether it can be applied as-is
> upstream.

Thanks for taking the time.
Normally I'd be very interested.
However, in this case, the patch ends up duplicating
a lot of important logic, and I'm holding out hope
that we'll end up with multibyte support that avoids
that maintenance pitfall while still retaining most of
the single-byte performance.

If you do find a test case that demonstrates how that patch
can help (or any test case), I'd be happy to add that, independent
of adding the code to fix it.



From MAILER-DAEMON Thu Feb 25 12:24:02 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NkhRS-0003Tc-1f
	for mharc-bug-diffutils@gnu.org; Thu, 25 Feb 2010 12:24:02 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NkhRP-0003TF-LD
	for bug-diffutils@gnu.org; Thu, 25 Feb 2010 12:23:59 -0500
Received: from [140.186.70.92] (port=50068 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NkhRO-0003Sv-VK
	for bug-diffutils@gnu.org; Thu, 25 Feb 2010 12:23:59 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <matthew@linuxfromscratch.org>) id 1NkhRO-0003YS-4y
	for bug-diffutils@gnu.org; Thu, 25 Feb 2010 12:23:58 -0500
Received: from quantum.linuxfromscratch.org ([216.171.237.234]:39667)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <matthew@linuxfromscratch.org>) id 1NkhRO-0003YI-0D
	for bug-diffutils@gnu.org; Thu, 25 Feb 2010 12:23:58 -0500
Received: by quantum.linuxfromscratch.org (Postfix, from userid 108)
	id C46A3140D0; Thu, 25 Feb 2010 10:23:09 -0700 (MST)
Received: from localhost (quantum.linuxfromscratch.org [216.171.237.234])
	by quantum.linuxfromscratch.org (Postfix) with ESMTP id D3CFC1408D;
	Thu, 25 Feb 2010 10:23:02 -0700 (MST)
MIME-Version: 1.0
Date: Thu, 25 Feb 2010 10:23:02 -0700
From: Matthew Burgess <matthew@linuxfromscratch.org>
To: Jim Meyering <jim@meyering.net>
In-Reply-To: <87zl2x8d0o.fsf@meyering.net>
References: <87zl2x8d0o.fsf@meyering.net>
Message-ID: <b29887f3eee99dcd3bfc57de3e23dc37@quantum.linuxfromscratch.org>
X-Sender: matthew@linuxfromscratch.org
User-Agent: RoundCube Webmail/0.1b
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
Cc: bug-diffutils@gnu.org
Subject: [bug-diffutils] Re: [patch] i18n patch for diffutils
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Feb 2010 17:23:59 -0000

On Thu, 25 Feb 2010 18:02:15 +0100, Jim Meyering <jim@meyering.net> wrote=
:

> However, in this case, the patch ends up duplicating
> a lot of important logic, and I'm holding out hope
> that we'll end up with multibyte support that avoids
> that maintenance pitfall while still retaining most of
> the single-byte performance.

I notice that Padraig Brady mentioned libunistring when a similar
issue was noted in Coreutils (pinky) -
http://lists.gnu.org/archive/html/bug-coreutils/2010-01/msg00234.html.

Do GNU projects have a consistent stance on the use of that relatively
new library as a dependency?  I'm wondering if diffutils were
interested in utilising it, would it be OK for a patch that did so to
have it as a hard dependency, to save having to have multiple branches
in the code to handle its presence/absence?
=20
> If you do find a test case that demonstrates how that patch
> can help (or any test case), I'd be happy to add that, independent
> of adding the code to fix it.

I'll see what I can do!

Regards,

Matt.




From MAILER-DAEMON Thu Feb 25 12:45:34 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NkhmI-0004F3-FZ
	for mharc-bug-diffutils@gnu.org; Thu, 25 Feb 2010 12:45:34 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NkhmG-0004E7-Gw
	for bug-diffutils@gnu.org; Thu, 25 Feb 2010 12:45:32 -0500
Received: from [140.186.70.92] (port=58116 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NkhmF-0004Dd-JI
	for bug-diffutils@gnu.org; Thu, 25 Feb 2010 12:45:32 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1NkhmE-0005nI-L5
	for bug-diffutils@gnu.org; Thu, 25 Feb 2010 12:45:31 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:43622)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1NkhmE-0005mJ-2C
	for bug-diffutils@gnu.org; Thu, 25 Feb 2010 12:45:30 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id BED218181E8
	for <bug-diffutils@gnu.org>; Thu, 25 Feb 2010 18:45:24 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id D51378181B6
	for <bug-diffutils@gnu.org>; Thu, 25 Feb 2010 18:45:21 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id A9C57387DA; Thu, 25 Feb 2010 18:45:21 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: Matthew Burgess <matthew@linuxfromscratch.org>
In-Reply-To: <b29887f3eee99dcd3bfc57de3e23dc37@quantum.linuxfromscratch.org>
	(Matthew Burgess's message of "Thu, 25 Feb 2010 10:23:02 -0700")
References: <87zl2x8d0o.fsf@meyering.net>
	<b29887f3eee99dcd3bfc57de3e23dc37@quantum.linuxfromscratch.org>
Date: Thu, 25 Feb 2010 18:45:21 +0100
Message-ID: <87d3zt8b0u.fsf@meyering.net>
Lines: 28
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
Cc: bug-diffutils@gnu.org
Subject: [bug-diffutils] Re: [patch] i18n patch for diffutils
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Feb 2010 17:45:33 -0000

Matthew Burgess wrote:
> On Thu, 25 Feb 2010 18:02:15 +0100, Jim Meyering <jim@meyering.net> wrote:
>
>> However, in this case, the patch ends up duplicating
>> a lot of important logic, and I'm holding out hope
>> that we'll end up with multibyte support that avoids
>> that maintenance pitfall while still retaining most of
>> the single-byte performance.
>
> I notice that Padraig Brady mentioned libunistring when a similar
> issue was noted in Coreutils (pinky) -
> http://lists.gnu.org/archive/html/bug-coreutils/2010-01/msg00234.html.

That's the plan.

> Do GNU projects have a consistent stance on the use of that relatively
> new library as a dependency?  I'm wondering if diffutils were

It sounds fine to me, and I'm confident that at least coreutils
and diffutils will have a consistent stance ;-)

> interested in utilising it, would it be OK for a patch that did so to
> have it as a hard dependency, to save having to have multiple branches
> in the code to handle its presence/absence?

That's a fine place to start.  Once we have something acceptable,
if someone wants badly enough to build without that library, they'll
find a way to contribute the patch.



