From MAILER-DAEMON Sat Jan 02 12:19:02 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NR7d0-00086o-5f
	for mharc-bug-diffutils@gnu.org; Sat, 02 Jan 2010 12:19:02 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NR7cz-00086a-Kp
	for bug-diffutils@gnu.org; Sat, 02 Jan 2010 12:19:01 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NR7cy-00086N-2X
	for bug-diffutils@gnu.org; Sat, 02 Jan 2010 12:19:01 -0500
Received: from [199.232.76.173] (port=38919 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NR7cx-00086K-UP
	for bug-diffutils@gnu.org; Sat, 02 Jan 2010 12:18:59 -0500
Received: from qmta13.emeryville.ca.mail.comcast.net ([76.96.27.243]:50444)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <ebb9@byu.net>) id 1NR7cx-0006E7-QV
	for bug-diffutils@gnu.org; Sat, 02 Jan 2010 12:19:00 -0500
Received: from OMTA01.emeryville.ca.mail.comcast.net ([76.96.30.11])
	by QMTA13.emeryville.ca.mail.comcast.net with comcast
	id Qgfq1d00B0EPchoADhJtnn; Sat, 02 Jan 2010 17:18:53 +0000
Received: from [192.168.0.104] ([24.10.244.244])
	by OMTA01.emeryville.ca.mail.comcast.net with comcast
	id QhJr1d0025H651C8MhJsus; Sat, 02 Jan 2010 17:18:52 +0000
Message-ID: <4B3F7FFB.30708@byu.net>
Date: Sat, 02 Jan 2010 10:18:51 -0700
From: Eric Blake <ebb9@byu.net>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
	rv:1.8.1.23) Gecko/20090812 Thunderbird/2.0.0.23 Mnenhy/0.7.6.666
MIME-Version: 1.0
To: bug-diffutils@gnu.org
X-Enigmail-Version: 0.96.0
Content-Type: multipart/mixed; boundary="------------090708070103010500060702"
X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not
	recognized.
Subject: [bug-diffutils] compilation on cygwin
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, 02 Jan 2010 17:19:01 -0000

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

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I'm getting link failures on cygwin, due to missing references to iconv.
OK to apply?

- --
Don't work too hard, make some time for fun as well!

Eric Blake             ebb9@byu.net
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAks/f/oACgkQ84KuGfSFAYD6SACglIaq1POPo5ulCr8O6BekwLWn
Q1sAni0b73500IUhb7G7FOVtXKUTsArH
=0ezS
-----END PGP SIGNATURE-----

--------------090708070103010500060702
Content-Type: text/plain;
 name="diffutils.patch3"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="diffutils.patch3"

>From cae7ea77489373133d47833321d83b3f7bf5fe51 Mon Sep 17 00:00:00 2001
From: Eric Blake <ebb9@byu.net>
Date: Sat, 2 Jan 2010 10:17:00 -0700
Subject: [PATCH] build: allow compilation on cygwin

* src/Makefile.am (cmp_LDADD): Move LIBICONV...
(LDADD): ...into global flags, since all programs need it.
---
 src/Makefile.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 65e7fe8..48fbf7d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,11 +28,12 @@ LDADD = \
   ../lib/libdiffutils.a \
   $(LIBCSTACK) \
   $(LIBINTL) \
+  $(LIBICONV) \
   $(LIBSIGSEGV) \
   $(LIB_CLOCK_GETTIME)

 diff_LDADD = $(LDADD)
-cmp_LDADD = $(LDADD) $(LIBICONV)
+cmp_LDADD = $(LDADD)
 sdiff_LDADD = $(LDADD)
 diff3_LDADD = $(LDADD)

-- 
1.6.4.2


--------------090708070103010500060702--



From MAILER-DAEMON Mon Jan 04 07:11:36 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NRlma-0007Cf-Cj
	for mharc-bug-diffutils@gnu.org; Mon, 04 Jan 2010 07:11:36 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NRlmY-0007CX-OE
	for bug-diffutils@gnu.org; Mon, 04 Jan 2010 07:11:34 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NRlmT-0007C0-MC
	for bug-diffutils@gnu.org; Mon, 04 Jan 2010 07:11:33 -0500
Received: from [199.232.76.173] (port=34895 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NRlmT-0007Bx-FZ
	for bug-diffutils@gnu.org; Mon, 04 Jan 2010 07:11:29 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:37697)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <jim@meyering.net>) id 1NRlmS-0005OD-Lu
	for bug-diffutils@gnu.org; Mon, 04 Jan 2010 07:11:29 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id DD565818167
	for <bug-diffutils@gnu.org>; Mon,  4 Jan 2010 13:11:25 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 0F3158180F7
	for <bug-diffutils@gnu.org>; Mon,  4 Jan 2010 13:11:23 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id DF6C22125F; Mon,  4 Jan 2010 13:11:22 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: Eric Blake <ebb9@byu.net>
