From MAILER-DAEMON Sat May 01 02:18:35 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1O8627-0003Es-4O
	for mharc-bug-diffutils@gnu.org; Sat, 01 May 2010 02:18:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O8625-0003Em-Ga
	for bug-diffutils@gnu.org; Sat, 01 May 2010 02:18:33 -0400
Received: from [140.186.70.92] (port=48201 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O8623-0003Ee-VA
	for bug-diffutils@gnu.org; Sat, 01 May 2010 02:18:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1O8622-0001wo-Ig
	for bug-diffutils@gnu.org; Sat, 01 May 2010 02:18:31 -0400
Received: from smtp1-g21.free.fr ([212.27.42.1]:35952)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1O8621-0001wS-Uy
	for bug-diffutils@gnu.org; Sat, 01 May 2010 02:18:30 -0400
Received: from smtp1-g21.free.fr (localhost [127.0.0.1])
	by smtp1-g21.free.fr (Postfix) with ESMTP id 89A1E9400C9
	for <bug-diffutils@gnu.org>; Sat,  1 May 2010 08:18:25 +0200 (CEST)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp1-g21.free.fr (Postfix) with ESMTP id A981D940128
	for <bug-diffutils@gnu.org>; Sat,  1 May 2010 08:18:23 +0200 (CEST)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 44201F0F8; Sat,  1 May 2010 08:18:23 +0200 (CEST)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Sat, 01 May 2010 08:18:23 +0200
Message-ID: <87vdb86t74.fsf@meyering.net>
Lines: 31
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] build: use gnulib's sys_wait module
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, 01 May 2010 06:18:33 -0000

FYI,

Now that I've removed tests like
  #if HAVE_SYS_WAIT_H
we have to use gnulib's sys_wait module:

>From 3f027ba48d26ebca62066845832e12062a1ed8b2 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sat, 1 May 2010 08:17:06 +0200
Subject: [PATCH] build: use gnulib's sys_wait module

* bootstrap.conf (gnulib_modules): Use gnulib's sys_wait module,
now that we assume its presence.
---
 bootstrap.conf |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index 2e45a89..71fbd3f 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -61,6 +61,7 @@ strcase
 strftime
 strptime
 strtoumax
+sys_wait
 timegm
 unistd
 unlocked-io
--
1.7.1.328.g9993c



From MAILER-DAEMON Mon May 03 14:25:53 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1O90L2-0005K5-8a
	for mharc-bug-diffutils@gnu.org; Mon, 03 May 2010 14:25:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O90Kt-0005Dh-94
	for bug-diffutils@gnu.org; Mon, 03 May 2010 14:25:43 -0400
Received: from [140.186.70.92] (port=46456 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O90Kh-0003DG-CC
	for bug-diffutils@gnu.org; Mon, 03 May 2010 14:25:41 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1O8zce-00053b-1c
	for bug-diffutils@gnu.org; Mon, 03 May 2010 13:40:05 -0400
Received: from smtp1-g21.free.fr ([212.27.42.1]:41864)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <jim@meyering.net>)
	id 1O8zcc-000527-Dm; Mon, 03 May 2010 13:39:59 -0400
Received: from smtp1-g21.free.fr (localhost [127.0.0.1])
	by smtp1-g21.free.fr (Postfix) with ESMTP id C942B940120;
	Mon,  3 May 2010 19:39:52 +0200 (CEST)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp1-g21.free.fr (Postfix) with ESMTP;
	Mon,  3 May 2010 19:39:51 +0200 (CEST)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id B8F2FD02; Mon,  3 May 2010 19:39:50 +0200 (CEST)
From: Jim Meyering <jim@meyering.net>
To: info-gnu@gnu.org
Date: Mon, 03 May 2010 19:39:46 +0200
Message-ID: <87tyqo7ul9.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-3.0 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: Mon, 03 May 2010 18:25:45 -0000

--=-=-=
Content-Transfer-Encoding: quoted-printable