Subject: Re: [bug-diffutils] compilation on cygwin
In-Reply-To: <4B3F7FFB.30708@byu.net> (Eric Blake's message of "Sat, 02 Jan
	2010 10:18:51 -0700")
References: <4B3F7FFB.30708@byu.net>
Date: Mon, 04 Jan 2010 13:11:22 +0100
Message-ID: <871vi6cbo5.fsf@meyering.net>
Lines: 10
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
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: Mon, 04 Jan 2010 12:11:35 -0000

Eric Blake wrote:
> I'm getting link failures on cygwin, due to missing references to iconv.
> OK to apply?
...
> Subject: [PATCH] build: allow compilation on cygwin
>
> * src/Makefile.am (cmp_LDADD): Move LIBICONV...
> (LDADD): ...into global flags, since all programs need it.

Yes.  Thanks!



From MAILER-DAEMON Mon Jan 04 12:46:27 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NRr0d-00069P-Hv
	for mharc-bug-diffutils@gnu.org; Mon, 04 Jan 2010 12:46:27 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NRgLj-0000q8-Ab
	for bug-diffutils@gnu.org; Mon, 04 Jan 2010 01:23:31 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NRgLe-0000pf-AL
	for bug-diffutils@gnu.org; Mon, 04 Jan 2010 01:23:30 -0500
Received: from [199.232.76.173] (port=47647 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NRgLd-0000pc-W2
	for bug-diffutils@gnu.org; Mon, 04 Jan 2010 01:23:26 -0500
Received: from kiwi.cs.ucla.edu ([131.179.128.19]:45046)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <eggert@CS.UCLA.EDU>) id 1NRgLd-0007pz-Ht
	for bug-diffutils@gnu.org; Mon, 04 Jan 2010 01:23:25 -0500
Received: from penguin (Penguin.CS.UCLA.EDU [131.179.64.200])
	by kiwi.cs.ucla.edu (8.13.8+Sun/8.13.8/UCLACS-6.0) with ESMTP id
	o046NFNG003837; Sun, 3 Jan 2010 22:23:15 -0800 (PST)
To: Eric Blake <ebb9@byu.net>
Subject: Re: [bug-diffutils] compilation on cygwin
References: <4B3F7FFB.30708@byu.net>
From: Paul Eggert <eggert@CS.UCLA.EDU>
Date: Sun, 03 Jan 2010 22:23:15 -0800
In-Reply-To: <4B3F7FFB.30708@byu.net> (Eric Blake's message of "Sat\,
	02 Jan 2010 10\:18\:51 -0700")
Message-ID: <87skamjsmk.fsf@cs.ucla.edu>
User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta)
X-Mailman-Approved-At: Mon, 04 Jan 2010 12:46:25 -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: Mon, 04 Jan 2010 06:23:31 -0000

Eric Blake <ebb9@byu.net> writes:

> * src/Makefile.am (cmp_LDADD): Move LIBICONV...
> (LDADD): ...into global flags, since all programs need it.

Thanks, that looks fine to apply.



From MAILER-DAEMON Sat Jan 09 05:15:18 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NTYLl-0003z3-Us
	for mharc-bug-diffutils@gnu.org; Sat, 09 Jan 2010 05:15:17 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NTYLj-0003wx-PO
	for bug-diffutils@gnu.org; Sat, 09 Jan 2010 05:15:15 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NTYLd-0003qX-Uz
	for bug-diffutils@gnu.org; Sat, 09 Jan 2010 05:15:15 -0500
Received: from [199.232.76.173] (port=50785 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NTYLd-0003qG-Mk
	for bug-diffutils@gnu.org; Sat, 09 Jan 2010 05:15:09 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:56985)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <jim@meyering.net>) id 1NTYLc-0003Qb-R7
	for bug-diffutils@gnu.org; Sat, 09 Jan 2010 05:15:09 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 3EAB68181CF
	for <bug-diffutils@gnu.org>; Sat,  9 Jan 2010 11:15:02 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 57C4381820F
	for <bug-diffutils@gnu.org>; Sat,  9 Jan 2010 11:15:00 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 9872D2B6A9; Sat,  9 Jan 2010 11:14:59 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Sat, 09 Jan 2010 11:14:59 +0100
Message-ID: <871vhzbn4s.fsf@meyering.net>
Lines: 126
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 2/3] tests: add a test of basic functionality
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, 09 Jan 2010 10:15:16 -0000

I've just pushed a few small changes.

  maint: udpate GFDL license to 1.3
  tests: add a test of basic functionality
  build: update gnulib submodule to latest

>From cadd497e2759a208c3512b9c8c6c7fb61c5fbb22 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Fri, 8 Jan 2010 11:34:43 +0100
Subject: [PATCH 1/3] maint: udpate GFDL license to 1.3