This is to announce diffutils-3.0, a stable release, with only three
items in NEWS and 30 change-sets (most build/test/maintenance-related).
There have been hundreds of improvements in gnulib, but that should
have little effect on diffutils, unless your system is old or unusual.

Here's the diffutils home page:
    http://www.gnu.org/software/diffutils/

Thanks to everyone who has been contributing, helping to manage
the mailing list and reporting bugs.

For a summary of changes and contributors, see:
  http://git.sv.gnu.org/gitweb/?p=3Ddiffutils.git;a=3Dshortlog;h=3Dv3.0
or run this command from a git-cloned diffutils directory:
  git shortlog v2.9..v3.0

To summarize the many gnulib-related changes, run these commands
From=20a git-cloned diffutils directory:
  git checkout v3.0
  git submodule summary v2.9

Here are the compressed sources:
  http://ftp.gnu.org/gnu/diffutils/diffutils-3.0.tar.gz   (1.8MB)
  http://ftp.gnu.org/gnu/diffutils/diffutils-3.0.tar.xz   (1000KB)

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

To reduce load on the main server, use a mirror listed at:
  http://www.gnu.org/order/ftp.html

[*] 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-3.0.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.57-45695
  Automake 1.11a
  Gnulib v0.0-3881-gd3d059c

./NEWS

* Noteworthy changes in release 3.0 (2010-05-03) [stable]

** Bug fixes

  diff once again prints the required "\ No newline at end of file" line
  when at least one input lacks a newline-at-EOF and the final hunk plus
  context-length aligns exactly with the end of the newline-lacking file.
  [bug introduced between 2.8.7 and 2.9]

** Changes in behavior

  In context-style diffs, diff prints a portion of a preceding "function"
  line for each hunk, with --show-function-line=3DRE (-F) or
  --show-c-function (-p).  Now, it trims leading blanks from such lines
  before extracting a prefix.  This is useful especially when a function
  line is so far indented that the name itself would be truncated or not
  included in the limited-width substring that diff appends.

  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".

This message also appears as:
  http://savannah.gnu.org/forum/forum.php?forum_id=3D6319

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

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

iQIcBAEBCAAGBQJL3wpmAAoJENd//eG5q5oWUU4P/0iSjqBzZxr8XIgcPbQElbAk
z9A+r3H9caUsmOYseSgv+cjN/uczj5Kne3zCfe8rc/nzvYyUIBF5vbGcuR0TCPtx
Y3d9bURzaLJcIWAJXVfXGrcRtNNzRdiq4wS15mDgRINixeCsquQPV8nu9yZU2xjz
O8r6Gau4g/O102wrFCTLRCYk6qOgNb52wgZzb9emTMR6N04T30AglNSqm54UKt0U
GLzg8JJ+tM0uYvMzYcHXm5eJ/hT7WYfaZaDnuEgSKyy1YzEa2nNELdRrWerTfe+a
ihdfdL8jQie11VqcDqTtQMQHkJsQhEkMifIwlF5895lO5Enwh9GUimAlGuBBgYoE
ChYUzmxSVIOHgHWa5fxcpxzGEuDzdGHny2x3VCpyLRsxkMNlftEYtC5FILq1Otk4
k+aAxF9z9817U3m/emjHaV9DWStDmMCfnkFFqVz0E7q3df7jBs5rA2AbyO6R49gU
3MoSyJXBPhut0ucy31edLBcw7hpkSF+xPW7xs1sTyEe6CtcA7r3XIp3he98DO6m0
MZhAmNLBStx3FIZAUCysnLs+CXFz4IqtoUU8/7WwYIVzflNfTuvDBZBwSk/8GHD2
aY8omhAB/pOQCoHmu8l5U87VEE13uM2d91/+K56zza8U+QtRvGvTmb4TE6NqVdo3
s8/BGIvsrPFF02DDEGBf
=BpGI
-----END PGP SIGNATURE-----
--=-=-=--



From MAILER-DAEMON Tue May 04 03:52:40 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1O9Cvn-0003WN-7S
	for mharc-bug-diffutils@gnu.org; Tue, 04 May 2010 03:52:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O9Cvi-0003U8-Bs
	for bug-diffutils@gnu.org; Tue, 04 May 2010 03:52:34 -0400
Received: from [140.186.70.92] (port=56840 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O9CvB-0003Kq-B8
	for bug-diffutils@gnu.org; Tue, 04 May 2010 03:52:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1O9Cus-0007Fc-96
	for bug-diffutils@gnu.org; Tue, 04 May 2010 03:52:01 -0400
Received: from smtp1-g21.free.fr ([212.27.42.1]:41360)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1O9Cup-0007EY-O9
	for bug-diffutils@gnu.org; Tue, 04 May 2010 03:51:40 -0400
Received: from smtp1-g21.free.fr (localhost [127.0.0.1])
	by smtp1-g21.free.fr (Postfix) with ESMTP id 18020940168
	for <bug-diffutils@gnu.org>; Tue,  4 May 2010 09:51:35 +0200 (CEST)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp1-g21.free.fr (Postfix) with ESMTP
	for <bug-diffutils@gnu.org>; Tue,  4 May 2010 09:51:34 +0200 (CEST)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 2AB24D7E4; Tue,  4 May 2010 09:51:34 +0200 (CEST)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Tue, 04 May 2010 09:51:34 +0200
Message-ID: <8739y85cl5.fsf@meyering.net>
Lines: 38
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] maint: teach web-doc-generating code how to
	do its job
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, 04 May 2010 07:52:35 -0000

With this tiny change (and the companion changes in gnulib),
the web-doc-updating procedure documented in README-release now works.

>From 40adeecffd03ad56e3ed0054c9ee9f31a86397dd Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Mon, 3 May 2010 23:16:56 +0200
Subject: [PATCH] maint: teach web-doc-generating code how to do its job

* cfg.mk (gendocs_options): Define, so that gendocs.sh knows
the name of our texinfo source file.
* gnulib: Update to latest, for new gnu-web-doc-update and maint.mk.
---
 cfg.mk |    2 ++
 gnulib |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 306e02b..ce66a42 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -41,6 +41,8 @@ update-copyright-env = \

 include $(srcdir)/dist-check.mk

+gendocs_options_ = -s $(srcdir)/diff.texi
+
 _cf_state_dir ?= .config-state
 _date_time := $(shell date +%F.%T)
 config-compare:
diff --git a/gnulib b/gnulib
index d3d059c..cbbec35 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit d3d059cf53625ddfe2ff4f64759131e846f83b94
+Subproject commit cbbec352566be60d2ede1ee43f6bc911e547d8b0
--
1.7.1.335.g6845a



From MAILER-DAEMON Tue May 04 03:57:11 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1O9D0A-0004pI-Jg
	for mharc-bug-diffutils@gnu.org; Tue, 04 May 2010 03:57:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O9D06-0004op-SU
	for bug-diffutils@gnu.org; Tue, 04 May 2010 03:57:07 -0400
Received: from [140.186.70.92] (port=57389 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O9CzQ-0004ba-Bc
	for bug-diffutils@gnu.org; Tue, 04 May 2010 03:57:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1O9Cz3-00080M-0b
	for bug-diffutils@gnu.org; Tue, 04 May 2010 03:56:23 -0400
Received: from smtp1-g21.free.fr ([212.27.42.1]:39416)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <jim@meyering.net>) id 1O9Cyw-0007yb-8s
	for bug-diffutils@gnu.org; Tue, 04 May 2010 03:55:58 -0400
Received: from smtp1-g21.free.fr (localhost [127.0.0.1])
	by smtp1-g21.free.fr (Postfix) with ESMTP id ADD1A94019E
	for <bug-diffutils@gnu.org>; Tue,  4 May 2010 09:55:50 +0200 (CEST)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp1-g21.free.fr (Postfix) with ESMTP
	for <bug-diffutils@gnu.org>; Tue,  4 May 2010 09:55:49 +0200 (CEST)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id D7BD6677; Tue,  4 May 2010 09:55:48 +0200 (CEST)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Tue, 04 May 2010 09:55:48 +0200