* doc/diff.texi: Update to use GFDL version 1.3.
---
 doc/diff.texi |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/diff.texi b/doc/diff.texi
index 3ad0241..c933934 100644
--- a/doc/diff.texi
+++ b/doc/diff.texi
@@ -19,7 +19,7 @@ Software Foundation, Inc.

 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
 and with the Back-Cover Texts as in (a) below.  A copy of the
--
1.6.6.439.gaf68f


>From 4e1233f063e4c3e5421cd28245b96f2607a7038b Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sat, 9 Jan 2010 11:05:59 +0100
Subject: [PATCH 2/3] tests: add a test of basic functionality

* tests/basic: Start adding tests.
* tests/Makefile.am (TESTS): Add it.
---
 tests/Makefile.am |    1 +
 tests/basic       |   42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 0 deletions(-)
 create mode 100755 tests/basic

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5104fe6..b42c905 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,5 @@
 TESTS = \
+  basic \
   help-version	\
   label-vs-func

diff --git a/tests/basic b/tests/basic
new file mode 100755
index 0000000..e2979d2
--- /dev/null
+++ b/tests/basic
@@ -0,0 +1,42 @@
+#!/bin/sh
+# small examples
+: ${srcdir=.}
+. "$srcdir/init.sh"; path_prepend_ .
+
+fail=0
+
+cat <<EOF > exp- || fail=1
+1c1
+< a
+---
+> b
+EOF
+
+cat <<EOF > exp--u || fail=1
+--- a
++++ b
+@@ -1 +1 @@
+-a
++b
+EOF
+
+cat <<EOF > exp--c || fail=1
+*** a
+--- b
+***************
+*** 1 ****
+! a
+--- 1 ----
+! b
+EOF
+
+echo a > a
+echo b > b
+for opt in '' -u -c; do
+  diff $opt a b > out 2> err; test $? = 1 || fail=1
+  # Remove date and time.
+  sed -e 's/^\([-+*][-+*][-+*] [^	]*\)	.*/\1/' out > k; mv k out
+  compare out exp-$(echo $opt|tr ' ' _) || fail=1
+done
+
+Exit $fail
--
1.6.6.439.gaf68f


>From a9d7c6d1a52970f26741f6af4cf873730ad50c2a Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Fri, 8 Jan 2010 11:35:26 +0100
Subject: [PATCH 3/3] build: update gnulib submodule to latest

---
 gnulib |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gnulib b/gnulib
index d91a0d2..581419c 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit d91a0d2dc678afe8a2c696077f0640e6874f52bc
+Subproject commit 581419c98c50af5daefcbb07ca1cbc16539db072
--
1.6.6.439.gaf68f



From MAILER-DAEMON Sat Jan 09 05:46:37 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NTYq5-0000X6-71
	for mharc-bug-diffutils@gnu.org; Sat, 09 Jan 2010 05:46:37 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NTYq3-0000WM-6G
	for bug-diffutils@gnu.org; Sat, 09 Jan 2010 05:46:35 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NTYpy-0000VZ-5W
	for bug-diffutils@gnu.org; Sat, 09 Jan 2010 05:46:34 -0500
Received: from [199.232.76.173] (port=47704 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1NTYpx-0000VW-U4; Sat, 09 Jan 2010 05:46:29 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:58258)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <jim@meyering.net>)
	id 1NTYpw-0006Ed-VT; Sat, 09 Jan 2010 05:46:29 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id C76718181C3;
	Sat,  9 Jan 2010 11:46:23 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id AD55B8180DE;
	Sat,  9 Jan 2010 11:46:20 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 8D9793820A; Sat,  9 Jan 2010 11:46:20 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: bug-gnulib@gnu.org, bug-diffutils@gnu.org
Date: Sat, 09 Jan 2010 11:46:20 +0100
Message-ID: <87vdfba743.fsf@meyering.net>
Lines: 66
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: 
Subject: [bug-diffutils] [PATCH] maint.mk: extend
	proper_name_utf8-vs-LIBICONV-checking rule
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, 09 Jan 2010 10:46:35 -0000

FYI, the recent move in diffutils of $(LIBICONV) from cmp_LDADD
to LDADD, a syntax-check rule began to fail.  This extends the
rule to recognize the new situation.

It could be slightly more efficient in some cases by determining
that the only programs are in say src/, and when it finds LDADD
has the requisite string, stop right away (success) rather than
continuing to do the same search for each additional program.
However, making it ultimately efficient would hurt readability
for negligible gain.  No thanks.

>From bc3991768078b437cbbbe93bc1cd2eab0ca98000 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sat, 9 Jan 2010 11:41:00 +0100
Subject: [PATCH] maint.mk: extend proper_name_utf8-vs-LIBICONV-checking rule