Message-ID: <87wrvk3xtn.fsf@meyering.net>
Lines: 41
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] doc: README-release: don't mention To:, Cc:,
	etc announcement headers, 
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, 04 May 2010 07:57:07 -0000

FYI,

>From 6cfdf0ab03ce32dad30460e8fd00e7ecc9db5a7b Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Tue, 4 May 2010 09:55:31 +0200
Subject: [PATCH] doc: README-release: don't mention To:, Cc:, etc announcement headers,

now that those are supplied automatically via gnulib's maint.mk.
* README-release: sync with coreutils.
---
 README-release |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/README-release b/README-release
index 0abce05..e5e14e9 100644
--- a/README-release
+++ b/README-release
@@ -56,6 +56,7 @@ Once all the builds and tests have passed,

 * Announce it on Savannah first, so you can include the preferable
   savannah.org announcement link in the email message.
+
   From here:
     https://savannah.gnu.org/projects/diffutils/
   click on the "submit news", then write something like the following:
@@ -71,12 +72,7 @@ Once all the builds and tests have passed,
   Then go here to approve it:
     https://savannah.gnu.org/news/approve.php?group=diffutils

-* Send the gpg-signed announcement mail, e.g.,
-
-    To: info-gnu@gnu.org
-    Cc: coordinator@translationproject.org, bug-diffutils@gnu.org
-    Subject: diffutils-X.Y released [stable]
-    Mail-Followup-To: bug-diffutils@gnu.org
+* Send the announcement email message.

 * After each non-alpha release, update the on-line manual accessible via

--
1.7.1.335.g6845a



From MAILER-DAEMON Sun May 09 13:37:37 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OBARd-0001Y6-L9
	for mharc-bug-diffutils@gnu.org; Sun, 09 May 2010 13:37:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1OBARc-0001XR-5e
	for bug-diffutils@gnu.org; Sun, 09 May 2010 13:37:36 -0400
Received: from [140.186.70.92] (port=39517 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OBARa-0001WY-Nv
	for bug-diffutils@gnu.org; Sun, 09 May 2010 13:37:35 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <meyering@mx.meyering.net>) id 1OBARY-0007Jg-Oy
	for bug-diffutils@gnu.org; Sun, 09 May 2010 13:37:34 -0400
Received: from smtp1-g21.free.fr ([212.27.42.1]:51112)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <meyering@mx.meyering.net>) id 1OBARY-0007IQ-5a
	for bug-diffutils@gnu.org; Sun, 09 May 2010 13:37:32 -0400
Received: from smtp1-g21.free.fr (localhost [127.0.0.1])
	by smtp1-g21.free.fr (Postfix) with ESMTP id 84AC294011D
	for <bug-diffutils@gnu.org>; Sun,  9 May 2010 19:37:28 +0200 (CEST)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp1-g21.free.fr (Postfix) with ESMTP
	for <bug-diffutils@gnu.org>; Sun,  9 May 2010 19:37:26 +0200 (CEST)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 5E938ED67; Sun,  9 May 2010 19:30:07 +0200 (CEST)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Sun, 09 May 2010 19:30:07 +0200
Message-ID: <874oih6l0g.fsf@meyering.net>
Lines: 187
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 1/3] build: rely on gnulib's sigprocmask
	module
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/archive/html/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, 09 May 2010 17:37:36 -0000

FYI,

These make diff pass the new syntax-check that I've just
added to gnulib's maint.mk:

>From 6ef1f1f7086021b90c81636de26373c3fe472e5c Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sun, 9 May 2010 18:34:09 +0200
Subject: [PATCH 1/3] build: rely on gnulib's sigprocmask module

* src/sdiff.c: Remove #if-!HAVE_SIGPROCMASK-guarded code.
* bootstrap.conf (gnulib_modules): Add sigprocmask.
---
 bootstrap.conf |    1 +
 src/sdiff.c    |   23 -----------------------
 2 files changed, 1 insertions(+), 23 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index 71fbd3f..aa1e8c3 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -55,6 +55,7 @@ progname
 propername
 regex
 sh-quote
+sigprocmask
 stat-macros
 stat-time
 strcase
diff --git a/src/sdiff.c b/src/sdiff.c
index 4344e8d..c0b35b2 100644
--- a/src/sdiff.c
+++ b/src/sdiff.c
@@ -102,29 +102,6 @@ static int const sigs[] = {
 # define signal_handler(sig, handler) signal (sig, handler)
 #endif

-#if ! HAVE_SIGPROCMASK
-# define sigset_t int
-# define sigemptyset(s) (*(s) = 0)
-# ifndef sigmask
-#  define sigmask(sig) (1 << ((sig) - 1))
-# endif
-# define sigaddset(s, sig) (*(s) |= sigmask (sig))
-# ifndef SIG_BLOCK
-#  define SIG_BLOCK 0
-# endif
-# ifndef SIG_SETMASK
-#  define SIG_SETMASK (! SIG_BLOCK)
-# endif
-# if ! HAVE_SIGBLOCK
-#  define sigblock(mask) (mask)
-#  define sigsetmask(mask) (mask)
-# endif
-# define sigprocmask(how, n, o) \
-    ((how) == SIG_BLOCK \
-     ? ((o) ? (*(sigset_t *) (o) = sigblock (*(n))) : sigblock (*(n))) \
-     : sigsetmask (*(n)))
-#endif
-
 static bool diraccess (char const *);
 static int temporary_file (void);

--
1.7.1.189.g07419


>From bec2cfcd8f73c81219a0f348718b01766e274621 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sun, 9 May 2010 18:39:39 +0200
Subject: [PATCH 2/3] build: don't define macros that gnulib provides

* bootstrap.conf (gnulib_modules): Add signal, stdint.
* lib/cmpbuf.c (SA_RESTART, SA_INTERRUPT): Remove definitions.
(SIZE_MAX, PTRDIFF_MAX): Likewise.
Include <stdint.h>.
* src/system.h (WEXITSTATUS, WIFEXITED): Remove definitions.
(SA_RESTART, SA_INTERRUPT): Likewise.
---
 bootstrap.conf |    2 ++
 lib/cmpbuf.c   |   16 +---------------
 src/system.h   |   13 -------------
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index aa1e8c3..2f104b3 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -55,9 +55,11 @@ progname
 propername
 regex
 sh-quote
+signal
 sigprocmask
 stat-macros
 stat-time
+stdint
 strcase
 strftime
 strptime
diff --git a/lib/cmpbuf.c b/lib/cmpbuf.c
index 7413210..96ef249 100644
--- a/lib/cmpbuf.c
+++ b/lib/cmpbuf.c
@@ -20,28 +20,14 @@

 #include <errno.h>
 #include <limits.h>
-
 #include <signal.h>
-#ifndef SA_RESTART
-# ifdef SA_INTERRUPT /* e.g. SunOS 4.1.x */
-#  define SA_RESTART SA_INTERRUPT
-# else
-#  define SA_RESTART 0
-# endif
-#endif
-
 #include <unistd.h>
+#include <stdint.h>
 #include <inttypes.h>
 #include <sys/types.h>
 #include "cmpbuf.h"
 #include "intprops.h"

-#ifndef PTRDIFF_MAX
-# define PTRDIFF_MAX TYPE_MAXIMUM (ptrdiff_t)
-#endif
-#ifndef SIZE_MAX
-# define SIZE_MAX TYPE_MAXIMUM (size_t)
-#endif
 #ifndef SSIZE_MAX
 # define SSIZE_MAX TYPE_MAXIMUM (ssize_t)
 #endif
diff --git a/src/system.h b/src/system.h
index 8942296..785a1e9 100644
--- a/src/system.h
+++ b/src/system.h
@@ -54,12 +54,6 @@
 #include <time.h>

 #include <sys/wait.h>
-#ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
-#endif
-#ifndef WIFEXITED
-# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-#endif

 #include <dirent.h>
 #ifndef _D_EXACT_NAMLEN
@@ -111,13 +105,6 @@ int strcasecmp (char const *, char const *);
 #include <errno.h>

 #include <signal.h>
-#ifndef SA_RESTART
-# ifdef SA_INTERRUPT /* e.g. SunOS 4.1.x */
-#  define SA_RESTART SA_INTERRUPT
-# else
-#  define SA_RESTART 0
-# endif
-#endif
 #if !defined SIGCHLD && defined SIGCLD
 # define SIGCHLD SIGCLD
 #endif
--
1.7.1.189.g07419


>From a0e9e5e67a6a34e131eb392ddb99569bc973748e Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sun, 9 May 2010 19:09:26 +0200
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 cbbec35..880f2b6 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit cbbec352566be60d2ede1ee43f6bc911e547d8b0
+Subproject commit 880f2b69df57af506439d6aaf1fe185a6f960e43
--
1.7.1.189.g07419



From MAILER-DAEMON Tue May 25 12:12:50 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OGwkL-0002BE-CY
	for mharc-bug-diffutils@gnu.org; Tue, 25 May 2010 12:12:49 -0400
Received: from [140.186.70.92] (port=44074 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OGwkF-00028r-41
	for bug-diffutils@gnu.org; Tue, 25 May 2010 12:12:47 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <meyering@mx.meyering.net>) id 1OGwkB-0002Lj-5G
	for bug-diffutils@gnu.org; Tue, 25 May 2010 12:12:42 -0400
Received: from smtp5-g21.free.fr ([212.27.42.5]:43354)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <meyering@mx.meyering.net>) id 1OGwkA-0002Jk-Hd
	for bug-diffutils@gnu.org; Tue, 25 May 2010 12:12:39 -0400