* top/maint.mk (sc_proper_name_utf8_requires_ICONV): Adapt to work
also when $(LIBICONV) is part of LDADD, rather than ${prog}_LDADD.
---
 ChangeLog    |    6 ++++++
 top/maint.mk |   10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4d4137e..9bacb89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-09  Jim Meyering  <meyering@redhat.com>
+
+	maint.mk: extend proper_name_utf8-vs-LIBICONV-checking rule
+	* top/maint.mk (sc_proper_name_utf8_requires_ICONV): Adapt to work
+	also when $(LIBICONV) is part of LDADD, rather than ${prog}_LDADD.
+
 2010-01-08  Simon Josefsson  <simon@josefsson.org>

 	* lib/dup2.c (rpl_dup2): Improve comment.
diff --git a/top/maint.mk b/top/maint.mk
index 3cd1a93..3651543 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -524,14 +524,20 @@ sc_prohibit_S_IS_definition:
 	msg='do not define S_IS* macros; include <sys/stat.h>'		\
 	  $(_prohibit_regexp)

-# Each program that uses proper_name_utf8 must link with
-# one of the ICONV libraries.
+# Each program that uses proper_name_utf8 must link with one of the
+# ICONV libraries.  Otherwise, some ICONV library must appear in LDADD.
+# The perl -0777 invocation below extracts the possibly-multi-line
+# definition of LDADD from the appropriate Makefile.am and exits 0
+# when it contains "ICONV".
 sc_proper_name_utf8_requires_ICONV:
 	@progs=$$(grep -l 'proper_name_utf8 ''("' $$($(VC_LIST_EXCEPT)));\
 	if test "x$$progs" != x; then					\
 	  fail=0;							\
 	  for p in $$progs; do						\
 	    dir=$$(dirname "$$p");					\
+	    perl -0777							\
+	      -ne 'exit !(/^LDADD =(.+?[^\\]\n)/ms && $$1 =~ /ICONV/)'	\
+	      $$dir/Makefile.am && continue;				\
 	    base=$$(basename "$$p" .c);					\
 	    grep "$${base}_LDADD.*ICONV)" $$dir/Makefile.am > /dev/null	\
 	      || { fail=1; echo 1>&2 "$(ME): $$p uses proper_name_utf8"; }; \
--
1.6.6.439.gaf68f



From MAILER-DAEMON Sun Jan 10 05:57:24 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NTvU3-0006Fn-Qv
	for mharc-bug-diffutils@gnu.org; Sun, 10 Jan 2010 05:57:24 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NTvU1-0006FY-QN
	for bug-diffutils@gnu.org; Sun, 10 Jan 2010 05:57:21 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NTvTw-0006Eb-Qb
	for bug-diffutils@gnu.org; Sun, 10 Jan 2010 05:57:21 -0500
Received: from [199.232.76.173] (port=34262 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NTvTw-0006ES-HR
	for bug-diffutils@gnu.org; Sun, 10 Jan 2010 05:57:16 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:41781)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <jim@meyering.net>) id 1NTvTv-0000uL-BS
	for bug-diffutils@gnu.org; Sun, 10 Jan 2010 05:57:16 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 270EC8181E6
	for <bug-diffutils@gnu.org>; Sun, 10 Jan 2010 11:57:10 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 393BB8181AA
	for <bug-diffutils@gnu.org>; Sun, 10 Jan 2010 11:57:08 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 2192B8A39; Sun, 10 Jan 2010 11:57:08 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Sun, 10 Jan 2010 11:57:08 +0100
Message-ID: <87fx6e6xdn.fsf@meyering.net>
Lines: 232
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] tests: now "make distcheck" runs more tests,
	incl. syntax-check
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, 10 Jan 2010 10:57:22 -0000

With coreutils, I'd become accustomed to "make distcheck" also
running "make syntax-check" and a few other relatively expensive
distribution-related checks.  Since diffutils didn't have that,
at least one of my recent changes broke "make syntax-check" even
though it passed "make distcheck".

This change adds those checks here, too, so that won't happen again.

>From 2d648ae3fe10d9b554f7c2c5ee8c84371e687392 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sun, 10 Jan 2010 11:45:20 +0100
Subject: [PATCH] tests: now "make distcheck" runs more tests, incl. syntax-check

* cfg.mk: Include dist-check.mk, from coreutils.
* Makefile.am (distcheck-hook): Define rule, to hook to...
* dist-check.mk: New file.
---
 Makefile.am   |    6 ++
 cfg.mk        |    2 +
 dist-check.mk |  170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 178 insertions(+), 0 deletions(-)
 create mode 100644 dist-check.mk

diff --git a/Makefile.am b/Makefile.am
index 44e8bbd..0f0e0ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

+ALL_RECURSIVE_TARGETS =
+
 EXTRA_DIST = bootstrap exgettext ChangeLog-2008
 SUBDIRS = lib src tests doc man po ms gnulib-tests

@@ -35,3 +37,7 @@ gen-ChangeLog:
 	  rm -f $(distdir)/ChangeLog;					\
 	  mv $(distdir)/cl-t $(distdir)/ChangeLog;			\
 	fi
+
+ALL_RECURSIVE_TARGETS += distcheck-hook
+distcheck-hook:
+	$(MAKE) my-distcheck
diff --git a/cfg.mk b/cfg.mk
index 7c828d0..4e10c16 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -37,3 +37,5 @@ config_h_header = (<config\.h>|"(diff|system)\.h")
 update-copyright-env = \
   UPDATE_COPYRIGHT_USE_INTERVALS=1 \
   UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79
+
+include $(srcdir)/dist-check.mk
diff --git a/dist-check.mk b/dist-check.mk
new file mode 100644
index 0000000..dd30db2
--- /dev/null
+++ b/dist-check.mk
@@ -0,0 +1,170 @@
+# Most of this is probably too coreutils-centric to be useful to other packages.
+
+bin=bin-$$$$
+
+write_loser = printf '\#!%s\necho $$0: bad path 1>&2; exit 1\n' '$(SHELL)'
+
+tmpdir = $(abs_top_builddir)/tests/torture
+
+t=$(tmpdir)/$(PACKAGE)/test
+pfx=$(t)/i
+
+built_programs =						\
+  $$(echo 'spy:;@echo $$(bin_PROGRAMS)'				\
+    | MAKEFLAGS= $(MAKE) -s -C src -f Makefile -f - spy		\
+    | fmt -1 | sed 's,$(EXEEXT)$$,,' | sort -u)
+
+# More than once, tainted build and source directory names would
+# have caused at least one "make check" test to apply "chmod 700"
+# to all directories under $HOME.  Make sure it doesn't happen again.
+tp = $(tmpdir)/taint
+t_prefix = $(tp)/a
+t_taint = '$(t_prefix) b'
+fake_home = $(tp)/home
+
+# When extracting from a distribution tarball, extract using the fastest
+# method possible.  With dist-xz, that means using the *.xz file.
+ifneq ('', $(filter *.xz, $(DIST_ARCHIVES)))
+  tar_decompress_opt_ = J
+  suffix_ = xz
+else
+  ifneq ('', $(filter *.gz, $(DIST_ARCHIVES)))
+    tar_decompress_opt_ = z
+    suffix_ = gz
+  else
+    tar_decompress_opt_ = j
+    suffix_ = bz2
+  endif
+endif
+amtar_extract_ = $(AMTAR) -$(tar_decompress_opt_)xf
+preferred_tarball_ = $(distdir).tar.$(suffix_)
+
+# Ensure that tests run from tainted build and src dir names work,
+# and don't affect anything in $HOME.  Create witness files in $HOME,
+# record their attributes, and build/test.  Then ensure that the
+# witnesses were not affected.
+# Skip this test when using libtool, since libtool-generated scripts
+# cannot deal with a space-tainted srcdir.
+ALL_RECURSIVE_TARGETS += taint-distcheck
+taint-distcheck: $(DIST_ARCHIVES)
+	grep '^[	 ]*LT_INIT' configure.ac >/dev/null && exit 0 || :
+	test -d $(t_taint) && chmod -R 700 $(t_taint) || :
+	-rm -rf $(t_taint) $(fake_home)
+	mkdir -p $(t_prefix) $(t_taint) $(fake_home)
+	$(amtar_extract_) $(preferred_tarball_) -C $(t_taint)
+	mkfifo $(fake_home)/fifo
+	touch $(fake_home)/f
+	mkdir -p $(fake_home)/d/e
+	ls -lR $(fake_home) $(t_prefix) > $(tp)/.ls-before
+	HOME=$(fake_home); export HOME;			\
+	cd $(t_taint)/$(distdir)			\
+	  && ./configure				\
+	  && $(MAKE)					\
+	  && $(MAKE) check				\
+	  && ls -lR $(fake_home) $(t_prefix) > $(tp)/.ls-after \
+	  && diff $(tp)/.ls-before $(tp)/.ls-after	\
+	  && test -d $(t_prefix)
+	rm -rf $(tp)
+
+# Verify that a twisted use of --program-transform-name=PROGRAM works.
+define install-transform-check
+  echo running install-transform-check			\
+    && rm -rf $(pfx)					\
+    && $(MAKE) program_transform_name='s/.*/zyx/'	\
+      prefix=$(pfx) install				\
+    && test "$$(echo $(pfx)/bin/*)" = "$(pfx)/bin/zyx"	\
+    && test "$$(find $(pfx)/share/man -type f|sed 's,.*/,,;s,\..*,,')" = "zyx"
+endef
+
+# Install, then verify that all binaries and man pages are in place.
+# Note that neither the binary, ginstall, nor the [.1 man page is installed.
+define my-instcheck
+  echo running my-instcheck;				\
+  $(MAKE) prefix=$(pfx) install				\
+    && test ! -f $(pfx)/bin/ginstall			\
+    && { fail=0;					\
+      for i in $(built_programs); do			\
+        test "$$i" = ginstall && i=install;		\
+        for j in "$(pfx)/bin/$$i"			\
+                 "$(pfx)/share/man/man1/$$i.1"; do	\
+          case $$j in *'[.1') continue;; esac;		\
+          test -f "$$j" && :				\
+            || { echo "$$j not installed"; fail=1; };	\
+        done;						\
+      done;						\
+      test $$fail = 1 && exit 1 || :;			\
+    }
+endef
+
+# The hard-linking for-loop below ensures that there is a bin/ directory
+# full of all of the programs under test (except the ones that are required
+# for basic Makefile rules), all symlinked to the just-built "false" program.
+# This is to ensure that if ever a test neglects to make PATH include
+# the build srcdir, these always-failing programs will run.
+# Otherwise, it is too easy to test the wrong programs.
+# Note that "false" itself is a symlink to true, so it too will malfunction.
+define coreutils-path-check
+  {							\
+    echo running coreutils-path-check;			\
+    if test -f $(srcdir)/src/true.c; then		\
+      fail=1;						\
+      mkdir $(bin)					\
+	&& ($(write_loser)) > $(bin)/loser		\
+	&& chmod a+x $(bin)/loser			\
+	&& for i in $(built_programs); do		\
+	       case $$i in				\
+		 rm|expr|basename|echo|sort|ls|tr);;	\
+		 cat|dirname|mv|wc);;			\
+		 *) ln $(bin)/loser $(bin)/$$i;;	\
+	       esac;					\
+	     done					\
+	  && ln -sf ../src/true $(bin)/false		\
+	  && PATH=`pwd`/$(bin)$(PATH_SEPARATOR)$$PATH	\
+		$(MAKE) -C tests check			\
+	  && { test -d gnulib-tests			\
+		 && $(MAKE) -C gnulib-tests check	\
+		 || :; }				\
+	  && rm -rf $(bin)				\
+	  && fail=0;					\
+    else						\
+      fail=0;						\
+    fi;							\
+    test $$fail = 1 && exit 1 || :;			\
+  }
+endef
+
+# Use this to make sure we don't run these programs when building
+# from a virgin compressed tarball file, below.
+null_AM_MAKEFLAGS ?= \
+  ACLOCAL=false \
+  AUTOCONF=false \
+  AUTOMAKE=false \
+  AUTOHEADER=false \
+  GPERF=false \
+  MAKEINFO=false
+
+ALL_RECURSIVE_TARGETS += my-distcheck
+my-distcheck: $(DIST_ARCHIVES) $(local-check)
+	$(MAKE) syntax-check
+	$(MAKE) check
+	-rm -rf $(t)
+	mkdir -p $(t)
+	$(amtar_extract_) $(preferred_tarball_) -C $(t)
+	(set -e; cd $(t)/$(distdir);			\
+	  ./configure --quiet --enable-gcc-warnings --disable-nls; \
+	  $(MAKE) AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)';	\
+	  $(MAKE) dvi;					\
+	  $(install-transform-check);			\
+	  $(my-instcheck);				\
+	  $(coreutils-path-check);			\
+	  $(MAKE) distclean				\
+	)
+	(cd $(t) && mv $(distdir) $(distdir).old	\
+	  && $(amtar_extract_) - ) < $(preferred_tarball_)
+	diff -ur $(t)/$(distdir).old $(t)/$(distdir)
+	-rm -rf $(t)
+	rmdir $(tmpdir)/$(PACKAGE) $(tmpdir)
+	@echo "========================"; \
+	echo "ready for distribution:"; \
+	for i in $(DIST_ARCHIVES); do echo "  $$i"; done; \
+	echo "========================"
--
1.6.6.439.gaf68f