Received: from smtp5-g21.free.fr (localhost [127.0.0.1])
	by smtp5-g21.free.fr (Postfix) with ESMTP id 97EAFD48067
	for <bug-diffutils@gnu.org>; Tue, 25 May 2010 18:12:34 +0200 (CEST)
Received: from mx.meyering.net (mx.meyering.net [82.230.74.64])
	by smtp5-g21.free.fr (Postfix) with ESMTP
	for <bug-diffutils@gnu.org>; Tue, 25 May 2010 18:12:32 +0200 (CEST)
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 24730F0CE; Tue, 25 May 2010 18:12:24 +0200 (CEST)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Tue, 25 May 2010 18:12:24 +0200
Message-ID: <87iq6cot93.fsf@meyering.net>
Lines: 32
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] maint: don't emit an extra newline in a
	diagnostic
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/archive/html/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, 25 May 2010 16:12:47 -0000

FYI,

Found with these:

      git grep -A1 'error *(.*,$' | grep -C1 '\\n"[,)]'
      git grep 'error *(.*;$' | grep '\\n"[,)]'

>From 816b2dcb00a9a1df3603664696fe57dd603bf275 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Tue, 25 May 2010 17:53:09 +0200
Subject: [PATCH] maint: don't emit an extra newline in a diagnostic

* src/analyze.c (diff_2_files): Remove a stray newline in a diagnostic.
---
 src/analyze.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/analyze.c b/src/analyze.c
index e797248..743aa1a 100644
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -708,7 +708,7 @@ diff_2_files (struct comparison *cmp)
 	for (f = 0; f < 2; ++f)
 	  if (cmp->file[f].missing_newline)
 	    {
-	      error (0, 0, "%s: %s\n",
+	      error (0, 0, "%s: %s",
 		     file_label[f] ? file_label[f] : cmp->file[f].name,
 		     _("No newline at end of file"));
 	      changes = 2;
--
1.7.1.342.g1c280