From MAILER-DAEMON Wed Jan 13 07:59:14 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NV2oc-0008QR-0J
	for mharc-bug-diffutils@gnu.org; Wed, 13 Jan 2010 07:59:14 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NV2oa-0008Pf-6Q
	for bug-diffutils@gnu.org; Wed, 13 Jan 2010 07:59:12 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NV2oV-0008Oq-I0
	for bug-diffutils@gnu.org; Wed, 13 Jan 2010 07:59:11 -0500
Received: from [199.232.76.173] (port=38822 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NV2oV-0008On-Eu
	for bug-diffutils@gnu.org; Wed, 13 Jan 2010 07:59:07 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:52832)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <jim@meyering.net>) id 1NV2oU-0000tH-Jd
	for bug-diffutils@gnu.org; Wed, 13 Jan 2010 07:59:07 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 7C4CA818109
	for <bug-diffutils@gnu.org>; Wed, 13 Jan 2010 13:59:02 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 982CA8180D0
	for <bug-diffutils@gnu.org>; Wed, 13 Jan 2010 13:59:00 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 7E8F03841C; Wed, 13 Jan 2010 13:59:00 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Wed, 13 Jan 2010 13:59:00 +0100
Message-ID: <87bpgyqhyj.fsf@meyering.net>
Lines: 69
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] tests: ensure that an argument of "-" is
	treated as standard input
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, 13 Jan 2010 12:59:12 -0000

While testing on openbsd4.5, I noticed that the very latest
gnu diff would misbehave:

    $ echo a|./diff - <(echo a)
    ./diff: failed to reopen `stdin' with mode `rb': Bad address
    [Exit 2]

To ensure we fix it eventually, I've written a test
to exercise that failure:

>From 07e844a96ddecc1702b847ce95d956409a75de46 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Wed, 13 Jan 2010 13:54:13 +0100
Subject: [PATCH] tests: ensure that an argument of "-" is treated as standard input

* tests/stdin: New test.
* tests/Makefile.am (TESTS): Add it.
---
 tests/Makefile.am |    3 ++-
 tests/stdin       |   24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)
 create mode 100755 tests/stdin

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b42c905..6bcd255 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,8 @@
 TESTS = \
   basic \
   help-version	\
-  label-vs-func
+  label-vs-func	\
+  stdin

 EXTRA_DIST = \
   $(TESTS) init.sh t-local.sh
diff --git a/tests/stdin b/tests/stdin
new file mode 100755
index 0000000..673d8b0
--- /dev/null
+++ b/tests/stdin
@@ -0,0 +1,24 @@
+#!/bin/sh
+# Ensure that "-" means "standard input".
+: ${srcdir=.}
+. "$srcdir/init.sh"; path_prepend_ .
+
+fail=0
+
+cat <<EOF > exp || fail=1
+--- -
++++ b
+@@ -1 +1 @@
+-a
++b
+EOF
+
+echo a > a
+echo b > b
+
+diff -u - b < a > out 2> err; test $? = 1 || fail=1
+# Remove date and time.
+sed -e 's/^\([-+*][-+*][-+*] [^	]*\)	.*/\1/' out > k; mv k out
+compare out exp || fail=1
+
+Exit $fail
--
1.6.6.511.gf46c4



From MAILER-DAEMON Sat Jan 16 02:34:23 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NW3At-0004yC-Fs
	for mharc-bug-diffutils@gnu.org; Sat, 16 Jan 2010 02:34:23 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NW3Ar-0004xR-9g
	for bug-diffutils@gnu.org; Sat, 16 Jan 2010 02:34:21 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NW3Am-0004uv-Fx
	for bug-diffutils@gnu.org; Sat, 16 Jan 2010 02:34:20 -0500
Received: from [199.232.76.173] (port=48893 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1NW3Am-0004us-8S; Sat, 16 Jan 2010 02:34:16 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:59211)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <jim@meyering.net>)
	id 1NW3Al-000531-Go; Sat, 16 Jan 2010 02:34:16 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 371F48180BA;
	Sat, 16 Jan 2010 08:34:09 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 5AB60818047;
	Sat, 16 Jan 2010 08:34:07 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id E31DB388C3; Sat, 16 Jan 2010 08:34:06 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: jidanni@jidanni.org
In-Reply-To: <87r5pultw9.fsf@jidanni.org> (jidanni@jidanni.org's message of
	"Wed, 13 Jan 2010 08:40:06 +0800")
References: <87r5pultw9.fsf@jidanni.org>
Date: Sat, 16 Jan 2010 08:34:06 +0100
Message-ID: <87k4vi33m9.fsf@meyering.net>
Lines: 38
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, bug-gnu-utils@gnu.org
Subject: [bug-diffutils] Re: diff3 on binary files
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, 16 Jan 2010 07:34:21 -0000

jidanni@jidanni.org wrote:
> Is this the intended output?
> $ diff3 /bin/sh /bin/false /bin/mv
> diff3: subsidiary program `/usr/bin/diff' failed (exit status 2)
>
> Don't you want to just say "binary files a b and c differ"?
> diff3 (GNU diffutils) 2.8.7

[Cc'ing bug-diffutils, the preferred list for diff-related discussion]

Thanks for the report.
How about this, for now?

>From ef2251a3e5fa8bdf667cf38a9d9cbca38db1137b Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sat, 16 Jan 2010 08:32:06 +0100
Subject: [PATCH] doc: add to TODO

* TODO: Add an item, suggested by Dan Jacobson.
---
 TODO |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/TODO b/TODO
index 9488fea..f8dc34a 100644
--- a/TODO
+++ b/TODO
@@ -2,3 +2,8 @@ Add --include option (opposite of --exclude).

 Look into sdiff improvement here:
 http://www.pkix.net/~chuck/sdiff2.diff
+
+Propagate stderr from subprocess so that diff3 does
+a better job of explaining _why_:
+  > $ diff3 /bin/sh /bin/false /bin/mv
+  > diff3: subsidiary program `diff' failed (exit status 2)
--
1.6.6.556.gd6679



From MAILER-DAEMON Sun Jan 17 02:12:54 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NWPJe-0005HC-EV
	for mharc-bug-diffutils@gnu.org; Sun, 17 Jan 2010 02:12:54 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NWDYk-0008NC-OO
	for bug-diffutils@gnu.org; Sat, 16 Jan 2010 13:39:42 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NWDYf-0008Jb-3f
	for bug-diffutils@gnu.org; Sat, 16 Jan 2010 13:39:41 -0500
Received: from [199.232.76.173] (port=40205 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1NWDYf-0008JW-03; Sat, 16 Jan 2010 13:39:37 -0500
Received: from caiajhbdcaid.dreamhost.com ([208.97.132.83]:35731
	helo=homiemail-a14.g.dreamhost.com)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <jidanni@jidanni.org>)
	id 1NWDYe-0000Rh-Lt; Sat, 16 Jan 2010 13:39:36 -0500
Received: from jidanni.org (218-163-1-65.dynamic.hinet.net [218.163.1.65])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by homiemail-a14.g.dreamhost.com (Postfix) with ESMTPSA id 613F48C078; 
	Sat, 16 Jan 2010 10:39:33 -0800 (PST)
From: jidanni@jidanni.org
To: jim@meyering.net
References: <87k4vi33m9.fsf@meyering.net>
Date: Sun, 17 Jan 2010 02:39:31 +0800
Message-ID: <87ljfxc2sc.fsf@jidanni.org>
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)
X-Mailman-Approved-At: Sun, 17 Jan 2010 02:12:52 -0500
Cc: bug-diffutils@gnu.org, bug-gnu-utils@gnu.org
Subject: [bug-diffutils] Re: diff3 on binary files
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, 16 Jan 2010 18:39:43 -0000

JM> [Cc'ing bug-diffutils, the preferred list for diff-related discussion]
I just use the addresses on the man pages.
JM> How about this, for now?
JM> Subject: [PATCH] doc: add to TODO
OK. Thanks.



From MAILER-DAEMON Sun Jan 17 04:44:53 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NWRgj-000531-Hk
	for mharc-bug-diffutils@gnu.org; Sun, 17 Jan 2010 04:44:53 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NWRgh-00052M-Mn
	for bug-diffutils@gnu.org; Sun, 17 Jan 2010 04:44:51 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NWRgc-0004yW-01
	for bug-diffutils@gnu.org; Sun, 17 Jan 2010 04:44:50 -0500
Received: from [199.232.76.173] (port=53799 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1NWRgb-0004yN-TE; Sun, 17 Jan 2010 04:44:45 -0500
Received: from smtp3-g21.free.fr ([212.27.42.3]:39991)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <jim@meyering.net>)
	id 1NWRgb-0003nt-DG; Sun, 17 Jan 2010 04:44:45 -0500
Received: from smtp3-g21.free.fr (localhost [127.0.0.1])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 25E9C8181D2;
	Sun, 17 Jan 2010 10:44:40 +0100 (CET)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp3-g21.free.fr (Postfix) with ESMTP id 451108181AB;
	Sun, 17 Jan 2010 10:44:38 +0100 (CET)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 0FB7260EDD; Sun, 17 Jan 2010 10:44:38 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: jidanni@jidanni.org
In-Reply-To: <87ljfxc2sc.fsf@jidanni.org> (jidanni@jidanni.org's message of
	"Sun, 17 Jan 2010 02:39:31 +0800")
References: <87k4vi33m9.fsf@meyering.net> <87ljfxc2sc.fsf@jidanni.org>
Date: Sun, 17 Jan 2010 10:44:38 +0100
Message-ID: <87ljfx12wp.fsf@meyering.net>
Lines: 11
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, bug-gnu-utils@gnu.org
Subject: [bug-diffutils] Re: diff3 on binary files
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, 17 Jan 2010 09:44:52 -0000

jidanni@jidanni.org wrote:
> JM> [Cc'ing bug-diffutils, the preferred list for diff-related discussion]
> I just use the addresses on the man pages.

Yeah, the switch to bug-diffutils is relatively new.
I need to make a release:

    $ diff --help|grep @gn
    Report bugs to: bug-diffutils@gnu.org
    $ ./src/diff --version|head -1
    diff (GNU diffutils) 2.8.7.126-2d64



