From MAILER-DAEMON Mon Feb 01 04:11:10 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1aQAVq-0007CB-J1
	for mharc-bug-diffutils@gnu.org; Mon, 01 Feb 2016 04:11:10 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34333)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aQAVo-00078V-1z
	for bug-diffutils@gnu.org; Mon, 01 Feb 2016 04:11:08 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aQAVi-0002uC-E7
	for bug-diffutils@gnu.org; Mon, 01 Feb 2016 04:11:07 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:55669)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aQAVi-0002u8-Aw
	for bug-diffutils@gnu.org; Mon, 01 Feb 2016 04:11:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aQAVi-00084C-5x
	for bug-diffutils@gnu.org; Mon, 01 Feb 2016 04:11:02 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Giuseppe Scrivano <gscrivano@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 01 Feb 2016 09:11:02 +0000
Resent-Message-ID: <handler.22067.B22067.145431781230947@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 22067
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: Gisle Vanem <gvanem@yahoo.no>
Received: via spool by 22067-submit@debbugs.gnu.org id=B22067.145431781230947
	(code B ref 22067); Mon, 01 Feb 2016 09:11:02 +0000
Received: (at 22067) by debbugs.gnu.org; 1 Feb 2016 09:10:12 +0000
Received: from localhost ([127.0.0.1]:43889 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1aQAUt-000835-PF
	for submit@debbugs.gnu.org; Mon, 01 Feb 2016 04:10:11 -0500
Received: from mx1.redhat.com ([209.132.183.28]:46730)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <gscrivano@gnu.org>) id 1aQAUs-00082x-LM
	for 22067@debbugs.gnu.org; Mon, 01 Feb 2016 04:10:11 -0500
Received: from int-mx13.intmail.prod.int.phx2.redhat.com
	(int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26])
	by mx1.redhat.com (Postfix) with ESMTPS id 9E3535A55;
	Mon,  1 Feb 2016 09:10:09 +0000 (UTC)
Received: from foo.bar.baz (vpn1-4-136.ams2.redhat.com [10.36.4.136])
	by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP
	id u119A5OY019651
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256
	verify=NO); Mon, 1 Feb 2016 04:10:07 -0500
From: Giuseppe Scrivano <gscrivano@gnu.org>
References: <565D6EF4.20903@yahoo.no> <87oac3peqc.fsf@foo.bar.baz>
Date: Mon, 01 Feb 2016 10:10:05 +0100
In-Reply-To: <87oac3peqc.fsf@foo.bar.baz> (Giuseppe Scrivano's message of
	"Sat, 30 Jan 2016 11:02:19 +0100")
Message-ID: <87bn80pziq.fsf@foo.bar.baz>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Cc: 22067@debbugs.gnu.org
Subject: [bug-diffutils] bug#22067: bug#22067: bug#20062: bug#20062: [PATCH]
	diff: add support for --color
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2016 09:11:09 -0000

--=-=-=
Content-Type: text/plain

Giuseppe Scrivano <gscrivano@gnu.org> writes:

> Bug 3 is a bug on all platforms, set_color_context should call
> process_signals only when color_context != RESET_CONTEXT.  I'll send a
> patch for that.

I've attached a patch for this bug.

Regards,
Giuseppe


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline;
 filename=0001-Fix-an-infinite-recursion-with-color.patch

>From c9326d016a05c594b8cd2f19effe792c23fde3ef Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 1 Feb 2016 09:58:52 +0100
Subject: [PATCH] Fix an infinite recursion with --color

* src/util.c: Call process_signals only when color_context is not
RESET_CONTEXT.

Reported by Gisle Vanem in http://debbugs.gnu.org/22067
---
 src/util.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/util.c b/src/util.c
index bf9ed97..26615ca 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1349,7 +1349,8 @@ static enum color_context last_context = RESET_CONTEXT;
 void
 set_color_context (enum color_context color_context)
 {
-  process_signals ();
+  if (color_context != RESET_CONTEXT)
+    process_signals ();
   if (colors_enabled && last_context != color_context)
     {
       put_indicator (&color_indicator[C_LEFT]);
-- 
2.5.0


--=-=-=--




From MAILER-DAEMON Mon Feb 01 19:49:07 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1aQP9X-0004VO-E7
	for mharc-bug-diffutils@gnu.org; Mon, 01 Feb 2016 19:49:07 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46078)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aQP9V-0004Us-76
	for bug-diffutils@gnu.org; Mon, 01 Feb 2016 19:49:05 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aQP9R-0003Ns-UX
	for bug-diffutils@gnu.org; Mon, 01 Feb 2016 19:49:05 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:46860)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aQP9R-0003Nn-R5
	for bug-diffutils@gnu.org; Mon, 01 Feb 2016 19:49:01 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aQP9R-0002JD-MD
	for bug-diffutils@gnu.org; Mon, 01 Feb 2016 19:49:01 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: =?UTF-8?Q?=E7=A9=8D=E4=B8=B9=E5=B0=BC?= Dan Jacobson
	<jidanni@jidanni.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Tue, 02 Feb 2016 00:49:01 +0000
Resent-Message-ID: <handler.22529.B.14543741168842@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 22529
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 22529@debbugs.gnu.org
X-Debbugs-Original-To: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.14543741168842
	(code B ref -1); Tue, 02 Feb 2016 00:49:01 +0000
Received: (at submit) by debbugs.gnu.org; 2 Feb 2016 00:48:36 +0000
Received: from localhost ([127.0.0.1]:55449 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1aQP92-0002IY-5c
	for submit@debbugs.gnu.org; Mon, 01 Feb 2016 19:48:36 -0500
Received: from eggs.gnu.org ([208.118.235.92]:54871)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <jidanni@jidanni.org>) id 1aQP90-0002II-1A
	for submit@debbugs.gnu.org; Mon, 01 Feb 2016 19:48:34 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jidanni@jidanni.org>) id 1aQP8u-0003Ak-5w
	for submit@debbugs.gnu.org; Mon, 01 Feb 2016 19:48:29 -0500
Received: from lists.gnu.org ([2001:4830:134:3::11]:39215)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jidanni@jidanni.org>) id 1aQP8u-0003Ae-31
	for submit@debbugs.gnu.org; Mon, 01 Feb 2016 19:48:28 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45826)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jidanni@jidanni.org>) id 1aQP8t-0004Nh-5t
	for bug-diffutils@gnu.org; Mon, 01 Feb 2016 19:48:28 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jidanni@jidanni.org>) id 1aQP8p-00038r-Rz
	for bug-diffutils@gnu.org; Mon, 01 Feb 2016 19:48:27 -0500
Received: from ps11007.dreamhost.com ([69.163.216.252]:57655
	helo=ps11007.dreamhostps.com) by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jidanni@jidanni.org>) id 1aQP8p-00037j-MO
	for bug-diffutils@gnu.org; Mon, 01 Feb 2016 19:48:23 -0500
Received: by ps11007.dreamhostps.com (Postfix, from userid 3369152)
	id 3571130A59A1E8; Mon,  1 Feb 2016 16:48:20 -0800 (PST)
Date: Mon, 1 Feb 2016 16:48:20 -0800
From: =?UTF-8?Q?=E7=A9=8D=E4=B8=B9=E5=B0=BC?= Dan Jacobson
	<jidanni@jidanni.org>
Message-ID: <20160202004820.GA20999@ps11007.dreamhostps.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.20 (2009-06-14)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no
	timestamps) [generic]
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#22529: cmp man page too sophisticated
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2016 00:49:06 -0000

Dear diffutils, I sent http://debbugs.gnu.org/22498 to coreutils instead
of diffutils. Please have a look.




From MAILER-DAEMON Tue Feb 02 14:10:08 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1aQgL2-0005p4-MR
	for mharc-bug-diffutils@gnu.org; Tue, 02 Feb 2016 14:10:08 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51036)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aQgL0-0005oM-3w
	for bug-diffutils@gnu.org; Tue, 02 Feb 2016 14:10:06 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aQgKw-0005b9-PM
	for bug-diffutils@gnu.org; Tue, 02 Feb 2016 14:10:06 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:48488)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aQgKw-0005b5-MF
	for bug-diffutils@gnu.org; Tue, 02 Feb 2016 14:10:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aQgKw-0000Xi-I5
	for bug-diffutils@gnu.org; Tue, 02 Feb 2016 14:10:02 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Aaron Davies <adavies42@me.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Tue, 02 Feb 2016 19:10:02 +0000
Resent-Message-ID: <handler.22535.B.14544401422004@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 22535
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 22535@debbugs.gnu.org
X-Debbugs-Original-To: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.14544401422004
	(code B ref -1); Tue, 02 Feb 2016 19:10:02 +0000
Received: (at submit) by debbugs.gnu.org; 2 Feb 2016 19:09:02 +0000
Received: from localhost ([127.0.0.1]:57077 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1aQgJx-0000WG-S2
	for submit@debbugs.gnu.org; Tue, 02 Feb 2016 14:09:02 -0500
Received: from eggs.gnu.org ([208.118.235.92]:59292)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <adavies42@me.com>) id 1aQgIt-0000U2-Ld
	for submit@debbugs.gnu.org; Tue, 02 Feb 2016 14:07:56 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <adavies42@me.com>) id 1aQgIn-0005CV-Eu
	for submit@debbugs.gnu.org; Tue, 02 Feb 2016 14:07:50 -0500
Received: from lists.gnu.org ([2001:4830:134:3::11]:48756)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <adavies42@me.com>) id 1aQgIn-0005CR-By
	for submit@debbugs.gnu.org; Tue, 02 Feb 2016 14:07:49 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50228)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <adavies42@me.com>) id 1aQgIj-0005cg-Iv
	for bug-diffutils@gnu.org; Tue, 02 Feb 2016 14:07:49 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <adavies42@me.com>) id 1aQgIg-0005Ay-Bt
	for bug-diffutils@gnu.org; Tue, 02 Feb 2016 14:07:45 -0500
Received: from pv33p03im-asmtp001.me.com ([17.143.180.10]:47606)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <adavies42@me.com>) id 1aQgIg-0005AO-3O
	for bug-diffutils@gnu.org; Tue, 02 Feb 2016 14:07:42 -0500
Received: from [10.211.51.132]
	(mobile-166-171-185-129.mycingular.net [166.171.185.129])
	by pv33p03im-asmtp001.me.com
	(Oracle Communications Messaging Server 7.0.5.36.0 64bit (built Sep 8
	2015))
	with ESMTPSA id <0O1X0038DP4MTO10@pv33p03im-asmtp001.me.com> for
	bug-diffutils@gnu.org; Tue, 02 Feb 2016 19:07:37 +0000 (GMT)
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,,
	definitions=2016-02-02_11:,, signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0
	clxscore=1011 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0
	bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
	engine=8.0.1-1510270003 definitions=main-1602020308
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=me.com; h=from :
	content-type : content-transfer-encoding : mime-version : subject :
	message-id
	: date : to; s=4d515a; bh=utgbFRkTJOVIiv73ZuYKIBZVoA6vdjwkcxya/35l0MQ=; 
	b=jreRSAQUbRvpRlFbbIJe1JIHY1aTllUQISgk8KgGjDoeeFn2txh8EiQG8qfHGK6rW1sa
	BI1t683MqbKzN7TFAebmbNjtb5825ECCzjovqW+42RnlBO3jBQ0+Agq4tx8+12zvZEHM
	3HULD6OxerJ8ZWCnvAmFQINYVGcxo8s+BW1v1QmCFu/M/tGF40cVhLGSEmZFNWcZn0cf
	RaiHDI69KBUr3fF6mgd+QvDcHV9xidTgfaKgJ1T+/s53JGG8wALasB4R//OkihSfRh3R
	JCfa0Zbxze9xnHS8cYZwvDKVidG8uvXMnALRoxvbBJKW5pDxt8oIH22X937P583xjsly
	7w==
From: Aaron Davies <adavies42@me.com>
Content-type: text/plain; charset=us-ascii
Content-transfer-encoding: quoted-printable
MIME-version: 1.0 (1.0)
Message-id: <EE0080FA-5F04-420B-B442-E28C0AA1E773@me.com>
Date: Tue, 02 Feb 2016 14:07:34 -0500
X-Mailer: iPhone Mail (13C75)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Mailman-Approved-At: Tue, 02 Feb 2016 14:09:00 -0500
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#22535: REQ: regex dialect switching (for -F and
	-I)
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2016 19:10:07 -0000

It would be nice to be able to use other regex dialects in -F and -I (i.e. o=
nes where you don't have to escape pipes and parens). Possibly some code can=
 be borrowed from find(1)'s -regextype switch?

Sent from my iPhone=




From MAILER-DAEMON Sat Feb 06 01:17:09 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1aRwBB-0002TM-Ay
	for mharc-bug-diffutils@gnu.org; Sat, 06 Feb 2016 01:17:09 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57076)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aRwB9-0002T5-Ap
	for bug-diffutils@gnu.org; Sat, 06 Feb 2016 01:17:08 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aRwB4-00081j-By
	for bug-diffutils@gnu.org; Sat, 06 Feb 2016 01:17:07 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:54657)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aRwB4-00081f-8e
	for bug-diffutils@gnu.org; Sat, 06 Feb 2016 01:17:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aRwB3-00043M-VT
	for bug-diffutils@gnu.org; Sat, 06 Feb 2016 01:17:01 -0500
X-Loop: help-debbugs@gnu.org
References: <565D6EF4.20903@yahoo.no>
In-Reply-To: <565D6EF4.20903@yahoo.no>
Resent-From: KW Kam <nkwkam@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Sat, 06 Feb 2016 06:17:01 +0000
Resent-Message-ID: <handler.22067.B22067.145473940815554@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 22067
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: 22067@debbugs.gnu.org
Received: via spool by 22067-submit@debbugs.gnu.org id=B22067.145473940815554
	(code B ref 22067); Sat, 06 Feb 2016 06:17:01 +0000
Received: (at 22067) by debbugs.gnu.org; 6 Feb 2016 06:16:48 +0000
Received: from localhost ([127.0.0.1]:35013 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1aRwAp-00042o-Oj
	for submit@debbugs.gnu.org; Sat, 06 Feb 2016 01:16:47 -0500
Received: from mail-vk0-f44.google.com ([209.85.213.44]:34356)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <nkwkam@gmail.com>) id 1aRvNd-0002mq-Ho
	for 22067@debbugs.gnu.org; Sat, 06 Feb 2016 00:25:57 -0500
Received: by mail-vk0-f44.google.com with SMTP id e185so68828412vkb.1
	for <22067@debbugs.gnu.org>; Fri, 05 Feb 2016 21:25:57 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; 
	h=mime-version:date:message-id:subject:from:to:content-type;
	bh=efPIX3aQOFucbcTCVl80aYxoe+KujPBLvl3oVQvs94w=;
	b=dpfFASuZZ1IUbmJO34VoiNyxmJRB75VkJk3yNEAKoVq7arAs0G349naB2WxPsFZh1R
	peHHf6HWV2mBCrhwkFTDvfSsLjRgUM5EqxZKGOaWgjWKRWyjJBHw0uAIpUsYCFeJjfg+
	dZvY5thhyR6txt9Y7PpmnHURmEhydKjfiHtsWbzWwHEC6w9KMkpsER3ESJrxn/c2ywWi
	dFyRL7e/Zk1KWCABKLmregX8htnaZa/w7emaItC6njYn2bbPq512gXFDBfLIw2Xt1+Wt
	Cet0PlEK3LZaPxpaoLiephPNDtKDcVfY1wtRcA+L3/7aOVVX6/h1m2lkQ2I4v/TPRa2D
	7vvQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:mime-version:date:message-id:subject:from:to
	:content-type;
	bh=efPIX3aQOFucbcTCVl80aYxoe+KujPBLvl3oVQvs94w=;
	b=lkyrNOznZUDz/ZBqp2ydyFZaU/ODRFUFX0nW42GmijG2lKz1oiJSqSDrMfwT2+WaEu
	+NhbfGP6ksDdw2ErsWygZE4HqD4WBNNs6prmyhvndb8BKzBiI5vs60s4QNWFp4xn3zJ0
	X748yLELGMfQL9nP4NYK3TiybEUTynRtv4xe5uY8Etx54DO97Eln027phK78ibSdPdMn
	5Ha59kbk3K3D7Y1WzsO42nRJ7SfGSunFb6mauA3dQN/nyQnSzkB/Cu2LLo8fTyg/m1K0
	dZV0D1SM3mz9+8ujcu5wEROXy3nIQWRRTrHO42566A44x7MCj1rxo/vVDimW0GhGsiVE
	OSsQ==
X-Gm-Message-State: AG10YOSyFL3pNHaAawbwxx1CIEFZ/Y8EkSXlYFknr99tb+xdMkmqkVgw3A+nVIsrO8gDGG6k141TkaoAv0SQvw==
MIME-Version: 1.0
X-Received: by 10.31.154.21 with SMTP id c21mr12419180vke.38.1454736352029;
	Fri, 05 Feb 2016 21:25:52 -0800 (PST)
Received: by 10.31.57.72 with HTTP; Fri, 5 Feb 2016 21:25:51 -0800 (PST)
Date: Sat, 6 Feb 2016 13:25:51 +0800
Message-ID: <CAGo5DYif5BvdcgOq0yXaCUXYZpnVykFjdpVP6HK8vugsU2Z7YA@mail.gmail.com>
From: KW Kam <nkwkam@gmail.com>
Content-Type: multipart/mixed; boundary=001a1140ed4481486c052b133383
X-Mailman-Approved-At: Sat, 06 Feb 2016 01:16:46 -0500
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#22067: [PATCH] color for windows and fix sigxxx
	handling
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Feb 2016 06:17:08 -0000

--001a1140ed4481486c052b133383
Content-Type: multipart/alternative; boundary=001a1140ed44814865052b133381

--001a1140ed44814865052b133381
Content-Type: text/plain; charset=UTF-8

w32_sgr2attr is copied from grep

--001a1140ed44814865052b133381
Content-Type: text/html; charset=UTF-8

<div dir="ltr"><div>w32_sgr2attr is copied from grep</div></div>

--001a1140ed44814865052b133381--

--001a1140ed4481486c052b133383
Content-Type: application/octet-stream; name="22067-diffutils.patch"
Content-Disposition: attachment; filename="22067-diffutils.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_ikanujl10

ZGlmZiAtLWdpdCBhL3NyYy91dGlsLmMgYi9zcmMvdXRpbC5jCmluZGV4IGJmOWVkOTcuLjYyYWRj
MGMgMTAwNjQ0Ci0tLSBhL3NyYy91dGlsLmMKKysrIGIvc3JjL3V0aWwuYwpAQCAtMjYsNiArMjYs
OSBAQAogI2luY2x1ZGUgPHhhbGxvYy5oPgogI2luY2x1ZGUgInh2YXNwcmludGYuaCIKICNpbmNs
dWRlIDxzaWduYWwuaD4KKyNpZmRlZiBfV0lOMzIKKyNpbmNsdWRlIDx3aW5kb3dzLmg+CisjZW5k
aWYKIAogLyogVXNlIFNBX05PQ0xEU1RPUCBhcyBhIHByb3h5IGZvciB3aGV0aGVyIHRoZSBzaWdh
Y3Rpb24gbWFjaGluZXJ5IGlzCiAgICBwcmVzZW50LiAgKi8KQEAgLTE2OCw5ICsxNzEsMTEgQEAg
c3RhdGljIHNpZ3NldF90IGNhdWdodF9zaWduYWxzOwogCiBzdGF0aWMgc2lnX2F0b21pY190IHZv
bGF0aWxlIGludGVycnVwdF9zaWduYWw7CiAKKyNpZm5kZWYgX1dJTjMyCiAvKiBBIGNvdW50IG9m
IHRoZSBudW1iZXIgb2YgcGVuZGluZyBzdG9wIHNpZ25hbHMgdGhhdCBoYXZlIGJlZW4gcmVjZWl2
ZWQuICAqLwogCiBzdGF0aWMgc2lnX2F0b21pY190IHZvbGF0aWxlIHN0b3Bfc2lnbmFsX2NvdW50
OworI2VuZGlmCiAKIC8qIEFuIG9yZGluYXJ5IHNpZ25hbCB3YXMgcmVjZWl2ZWQ7IGFycmFuZ2Ug
Zm9yIHRoZSBwcm9ncmFtIHRvIGV4aXQuICAqLwogCkBAIC0xODMsNiArMTg4LDcgQEAgc2lnaGFu
ZGxlciAoaW50IHNpZykKICAgICBpbnRlcnJ1cHRfc2lnbmFsID0gc2lnOwogfQogCisjaWZuZGVm
IF9XSU4zMgogLyogQSBTSUdUU1RQIHdhcyByZWNlaXZlZDsgYXJyYW5nZSBmb3IgdGhlIHByb2dy
YW0gdG8gc3VzcGVuZCBpdHNlbGYuICAqLwogCiBzdGF0aWMgdm9pZApAQCAtMTkzLDYgKzE5OSwx
MiBAQCBzdG9waGFuZGxlciAoaW50IHNpZykKICAgaWYgKCEgaW50ZXJydXB0X3NpZ25hbCkKICAg
ICBzdG9wX3NpZ25hbF9jb3VudCsrOwogfQorI2VuZGlmCisKKy8qIFRoZSBpbnRlcm5hbCBzZXRf
Y29sb3JfY29udGV4dCAqLworCit2b2lkIHNldGNvbG9yY3R4IChlbnVtIGNvbG9yX2NvbnRleHQp
OworCiAvKiBQcm9jZXNzIGFueSBwZW5kaW5nIHNpZ25hbHMuICBJZiBzaWduYWxzIGFyZSBjYXVn
aHQsIHRoaXMgZnVuY3Rpb24KICAgIHNob3VsZCBiZSBjYWxsZWQgcGVyaW9kaWNhbGx5LiAgSWRl
YWxseSB0aGVyZSBzaG91bGQgbmV2ZXIgYmUgYW4KICAgIHVuYm91bmRlZCBhbW91bnQgb2YgdGlt
ZSB3aGVuIHNpZ25hbHMgYXJlIG5vdCBiZWluZyBwcm9jZXNzZWQuCkBAIC0yMDIsMTMgKzIxNCwx
OSBAQCBzdG9waGFuZGxlciAoaW50IHNpZykKIHN0YXRpYyB2b2lkCiBwcm9jZXNzX3NpZ25hbHMg
KHZvaWQpCiB7CisjaWZuZGVmIF9XSU4zMgogICB3aGlsZSAoaW50ZXJydXB0X3NpZ25hbCB8fCBz
dG9wX3NpZ25hbF9jb3VudCkKKyNlbHNlCisgIHdoaWxlIChpbnRlcnJ1cHRfc2lnbmFsKQorI2Vu
ZGlmCiAgICAgewogICAgICAgaW50IHNpZzsKKyNpZm5kZWYgX1dJTjMyCiAgICAgICBpbnQgc3Rv
cHM7CisjZW5kaWYKICAgICAgIHNpZ3NldF90IG9sZHNldDsKIAotICAgICAgc2V0X2NvbG9yX2Nv
bnRleHQgKFJFU0VUX0NPTlRFWFQpOworICAgICAgc2V0Y29sb3JjdHggKFJFU0VUX0NPTlRFWFQp
OwogICAgICAgZmZsdXNoIChzdGRvdXQpOwogCiAgICAgICBzaWdwcm9jbWFzayAoU0lHX0JMT0NL
LCAmY2F1Z2h0X3NpZ25hbHMsICZvbGRzZXQpOwpAQCAtMjE2LDYgKzIzNCw3IEBAIHByb2Nlc3Nf
c2lnbmFscyAodm9pZCkKICAgICAgIC8qIFJlbG9hZCBpbnRlcnJ1cHRfc2lnbmFsIGFuZCBzdG9w
X3NpZ25hbF9jb3VudCwgaW4gY2FzZSBhIG5ldwogICAgICAgICAgc2lnbmFsIHdhcyBoYW5kbGVk
IGJlZm9yZSBzaWdwcm9jbWFzayB0b29rIGVmZmVjdC4gICovCiAgICAgICBzaWcgPSBpbnRlcnJ1
cHRfc2lnbmFsOworI2lmbmRlZiBfV0lOMzIKICAgICAgIHN0b3BzID0gc3RvcF9zaWduYWxfY291
bnQ7CiAKICAgICAgIC8qIFNJR1RTVFAgaXMgc3BlY2lhbCwgc2luY2UgdGhlIGFwcGxpY2F0aW9u
IGNhbiByZWNlaXZlIHRoYXQgc2lnbmFsCkBAIC0yMjcsNiArMjQ2LDcgQEAgcHJvY2Vzc19zaWdu
YWxzICh2b2lkKQogICAgICAgICAgIHNpZyA9IFNJR1NUT1A7CiAgICAgICAgIH0KICAgICAgIGVs
c2UKKyNlbmRpZgogICAgICAgICBzaWduYWwgKHNpZywgU0lHX0RGTCk7CiAKICAgICAgIC8qIEV4
aXQgb3Igc3VzcGVuZCB0aGUgcHJvZ3JhbS4gICovCkBAIC0yNDQsMTEgKzI2NCwxNSBAQCBpbnN0
YWxsX3NpZ25hbF9oYW5kbGVycyAodm9pZCkKICAgLyogVGhlIHNpZ25hbHMgdGhhdCBhcmUgdHJh
cHBlZCwgYW5kIHRoZSBudW1iZXIgb2Ygc3VjaCBzaWduYWxzLiAgKi8KICAgc3RhdGljIGludCBj
b25zdCBzaWdbXSA9CiAgICAgeworI2lmbmRlZiBfV0lOMzIKICAgICAgIC8qIFRoaXMgb25lIGlz
IGhhbmRsZWQgc3BlY2lhbGx5LiAgKi8KICAgICAgIFNJR1RTVFAsCiAKICAgICAgIC8qIFRoZSB1
c3VhbCBzdXNwZWN0cy4gICovCiAgICAgICBTSUdBTFJNLCBTSUdIVVAsIFNJR0lOVCwgU0lHUElQ
RSwgU0lHUVVJVCwgU0lHVEVSTSwKKyNlbHNlCisgICAgICBTSUdJTlQsIFNJR1RFUk0sCisjZW5k
aWYKICNpZmRlZiBTSUdQT0xMCiAgICAgICBTSUdQT0xMLAogI2VuZGlmCkBAIC0yNjcsOSArMjkx
LDYgQEAgaW5zdGFsbF9zaWduYWxfaGFuZGxlcnMgKHZvaWQpCiAgICAgfTsKICAgZW51bSB7IG5z
aWdzID0gc2l6ZW9mIChzaWcpIC8gc2l6ZW9mICooc2lnKSB9OwogCi0jaWYgISBTQV9OT0NMRFNU
T1AKLSAgYm9vbCBjYXVnaHRfc2lnW25zaWdzXTsKLSNlbmRpZgogICB7CiAgICAgaW50IGo7CiAj
aWYgU0FfTk9DTERTVE9QCkBAIC0yOTMsMTcgKzMxNCwyMyBAQCBpbnN0YWxsX3NpZ25hbF9oYW5k
bGVycyAodm9pZCkKICAgICAgICAgICBzaWdhY3Rpb24gKHNpZ1tqXSwgJmFjdCwgTlVMTCk7CiAg
ICAgICAgIH0KICNlbHNlCisgICAgYm9vbCBjYXVnaHRfc2lnW25zaWdzXTsKKwogICAgIGZvciAo
aiA9IDA7IGogPCBuc2lnczsgaisrKQogICAgICAgewogICAgICAgICBjYXVnaHRfc2lnW2pdID0g
KHNpZ25hbCAoc2lnW2pdLCBTSUdfSUdOKSAhPSBTSUdfSUdOKTsKICAgICAgICAgaWYgKGNhdWdo
dF9zaWdbal0pCiAgICAgICAgICAgeworI2lmbmRlZiBfV0lOMzIKICAgICAgICAgICAgIHNpZ25h
bCAoc2lnW2pdLCBzaWdbal0gPT0gU0lHVFNUUCA/IHN0b3BoYW5kbGVyIDogc2lnaGFuZGxlcik7
CisjZWxzZQorICAgICAgICAgICAgc2lnbmFsIChzaWdbal0sIHNpZ2hhbmRsZXIpOworI2VuZGlm
CiAgICAgICAgICAgICBzaWdpbnRlcnJ1cHQgKHNpZ1tqXSwgMCk7CiAgICAgICAgICAgfQogICAg
ICAgfQogI2VuZGlmCi0gICAgfQorICB9CiB9CiAKIHN0YXRpYyBjaGFyIGNvbnN0ICpjdXJyZW50
X25hbWUwOwpAQCAtNjAzLDcgKzYzMCw3IEBAIHBhcnNlX2RpZmZfY29sb3IgKHZvaWQpCiAgICAg
ICAgICAgc3dpdGNoICgqcCkKICAgICAgICAgICAgIHsKICAgICAgICAgICAgIGNhc2UgJzonOgot
ICAgICAgICAgICAgICArK3A7CisgICAgICAgICAgICAgICooYnVmKyspID0gKihwKyspOwogICAg
ICAgICAgICAgICBicmVhazsKIAogICAgICAgICAgICAgY2FzZSAnKic6CkBAIC02MjQsNiArNjUx
LDcgQEAgcGFyc2VfZGlmZl9jb2xvciAodm9pZCkKICAgICAgICAgICAgICAgYnJlYWs7CiAKICAg
ICAgICAgICAgIGNhc2UgJ1wwJzoKKyAgICAgICAgICAgICAgKihidWYpID0gKihwKTsKICAgICAg
ICAgICAgICAgc3RhdGUgPSBQU19ET05FOwkvKiBEb25lISAqLwogICAgICAgICAgICAgICBnb3Rv
IGRvbmU7CiAKQEAgLTcwMiw2ICs3MzAsMTEgQEAgcGFyc2VfZGlmZl9jb2xvciAodm9pZCkKICAg
ICB9CiB9CiAKKyNpZmRlZiBfV0lOMzIKK3N0YXRpYyBIQU5ETEUgaHN0ZG91dCA9IE5VTEw7Citz
dGF0aWMgU0hPUlQgYXR0cl9vcmlnOworI2VuZGlmCisKIHN0YXRpYyB2b2lkCiBjaGVja19jb2xv
cl9vdXRwdXQgKGJvb2wgaXNfcGlwZSkKIHsKQEAgLTcxNSw2ICs3NDgsMTkgQEAgY2hlY2tfY29s
b3Jfb3V0cHV0IChib29sIGlzX3BpcGUpCiAgIGNvbG9yc19lbmFibGVkID0gKGNvbG9yc19zdHls
ZSA9PSBBTFdBWVMKICAgICAgICAgICAgICAgICAgICAgfHwgKGNvbG9yc19zdHlsZSA9PSBBVVRP
ICYmIG91dHB1dF9pc190dHkpKTsKIAorI2lmZGVmIF9XSU4zMgorICBpZiAoaHN0ZG91dCA9PSBO
VUxMKSB7CisgICAgQ09OU09MRV9TQ1JFRU5fQlVGRkVSX0lORk8gY3NiaTsKKworICAgIGhzdGRv
dXQgPSBHZXRTdGRIYW5kbGUgKFNURF9PVVRQVVRfSEFORExFKTsKKyAgICBpZiAoaHN0ZG91dCAh
PSBJTlZBTElEX0hBTkRMRV9WQUxVRQorICAgICAgICAmJiBHZXRDb25zb2xlU2NyZWVuQnVmZmVy
SW5mbyAoaHN0ZG91dCwgJmNzYmkpKQorICAgICAgIGF0dHJfb3JpZyA9IGNzYmkud0F0dHJpYnV0
ZXM7CisgICAgZWxzZQorICAgICAgaHN0ZG91dCA9IElOVkFMSURfSEFORExFX1ZBTFVFOworICB9
CisjZW5kaWYKKwogICBpZiAoY29sb3JzX2VuYWJsZWQpCiAgICAgcGFyc2VfZGlmZl9jb2xvciAo
KTsKIApAQCAtMTMzMyw2ICsxMzc5LDk5IEBAIG91dHB1dF8xX2xpbmUgKGNoYXIgY29uc3QgKmJh
c2UsIGNoYXIgY29uc3QgKmxpbWl0LCBjaGFyIGNvbnN0ICpmbGFnX2Zvcm1hdCwKICAgICB9CiB9
CiAKKyNpZmRlZiBfV0lOMzIKKy8qIENvbnZlcnQgYSBjb2xvciBzcGVjLCBhIHNlbWktY29sb24g
c2VwYXJhdGVkIGxpc3Qgb2YgdGhlIGZvcm0KKyAgICJOTjtNTTtLSzsuLi4iLCB3aGVyZSBlYWNo
IG51bWJlciBpcyBhIHZhbHVlIG9mIHRoZSBTR1IgcGFyYW1ldGVyLAorICAgaW50byB0aGUgY29y
cmVzcG9uZGluZyBXaW5kb3dzIGNvbnNvbGUgdGV4dCBhdHRyaWJ1dGUuCisKKyAgIFRoaXMgZnVu
Y3Rpb24gc3VwcG9ydHMgYSBzdWJzZXQgb2YgdGhlIFNHUiByZW5kaXRpb24gYXNwZWN0cyB0aGF0
CisgICB0aGUgV2luZG93cyBjb25zb2xlIGNhbiBkaXNwbGF5LiAgKi8KK3N0YXRpYyBpbnQKK3cz
Ml9zZ3IyYXR0ciAoY29uc3Qgc3RydWN0IGJpbl9zdHIgKnNncl9zZXEpCit7CisgIGNvbnN0IGNo
YXIgKnAsICpzID0gc2dyX3NlcS0+c3RyaW5nLCAqZSA9IHMgKyBzZ3Jfc2VxLT5sZW4gKiBzaXpl
b2YgKihzKTsKKyAgaW50IGNvZGUsIGZnID0gYXR0cl9vcmlnICYgMTUsIGJnID0gYXR0cl9vcmln
ICYgKDE1IDw8IDQpOworICBpbnQgYnJpZ2h0ID0gMCwgaW52ZXJzZSA9IDA7CisgIHN0YXRpYyBj
b25zdCBpbnQgZmdfY29sb3JbXSA9IHsKKyAgICAwLCAgICAgICAgICAvKiBibGFjayAqLworICAg
IEZPUkVHUk9VTkRfUkVELCAvKiByZWQgKi8KKyAgICBGT1JFR1JPVU5EX0dSRUVOLCAgIC8qIGdy
ZWVuICovCisgICAgRk9SRUdST1VORF9HUkVFTiB8IEZPUkVHUk9VTkRfUkVELCAvKiB5ZWxsb3cg
Ki8KKyAgICBGT1JFR1JPVU5EX0JMVUUsICAgICAgICAgICAgICAgLyogYmx1ZSAqLworICAgIEZP
UkVHUk9VTkRfQkxVRSB8IEZPUkVHUk9VTkRfUkVELCAgLyogbWFnZW50YSAqLworICAgIEZPUkVH
Uk9VTkRfQkxVRSB8IEZPUkVHUk9VTkRfR1JFRU4sIC8qIGN5YW4gKi8KKyAgICBGT1JFR1JPVU5E
X1JFRCB8IEZPUkVHUk9VTkRfR1JFRU4gfCBGT1JFR1JPVU5EX0JMVUUgLyogZ3JheSAqLworICB9
OworICBzdGF0aWMgY29uc3QgaW50IGJnX2NvbG9yW10gPSB7CisgICAgMCwgICAgICAgICAgLyog
YmxhY2sgKi8KKyAgICBCQUNLR1JPVU5EX1JFRCwgLyogcmVkICovCisgICAgQkFDS0dST1VORF9H
UkVFTiwgICAvKiBncmVlbiAqLworICAgIEJBQ0tHUk9VTkRfR1JFRU4gfCBCQUNLR1JPVU5EX1JF
RCwgLyogeWVsbG93ICovCisgICAgQkFDS0dST1VORF9CTFVFLCAgICAgICAgICAgICAgIC8qIGJs
dWUgKi8KKyAgICBCQUNLR1JPVU5EX0JMVUUgfCBCQUNLR1JPVU5EX1JFRCwgIC8qIG1hZ2VudGEg
Ki8KKyAgICBCQUNLR1JPVU5EX0JMVUUgfCBCQUNLR1JPVU5EX0dSRUVOLCAvKiBjeWFuICovCisg
ICAgQkFDS0dST1VORF9SRUQgfCBCQUNLR1JPVU5EX0dSRUVOIHwgQkFDS0dST1VORF9CTFVFIC8q
IGdyYXkgKi8KKyAgfTsKKworICBmb3IgKHAgPSBzOyAqcyAmJiBwIDw9IGU7IHArKykKKyAgICB7
CisgICAgICBpZiAoKnAgPT0gJzsnIHx8ICpwID09ICdcMCcgfHwgcCA9PSBlKQorICAgICAgICB7
CisgICAgICAgICAgY29kZSA9IHN0cnRvbCAocywgTlVMTCwgMTApOworICAgICAgICAgIHMgPSBw
ICsgKCpwID09ICc7Jyk7CisKKyAgICAgICAgICBzd2l0Y2ggKGNvZGUpCisgICAgICAgICAgICB7
CisgICAgICAgICAgICBjYXNlIDA6IC8qIGFsbCBhdHRyaWJ1dGVzIG9mZiAqLworICAgICAgICAg
ICAgICBmZyA9IGF0dHJfb3JpZyAmIDE1OworICAgICAgICAgICAgICBiZyA9IGF0dHJfb3JpZyAm
ICgxNSA8PCA0KTsKKyAgICAgICAgICAgICAgYnJpZ2h0ID0gMDsKKyAgICAgICAgICAgICAgaW52
ZXJzZSA9IDA7CisgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSAxOiAvKiBp
bnRlbnNpdHkgb24gKi8KKyAgICAgICAgICAgICAgYnJpZ2h0ID0gMTsKKyAgICAgICAgICAgICAg
YnJlYWs7CisgICAgICAgICAgICBjYXNlIDc6IC8qIGludmVyc2UgdmlkZW8gKi8KKyAgICAgICAg
ICAgICAgaW52ZXJzZSA9IDE7CisgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2Fz
ZSAyMjogICAgLyogaW50ZW5zaXR5IG9mZiAqLworICAgICAgICAgICAgICBicmlnaHQgPSAwOwor
ICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgMjc6ICAgIC8qIGludmVyc2Ug
b2ZmICovCisgICAgICAgICAgICAgIGludmVyc2UgPSAwOworICAgICAgICAgICAgICBicmVhazsK
KyAgICAgICAgICAgIGNhc2UgMzA6IGNhc2UgMzE6IGNhc2UgMzI6IGNhc2UgMzM6IC8qIGZvcmVn
cm91bmQgY29sb3IgKi8KKyAgICAgICAgICAgIGNhc2UgMzQ6IGNhc2UgMzU6IGNhc2UgMzY6IGNh
c2UgMzc6CisgICAgICAgICAgICAgIGZnID0gZmdfY29sb3JbY29kZSAtIDMwXTsKKyAgICAgICAg
ICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIDM5OiAgICAvKiBkZWZhdWx0IGZvcmVncm91
bmQgKi8KKyAgICAgICAgICAgICAgZmcgPSBhdHRyX29yaWcgJiAxNTsKKyAgICAgICAgICAgICAg
YnJlYWs7CisgICAgICAgICAgICBjYXNlIDQwOiBjYXNlIDQxOiBjYXNlIDQyOiBjYXNlIDQzOiAv
KiBiYWNrZ3JvdW5kIGNvbG9yICovCisgICAgICAgICAgICBjYXNlIDQ0OiBjYXNlIDQ1OiBjYXNl
IDQ2OiBjYXNlIDQ3OgorICAgICAgICAgICAgICBiZyA9IGJnX2NvbG9yW2NvZGUgLSA0MF07Cisg
ICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSA0OTogICAgLyogZGVmYXVsdCBi
YWNrZ3JvdW5kICovCisgICAgICAgICAgICAgIGJnID0gYXR0cl9vcmlnICYgKDE1IDw8IDQpOwor
ICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICAg
IGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorICBpZiAoaW52ZXJzZSkK
KyAgICB7CisgICAgICBpbnQgdCA9IGZnOworICAgICAgZmcgPSAoYmcgPj4gNCk7CisgICAgICBi
ZyA9ICh0IDw8IDQpOworICAgIH0KKyAgaWYgKGJyaWdodCkKKyAgICBmZyB8PSBGT1JFR1JPVU5E
X0lOVEVOU0lUWTsKKworICByZXR1cm4gKGJnICYgKDE1IDw8IDQpKSB8IChmZyAmIDE1KTsKK30K
KyNlbmRpZgorCiBlbnVtIGluZGljYXRvcl9ubwogICB7CiAgICAgQ19MRUZULCBDX1JJR0hULCBD
X0VORCwgQ19SRVNFVCwgQ19IRUFERVIsIENfQURELCBDX0RFTEVURSwgQ19MSU5FCkBAIC0xMzQ0
LDQ2ICsxNDgzLDg4IEBAIHB1dF9pbmRpY2F0b3IgKGNvbnN0IHN0cnVjdCBiaW5fc3RyICppbmQp
CiAgIGZ3cml0ZSAoaW5kLT5zdHJpbmcsIGluZC0+bGVuLCAxLCBvdXRmaWxlKTsKIH0KIAorc3Rh
dGljIHZvaWQKK3B1dF9jb2xvcl9pbmRpY2F0b3IgKGNvbnN0IGVudW0gaW5kaWNhdG9yX25vIGlu
ZF9ubykKK3sKKyNpZmRlZiBfV0lOMzIKKyAgaWYgKGhzdGRvdXQgIT0gTlVMTCAmJiBoc3Rkb3V0
ICE9IElOVkFMSURfSEFORExFX1ZBTFVFKQorICAgIHsKKyAgICAgIFNIT1JUIGF0dHIgPSB3MzJf
c2dyMmF0dHIgKCZjb2xvcl9pbmRpY2F0b3JbaW5kX25vXSk7CisgICAgICBTZXRDb25zb2xlVGV4
dEF0dHJpYnV0ZSAoaHN0ZG91dCwgYXR0cik7CisgICAgfQorICBlbHNlCisgICAgeworI2VuZGlm
CisgICAgICBwdXRfaW5kaWNhdG9yICgmY29sb3JfaW5kaWNhdG9yW0NfTEVGVF0pOworICAgICAg
cHV0X2luZGljYXRvciAoJmNvbG9yX2luZGljYXRvcltpbmRfbm9dKTsKKyAgICAgIHB1dF9pbmRp
Y2F0b3IgKCZjb2xvcl9pbmRpY2F0b3JbQ19SSUdIVF0pOworI2lmZGVmIF9XSU4zMgorICAgIH0K
KyNlbmRpZgorfQorCitzdGF0aWMgdm9pZAorcHV0X3Jlc2V0X2luZGljYXRvciAodm9pZCkKK3sK
KyNpZmRlZiBfV0lOMzIKKyAgaWYgKGhzdGRvdXQgIT0gTlVMTCAmJiBoc3Rkb3V0ICE9IElOVkFM
SURfSEFORExFX1ZBTFVFKQorICAgIHsKKyAgICAgIFNldENvbnNvbGVUZXh0QXR0cmlidXRlICho
c3Rkb3V0LCBhdHRyX29yaWcpOworICAgIH0KKyAgZWxzZQorICAgIHsKKyNlbmRpZgorICAgICAg
cHV0X2luZGljYXRvciAoJmNvbG9yX2luZGljYXRvcltDX0xFRlRdKTsKKyAgICAgIHB1dF9pbmRp
Y2F0b3IgKCZjb2xvcl9pbmRpY2F0b3JbQ19SRVNFVF0pOworICAgICAgcHV0X2luZGljYXRvciAo
JmNvbG9yX2luZGljYXRvcltDX1JJR0hUXSk7CisjaWZkZWYgX1dJTjMyCisgICAgfQorI2VuZGlm
Cit9CisKIHN0YXRpYyBlbnVtIGNvbG9yX2NvbnRleHQgbGFzdF9jb250ZXh0ID0gUkVTRVRfQ09O
VEVYVDsKIAogdm9pZAogc2V0X2NvbG9yX2NvbnRleHQgKGVudW0gY29sb3JfY29udGV4dCBjb2xv
cl9jb250ZXh0KQogewogICBwcm9jZXNzX3NpZ25hbHMgKCk7CisgIHNldGNvbG9yY3R4IChjb2xv
cl9jb250ZXh0KTsKK30KKwordm9pZAorc2V0Y29sb3JjdHggKGVudW0gY29sb3JfY29udGV4dCBj
b2xvcl9jb250ZXh0KQorewogICBpZiAoY29sb3JzX2VuYWJsZWQgJiYgbGFzdF9jb250ZXh0ICE9
IGNvbG9yX2NvbnRleHQpCiAgICAgewotICAgICAgcHV0X2luZGljYXRvciAoJmNvbG9yX2luZGlj
YXRvcltDX0xFRlRdKTsKICAgICAgIHN3aXRjaCAoY29sb3JfY29udGV4dCkKICAgICAgICAgewog
ICAgICAgICBjYXNlIEhFQURFUl9DT05URVhUOgotICAgICAgICAgIHB1dF9pbmRpY2F0b3IgKCZj
b2xvcl9pbmRpY2F0b3JbQ19IRUFERVJdKTsKKyAgICAgICAgICBwdXRfY29sb3JfaW5kaWNhdG9y
IChDX0hFQURFUik7CiAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgY2FzZSBMSU5FX05VTUJF
Ul9DT05URVhUOgotICAgICAgICAgIHB1dF9pbmRpY2F0b3IgKCZjb2xvcl9pbmRpY2F0b3JbQ19M
SU5FXSk7CisgICAgICAgICAgcHV0X2NvbG9yX2luZGljYXRvciAoQ19MSU5FKTsKICAgICAgICAg
ICBicmVhazsKIAogICAgICAgICBjYXNlIEFERF9DT05URVhUOgotICAgICAgICAgIHB1dF9pbmRp
Y2F0b3IgKCZjb2xvcl9pbmRpY2F0b3JbQ19BRERdKTsKKyAgICAgICAgICBwdXRfY29sb3JfaW5k
aWNhdG9yIChDX0FERCk7CiAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgY2FzZSBERUxFVEVf
Q09OVEVYVDoKLSAgICAgICAgICBwdXRfaW5kaWNhdG9yICgmY29sb3JfaW5kaWNhdG9yW0NfREVM
RVRFXSk7CisgICAgICAgICAgcHV0X2NvbG9yX2luZGljYXRvciAoQ19ERUxFVEUpOwogICAgICAg
ICAgIGJyZWFrOwogCiAgICAgICAgIGNhc2UgUkVTRVRfQ09OVEVYVDoKLSAgICAgICAgICBwdXRf
aW5kaWNhdG9yICgmY29sb3JfaW5kaWNhdG9yW0NfUkVTRVRdKTsKKyAgICAgICAgICBwdXRfcmVz
ZXRfaW5kaWNhdG9yICgpOwogICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGRlZmF1bHQ6CiAg
ICAgICAgICAgYWJvcnQgKCk7CiAgICAgICAgIH0KLSAgICAgIHB1dF9pbmRpY2F0b3IgKCZjb2xv
cl9pbmRpY2F0b3JbQ19SSUdIVF0pOwogICAgICAgbGFzdF9jb250ZXh0ID0gY29sb3JfY29udGV4
dDsKICAgICB9CiB9CiAKLQogY2hhciBjb25zdCBjaGFuZ2VfbGV0dGVyW10gPSB7IDAsICdkJywg
J2EnLCAnYycgfTsKIAwKIC8qIFRyYW5zbGF0ZSBhbiBpbnRlcm5hbCBsaW5lIG51bWJlciAoYW4g
aW5kZXggaW50byBkaWZmJ3MgdGFibGUgb2YgbGluZXMpCg==
--001a1140ed4481486c052b133383--




From MAILER-DAEMON Mon Feb 08 08:30:15 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1aSltP-0006A4-FA
	for mharc-bug-diffutils@gnu.org; Mon, 08 Feb 2016 08:30:15 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:39270)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aSltJ-00066c-5P
	for bug-diffutils@gnu.org; Mon, 08 Feb 2016 08:30:13 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aSltC-0000yW-SI
	for bug-diffutils@gnu.org; Mon, 08 Feb 2016 08:30:09 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:57771)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aSltC-0000yS-Oe
	for bug-diffutils@gnu.org; Mon, 08 Feb 2016 08:30:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aSltC-00019i-KN
	for bug-diffutils@gnu.org; Mon, 08 Feb 2016 08:30:02 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Gisle Vanem <gvanem@yahoo.no>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 08 Feb 2016 13:30:02 +0000
Resent-Message-ID: <handler.22067.B.14549381674374@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 22067
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: gscrivano@gnu.org, 22067@debbugs.gnu.org
X-Debbugs-Original-To: Giuseppe Scrivano <gscrivano@gnu.org>,
	"bug-diffutils@gnu.org" <bug-diffutils@gnu.org>
Received: via spool by submit@debbugs.gnu.org id=B.14549381674374
	(code B ref -1); Mon, 08 Feb 2016 13:30:02 +0000
Received: (at submit) by debbugs.gnu.org; 8 Feb 2016 13:29:27 +0000
Received: from localhost ([127.0.0.1]:38127 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1aSlsd-00018U-9S
	for submit@debbugs.gnu.org; Mon, 08 Feb 2016 08:29:27 -0500
Received: from eggs.gnu.org ([208.118.235.92]:48157)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <gvanem@yahoo.no>) id 1aSlsb-00018I-RW
	for submit@debbugs.gnu.org; Mon, 08 Feb 2016 08:29:26 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gvanem@yahoo.no>) id 1aSlsU-0000tA-UX
	for submit@debbugs.gnu.org; Mon, 08 Feb 2016 08:29:20 -0500
Received: from lists.gnu.org ([2001:4830:134:3::11]:35150)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gvanem@yahoo.no>) id 1aSlsU-0000t6-RB
	for submit@debbugs.gnu.org; Mon, 08 Feb 2016 08:29:18 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:39109)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gvanem@yahoo.no>) id 1aSlsS-0005w1-Kn
	for bug-diffutils@gnu.org; Mon, 08 Feb 2016 08:29:18 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gvanem@yahoo.no>) id 1aSlsN-0000rH-I2
	for bug-diffutils@gnu.org; Mon, 08 Feb 2016 08:29:16 -0500
Received: from nm23-vm5.bullet.mail.ir2.yahoo.com ([212.82.97.20]:59669)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gvanem@yahoo.no>) id 1aSlsN-0000r7-8C
	for bug-diffutils@gnu.org; Mon, 08 Feb 2016 08:29:11 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.no; s=s2048;
	t=1454938148; bh=fqBKgJG66Lgwww+dJF7tpLHDpVfJNOi2MAUVGSgqx8Y=;
	h=From:Subject:To:References:Date:In-Reply-To:From:Subject;
	b=MXS3xXJkYOSFUdX3tU/FQyJnCSKPvNct9pdT6pcsIzyunx8yaPSRMyQzl30rYF0BR0Ptt8ByYhKGl/cEqCsUL9IK3af9ktJ06ROg2a1L0NbuqcsrhQxPqyCq7Kf4U9j/znSV5a1/K9RCOUWKhyGzwsGPgAumSQGs4c3SqDKEJxWjpRo6JaA0Xoi7vakEfbCbFj71HtHxzhW3dg/qZVV3KnwckHVhOd6P+0QXiQeV8no3Fcd10LCfvWrZb2HGIMYKsfbvvp/CjRZNyhuC1jQgGLP4fFgtjSOIZJrEqnE1F5QeWojm5LyLhPLmcU4Z0OzGC6IyaRT2m7rLkLdM8o2/KA==
Received: from [212.82.98.56] by nm23.bullet.mail.ir2.yahoo.com with NNFMP;
	08 Feb 2016 13:29:08 -0000
Received: from [46.228.39.68] by tm9.bullet.mail.ir2.yahoo.com with NNFMP;
	08 Feb 2016 13:29:08 -0000
Received: from [127.0.0.1] by smtp105.mail.ir2.yahoo.com with NNFMP;
	08 Feb 2016 13:29:08 -0000
X-Yahoo-Newman-Id: 882670.35432.bm@smtp105.mail.ir2.yahoo.com
X-Yahoo-Newman-Property: ymail-3
X-YMail-OSG: NGlRD5MVM1nTaqOkY0QmpaTEt.wvktRLMHCBjgqBeXRoRMZ
	8MRY_szYbZeq8LMKC_uSAQ9yg1SvmXIwDzT5nVZagHAg4ArsOLsdDLIGOWKn
	29BKFnUcs4O.c9IUwRXTl.XsoWscfMwDMxkZrNhFu9j1JJ0uGu0KxmqL67Rx
	pLDXXkKMqYS33bX3qq.WgCPmsTJqvXTSYBejsSy3rkrV7fnpHvaVPkA7FCLv
	cg9ggIGOaMhw9RavPy1OLYu28kMxXiJ13AT43eNf8B96a9Enmro5Xxp65HJ2
	oJtyhGNd8kJGKj_0qFvGgEU3GFryzNCTLW6hMLTXnVT2ohLP07nKZE6Yt5zG
	M2nS74ixjFdY_gunFlyChp51DRQFwyY_NfY9AEiumq6q6RBpO7vWFH1Sim43
	TLMDg6CbcR3i9t7Ade7SNJi8seYNCmKP8oDP4mBA9k0MvkfVobvAMtBdpLDN
	q1s0FcEvso3D9MvDlxYClc0.MUdzh1LjF93xtxWQ4K7le6gCIFdrQEaOumSk
	rgfFRRy5m716b.znklg8MF7.nWDDFgNe1zNf.c7Kb
X-Yahoo-SMTP: 8zhYLGyswBB3AGU8c4pvFIFOfA--
From: Gisle Vanem <gvanem@yahoo.no>
References: <565D6EF4.20903@yahoo.no> <87oac3peqc.fsf@foo.bar.baz>
	<56B86F8C.2010102@yahoo.no> <87zivb74c6.fsf@foo.bar.baz>
Message-ID: <56B89827.5090909@yahoo.no>
Date: Mon, 8 Feb 2016 14:29:11 +0100
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101
	Thunderbird/38.5.1
MIME-Version: 1.0
In-Reply-To: <87zivb74c6.fsf@foo.bar.baz>
Content-Type: multipart/mixed; boundary="------------090302000907010504080707"
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#22067: bug#22067: bug#20062: bug#20062: [PATCH]
	diff: add support for --color
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Feb 2016 13:30:14 -0000

This is a multi-part message in MIME format.
--------------090302000907010504080707
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit

Giuseppe Scrivano wrote:

> thanks for your patches.  Is it fine for you if we keep bug-diffutils in
> the loop?

Sure. I forgot it was in the CC-list.
Attached again; wincolor.c + diff-1.txt.
Excused my diff format; I'm a "git n00b". Hope you figure it out.

-- 
--gv



--------------090302000907010504080707
Content-Type: text/plain; charset=UTF-8;
 name="wincolor.c"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename="wincolor.c"

I3VuZGVmICBXSU4zMl9MRUFOX0FORF9NRUFODQojZGVmaW5lIFdJTjMyX0xFQU5fQU5EX01F
QU4NCg0KI2luY2x1ZGUgImRpZmYuaCINCg0KI2luY2x1ZGUgPGFzc2VydC5oPg0KI2luY2x1
ZGUgPHdpbmRvd3MuaD4NCg0Kc3RhdGljIENPTlNPTEVfU0NSRUVOX0JVRkZFUl9JTkZPIGNv
bnNvbGVfaW5mbzsNCnN0YXRpYyBIQU5ETEUgY29uc29sZV9obmQgPSBJTlZBTElEX0hBTkRM
RV9WQUxVRTsNCg0KLyoNCiAqIFRoZXNlIChjdXJyZW50bHkgaGFyZC1jb2RlZCkgY29sb3Vy
cyBzcGVjaWZ5IHRoZSBmb3JlZ3JvdW5kIGNvbG9ycyB0byB1c2UNCiAqIGluIHRoZSBkaWZm
ZXJlbnQgY29udGV4dCBmdW5jdGlvbnMuIEUuZy46DQogKiAgICdzZXRfY29sb3JfY29udGV4
dChIRUFERVJfQ09OVEVYVCknIHVzZXMgJ2NvbG9yX21hcFs0XScgd2hpY2ggYnkgZGVmYXVs
dCBzZXRzDQogKiAgIHRoZSBmb3JlZ3JvdW5kIHRvIGJyaWdodCB3aGl0ZSkuDQogKg0KICog
IGNvbG9yX21hcFs0XSAtPiBmaWxlLWhlYWRlciBjb2xvcg0KICogIGNvbG9yX21hcFs1XSAt
PiBhZGRlZCBjb2xvcg0KICogIGNvbG9yX21hcFs2XSAtPiBkZWxldGUgY29sb3INCiAqICBj
b2xvcl9tYXBbN10gLT4gbGluZS1udW1iZXIgY29sb3IgKGUuZy4gJ0BAIC00OSwyMSArNDks
MzEgQEAnKQ0KICoNCiAqIFRoZSBiYWNrZ3JvdW5kIGNvbG9yIGlzIG5ldmVyIHNldC4NCiAq
DQogKiBOb3RlOiBUaGUgJ2NvbG9yX21hcFtdJyBpcyByZW1hcHBlZCBpZiAnY29sb3JfcGFs
ZXR0ZScgaXMgdXNlZC4NCiAqICAgICAgIFNlZSAnbWFwX3NnaV90b193aW5jb24oKScuDQog
KiAgICAgICBFLmcuIHNldCB0aGUgZW52LXZhciAiRElGRl9DT0xPUlM9aGQ9Mzc7MTphZD0z
MjsxOmRlPTMxOzE6bG49MzM7MSINCiAqICAgICAgIHRvIGRlZmluZSB0aGUgU0dJLiBBbmQg
aW52b2tlIGRpZmYgd2l0aCAnLS1jb2xvciAtLXBhbGV0dGU9JURJRkZfQ09MT1JTJScNCiAq
Lw0KI2RlZmluZSBDX0hFQURFUiA0DQoNCnN0YXRpYyBXT1JEIGNvbG9yX21hcCBbXSA9IHsN
CiAgICAgICAgICAgIDAsIDAsIDAsIDAsDQogICAgICAgICAgICA3IHwgRk9SRUdST1VORF9J
TlRFTlNJVFksICAvKiBjb2xvdXIgZm9yIEhFQURFUl9DT05URVhUICAgICAgLT4gYnJpZ2h0
IHdoaXRlICovDQogICAgICAgICAgICAyIHwgRk9SRUdST1VORF9JTlRFTlNJVFksICAvKiBj
b2xvdXIgZm9yIEFERF9DT05URVhUICAgICAgICAgLT4gYnJpZ2h0IGdyZWVuICovDQogICAg
ICAgICAgICA0IHwgRk9SRUdST1VORF9JTlRFTlNJVFksICAvKiBjb2xvdXIgZm9yIERFTEVU
RV9DT05URVhUICAgICAgLT4gYnJpZ2h0IHJlZCAqLw0KICAgICAgICAgICAgMyB8IEZPUkVH
Uk9VTkRfSU5URU5TSVRZICAgLyogY29sb3VyIGZvciBMSU5FX05VTUJFUl9DT05URVhUIC0+
IGJyaWdodCBjeWFuICovDQogICAgICAgICAgfTsNCg0Kc3RhdGljIHZvaWQgbWFwX3NnaV90
b193aW5jb24gKGNvbnN0IGNoYXIgKmNvbG9yX25hbWUsIGNvbnN0IGNoYXIgKnNnaSwgV09S
RCAqY29sb3IpDQp7DQogIGludCAgbnVtLCBhMSA9IDAsIGEyID0gMCwgZmcgPSAwLCBiZyA9
IDA7DQogIFdPUkQgb3JpZyA9ICpjb2xvcjsNCg0KICAvKiBSZWYuIGh0dHA6Ly9lbi53aWtp
cGVkaWEub3JnL3dpa2kvQU5TSV9lc2NhcGVfY29kZSNDb2xvcnMNCiAgICovDQogIHN0YXRp
YyBXT1JEIHNnaV9jb2xvcl9tYXBbXSA9IHsNCiAgICAgICAgIDAsICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLyogRVNDWzMwbSAtPiBCbGFj
ayAqLw0KICAgICAgICAgRk9SRUdST1VORF9SRUQsICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAvKiBFU0NbMzFtIC0+IFJlZCAqLw0KICAgICAgICAgRk9SRUdST1VO
RF9HUkVFTiwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvKiBFU0NbMzJt
IC0+IEdyZWVuICovDQogICAgICAgICBGT1JFR1JPVU5EX1JFRCB8IEZPUkVHUk9VTkRfR1JF
RU4sICAgICAgICAgICAgICAgICAgIC8qIEVTQ1szM20gLT4gWWVsbG93ICovDQogICAgICAg
ICBGT1JFR1JPVU5EX0JMVUUsICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
IC8qIEVTQ1szNG0gLT4gQmx1ZSAqLw0KICAgICAgICAgRk9SRUdST1VORF9SRUQgfCBGT1JF
R1JPVU5EX0JMVUUsICAgICAgICAgICAgICAgICAgICAvKiBFU0NbMzVtIC0+IE1hZ2VudGEg
Ki8NCiAgICAgICAgIEZPUkVHUk9VTkRfQkxVRSB8IEZPUkVHUk9VTkRfR1JFRU4sICAgICAg
ICAgICAgICAgICAgLyogRVNDWzM2bSAtPiBDeWFuICovDQogICAgICAgICBGT1JFR1JPVU5E
X1JFRCB8IEZPUkVHUk9VTkRfQkxVRSB8IEZPUkVHUk9VTkRfR1JFRU4gIC8qIEVTQ1szN20g
LT4gV2hpdGUgKi8NCiAgICAgICB9Ow0KDQogIG51bSA9IHNzY2FuZiAoc2dpLCAiJWQ7JWQi
LCAmYTEsICZhMik7DQoNCiAgaWYgKG51bSA9PSAyKQ0KICB7DQogICAgaWYgKGExID49IDMw
ICYmIGExIDw9IDM3KQ0KICAgIHsNCiAgICAgIGZnID0gc2dpX2NvbG9yX21hcCBbYTEgLSAz
MF07DQogICAgICBpZiAoYTIgPT0gMSkNCiAgICAgICAgIGZnIHw9IEZPUkVHUk9VTkRfSU5U
RU5TSVRZOw0KICAgIH0NCiAgICBlbHNlIGlmIChhMSA+PSA0MCAmJiBhMSA8PSA0NykNCiAg
ICB7DQogICAgICBiZyA9IHNnaV9jb2xvcl9tYXAgW2ExIC0gNDBdOw0KICAgICAgaWYgKGEy
ID09IDEpDQogICAgICAgICBiZyB8PSBCQUNLR1JPVU5EX0lOVEVOU0lUWTsNCiAgICB9DQog
IH0NCiAgZWxzZSBpZiAobnVtID09IDEpDQogIHsNCiAgICBpZiAoYTEgPj0gMzAgJiYgYTEg
PD0gMzcpDQogICAgICAgZmcgPSBzZ2lfY29sb3JfbWFwIFthMSAtIDMwXTsNCiAgfQ0KICBl
bHNlDQogICAgcmV0dXJuOw0KDQogIGlmIChmZykNCiAgICAgKmNvbG9yID0gZmcgfCAob3Jp
ZyAmIH4weEYpOw0KDQogIGlmIChiZykNCiAgICAgKmNvbG9yID0gKGJnIDw8IDQpIHwgKG9y
aWcgJiAweEYpOw0KfQ0KDQp2b2lkIGluaXRfd2luY29uICh2b2lkKQ0Kew0KICBCT09MIG9r
YXk7DQogIFdPUkQgYmFja2dyb3VuZDsNCiAgY2hhciBzZ2kgWzIwXSwgKmVudjsNCiAgaW50
ICBpOw0KDQogIGFzc2VydCAoQVJSQVlfU0laRShjb2xvcl9pbmRpY2F0b3IpIDw9IEFSUkFZ
X1NJWkUoY29sb3JfbWFwKSk7DQoNCiAgY29uc29sZV9obmQgPSBHZXRTdGRIYW5kbGUgKFNU
RF9PVVRQVVRfSEFORExFKTsNCiAgb2theSA9IChjb25zb2xlX2huZCAhPSBJTlZBTElEX0hB
TkRMRV9WQUxVRSAmJg0KICAgICAgICAgIEdldENvbnNvbGVTY3JlZW5CdWZmZXJJbmZvKGNv
bnNvbGVfaG5kLCAmY29uc29sZV9pbmZvKSk7DQoNCiAgaWYgKCFva2F5IHx8IEdldEZpbGVU
eXBlKGNvbnNvbGVfaG5kKSAhPSBGSUxFX1RZUEVfQ0hBUikNCiAgICBjb2xvcnNfZW5hYmxl
ZCA9IGZhbHNlOw0KICBlbHNlIHsNCiAgICBiYWNrZ3JvdW5kID0gY29uc29sZV9pbmZvLndB
dHRyaWJ1dGVzICYgfjc7DQogICAgZm9yIChpID0gNDsgaSA8IEFSUkFZX1NJWkUoY29sb3Jf
bWFwKTsgaSsrKQ0KICAgICAgIGNvbG9yX21hcFtpXSB8PSBiYWNrZ3JvdW5kOw0KICB9DQoN
CiAgaWYgKGNvbG9yX3BhbGV0dGUpIHsNCiAgICBmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0la
RShjb2xvcl9pbmRpY2F0b3IpOyBpKyspIHsNCiAgICAgIGlmIChpIDwgQ19IRUFERVIpDQog
ICAgICAgICBjb250aW51ZTsNCiAgICAgIG1lbXNldCAoc2dpLCAnXDAnLCBzaXplb2Yoc2dp
KSk7DQogICAgICBtZW1jcHkgKHNnaSwgY29sb3JfaW5kaWNhdG9yW2ldLnN0cmluZywgY29s
b3JfaW5kaWNhdG9yW2ldLmxlbik7DQogICAgICBtYXBfc2dpX3RvX3dpbmNvbiAoaW5kaWNh
dG9yX25hbWVbaV0sIHNnaSwgJmNvbG9yX21hcFtpXSk7DQogICAgfQ0KICB9DQp9DQoNCi8q
DQogKiBTZXQgY29uc29sZSBmb3JlZ3JvdW5kIGFuZCBvcHRpb25hbGx5IGJhY2tncm91bmQg
Y29sb3IuDQogKiBjb2xvcl9tYXBbaW5kZXhdOiBGRyBpcyBpbiB0aGUgbG93IDQgYml0cy4N
CiAqICAgICAgICAgICAgICAgICAgIEJHIGlzIGluIHRoZSB1cHBlciA0IGJpdHMgb2YgdGhl
IEJZVEUuDQogKiBJZiAnaW5kZXggPT0gLTEnLCBzZXQgZGVmYXVsdCBjb25zb2xlIGNvbG91
ci4NCiAqLw0Kdm9pZCBzZXRfY29sb3IgKGludCBpbmRleCkNCnsNCiAgQllURSBmZywgYmc7
DQogIFdPUkQgYXR0cjsNCg0KICBpZiAoaW5kZXggPT0gLTEpICAgICAvKiByZXN0b3JlIHRv
IGRlZmF1bHQgY29sb3VyICovDQogIHsNCiAgICBhdHRyID0gY29uc29sZV9pbmZvLndBdHRy
aWJ1dGVzOw0KICAgIGZnICAgPSBMT0JZVEUgKGF0dHIpOw0KICAgIGJnICAgPSBISUJZVEUg
KGF0dHIpOw0KICB9DQogIGVsc2UNCiAgew0KICAgIGF0dHIgPSBjb2xvcl9tYXBbaW5kZXhd
Ow0KICAgIGZnICAgPSBMT0JZVEUgKGF0dHIpOw0KICAgIGJnICAgPSBISUJZVEUgKGF0dHIp
Ow0KDQogICAgLyoNCiAgICBpZiAoYmcgPT0gKEJZVEUpLTEpDQogICAgICAgICBhdHRyID0g
Y29uc29sZV9pbmZvLndBdHRyaWJ1dGVzICYgfjc7DQogICAgZWxzZSAqLyBhdHRyID0gYmcg
PDwgNDsNCiAgICBhdHRyIHw9IGZnOw0KICB9DQogIFNldENvbnNvbGVUZXh0QXR0cmlidXRl
IChjb25zb2xlX2huZCwgYXR0cik7DQp9DQoNCg==
--------------090302000907010504080707
Content-Type: text/plain; charset=UTF-8;
 name="diff-1.txt"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename="diff-1.txt"

LS0tIGEvc3JjL2RpZmYuaCAgMjAxNi0wMS0zMCAyMDoyOToyOQ0KKysrIGIvc3JjL2RpZmYu
aCAyMDE2LTAxLTMwIDIwOjM1OjM0DQpAQCAtMzc4LDYgKzM3OCwxOCBAQA0KIGV4dGVybiB2
b2lkIHByaW50X3NkaWZmX3NjcmlwdCAoc3RydWN0IGNoYW5nZSAqKTsNCg0KIC8qIHV0aWwu
YyAqLw0KKw0KK3N0cnVjdCBiaW5fc3RyDQorICB7DQorICAgIHNpemVfdCBsZW47CQkJLyog
TnVtYmVyIG9mIGJ5dGVzICovDQorICAgIGNvbnN0IGNoYXIgKnN0cmluZzsJCS8qIFBvaW50
ZXIgdG8gdGhlIHNhbWUgKi8NCisgIH07DQorDQorZXh0ZXJuIHN0cnVjdCBiaW5fc3RyIGNv
bG9yX2luZGljYXRvciBbOF07DQorZXh0ZXJuIGNvbnN0IGNoYXIgKmNvbnN0IGluZGljYXRv
cl9uYW1lWzldOw0KK2V4dGVybiBjaGFyIGNvbnN0ICpjb2xvcl9wYWxldHRlOw0KK2V4dGVy
biBib29sIGNvbG9yc19lbmFibGVkOw0KKw0KIGV4dGVybiBjaGFyIGNvbnN0IGNoYW5nZV9s
ZXR0ZXJbNF07DQogZXh0ZXJuIGNoYXIgY29uc3QgcHJfcHJvZ3JhbVtdOw0KIGV4dGVybiBj
aGFyICpjb25jYXQgKGNoYXIgY29uc3QgKiwgY2hhciBjb25zdCAqLCBjaGFyIGNvbnN0ICop
Ow0KQEAgLTQxOSwzICs0MzEsMjAgQEANCg0KIGV4dGVybiB2b2lkIHNldF9jb2xvcl9jb250
ZXh0IChlbnVtIGNvbG9yX2NvbnRleHQgY29sb3JfY29udGV4dCk7DQogZXh0ZXJuIHZvaWQg
c2V0X2NvbG9yX3BhbGV0dGUgKGNoYXIgY29uc3QgKnBhbGV0dGUpOw0KKw0KKy8qIHdpbmNv
bG9yLmMgKi8NCisNCisjaWZkZWYgV0lOMzINCisgICNpbmNsdWRlIDxzaWduYWwuaD4NCisN
CisgICNpZm5kZWYgU0lHU1RPUA0KKyAgI2RlZmluZSBTSUdTVE9QIFNJR1RFUk0NCisgICNl
bmRpZg0KKw0KKyAgI2lmbmRlZiBBUlJBWV9TSVpFDQorICAjZGVmaW5lIEFSUkFZX1NJWkUo
YSkgKHNpemVvZiAoYSkgLyBzaXplb2YgKChhKVswXSkpDQorICAjZW5kaWYNCisNCisgIGV4
dGVybiB2b2lkIGluaXRfd2luY29uICh2b2lkKTsNCisgIGV4dGVybiB2b2lkIHNldF9jb2xv
ciAoaW50IGluZGV4KTsNCisjZW5kaWYNCi0tLSBhL3NyYy91dGlsLmMgIDIwMTYtMDEtMzAg
MjA6Mjk6MjkNCisrKyBiL3NyYy91dGlsLmMgMjAxNi0wMS0zMCAyMDozODoxMg0KQEAgLTIw
OCw3ICsyMDgsMTEgQEANCiAgICAgICBpbnQgc3RvcHM7DQogICAgICAgc2lnc2V0X3Qgb2xk
c2V0Ow0KDQorI2lmZGVmIFdJTjMyDQorICAgICAgc2V0X2NvbG9yICgtMSk7DQorI2Vsc2UN
CiAgICAgICBzZXRfY29sb3JfY29udGV4dCAoUkVTRVRfQ09OVEVYVCk7DQorI2VuZGlmDQog
ICAgICAgZmZsdXNoIChzdGRvdXQpOw0KDQogICAgICAgc2lncHJvY21hc2sgKFNJR19CTE9D
SywgJmNhdWdodF9zaWduYWxzLCAmb2xkc2V0KTsNCkBAIC0yNDUsMTAgKzI0OSwyMCBAQA0K
ICAgc3RhdGljIGludCBjb25zdCBzaWdbXSA9DQogICAgIHsNCiAgICAgICAvKiBUaGlzIG9u
ZSBpcyBoYW5kbGVkIHNwZWNpYWxseS4gICovDQorI2lmZGVmIFNJR1RTVFANCiAgICAgICBT
SUdUU1RQLA0KLQ0KKyNlbmRpZg0KKyNpZmRlZiBTSUdBTFJNDQorICAgICAgU0lHQUxSTSwN
CisjZW5kaWYNCisjaWZkZWYgU0lHUVVJVA0KKyAgICAgIFNJR1FVSVQsDQorI2VuZGlmDQog
ICAgICAgLyogVGhlIHVzdWFsIHN1c3BlY3RzLiAgKi8NCi0gICAgICBTSUdBTFJNLCBTSUdI
VVAsIFNJR0lOVCwgU0lHUElQRSwgU0lHUVVJVCwgU0lHVEVSTSwNCisgICAgICBTSUdIVVAs
IFNJR0lOVCwgU0lHUElQRSwNCisjaWZkZWYgU0lHVEVSTQ0KKyAgICAgIFNJR1RFUk0sDQor
I2VuZGlmDQogI2lmZGVmIFNJR1BPTEwNCiAgICAgICBTSUdQT0xMLA0KICNlbmRpZg0KQEAg
LTI5OCw3ICszMTIsMTEgQEANCiAgICAgICAgIGNhdWdodF9zaWdbal0gPSAoc2lnbmFsIChz
aWdbal0sIFNJR19JR04pICE9IFNJR19JR04pOw0KICAgICAgICAgaWYgKGNhdWdodF9zaWdb
al0pDQogICAgICAgICAgIHsNCisjaWZkZWYgU0lHVFNUUA0KICAgICAgICAgICAgIHNpZ25h
bCAoc2lnW2pdLCBzaWdbal0gPT0gU0lHVFNUUCA/IHN0b3BoYW5kbGVyIDogc2lnaGFuZGxl
cik7DQorI2Vsc2UNCisgICAgICAgICAgICBzaWduYWwgKHNpZ1tqXSwgc2lnaGFuZGxlcik7
DQorI2VuZGlmDQogICAgICAgICAgICAgc2lnaW50ZXJydXB0IChzaWdbal0sIDApOw0KICAg
ICAgICAgICB9DQogICAgICAgfQ0KQEAgLTMwOSwxNiArMzI3LDEwIEBADQogc3RhdGljIGNo
YXIgY29uc3QgKmN1cnJlbnRfbmFtZTA7DQogc3RhdGljIGNoYXIgY29uc3QgKmN1cnJlbnRf
bmFtZTE7DQogc3RhdGljIGJvb2wgY3VycmVudGx5X3JlY3Vyc2l2ZTsNCi1zdGF0aWMgYm9v
bCBjb2xvcnNfZW5hYmxlZDsNCitib29sIGNvbG9yc19lbmFibGVkOw0KDQogc3RhdGljIHN0
cnVjdCBjb2xvcl9leHRfdHlwZSAqY29sb3JfZXh0X2xpc3QgPSBOVUxMOw0KDQotc3RydWN0
IGJpbl9zdHINCi0gIHsNCi0gICAgc2l6ZV90IGxlbjsJCQkvKiBOdW1iZXIgb2YgYnl0ZXMg
Ki8NCi0gICAgY29uc3QgY2hhciAqc3RyaW5nOwkJLyogUG9pbnRlciB0byB0aGUgc2FtZSAq
Lw0KLSAgfTsNCi0NCiBzdHJ1Y3QgY29sb3JfZXh0X3R5cGUNCiAgIHsNCiAgICAgc3RydWN0
IGJpbl9zdHIgZXh0OwkJLyogVGhlIGV4dGVuc2lvbiB3ZSdyZSBsb29raW5nIGZvciAqLw0K
QEAgLTU0Niw3ICs1NTgsNyBAQA0KDQogI2RlZmluZSBMRU5fU1RSX1BBSVIocykgc2l6ZW9m
IChzKSAtIDEsIHMNCg0KLXN0YXRpYyBzdHJ1Y3QgYmluX3N0ciBjb2xvcl9pbmRpY2F0b3Jb
XSA9DQorc3RydWN0IGJpbl9zdHIgY29sb3JfaW5kaWNhdG9yWzhdID0NCiAgIHsNCiAgICAg
eyBMRU5fU1RSX1BBSVIgKCJcMDMzWyIpIH0sCQkvKiBsYzogTGVmdCBvZiBjb2xvciBzZXF1
ZW5jZSAqLw0KICAgICB7IExFTl9TVFJfUEFJUiAoIm0iKSB9LAkJLyogcmM6IFJpZ2h0IG9m
IGNvbG9yIHNlcXVlbmNlICovDQpAQCAtNTU4LDEzICs1NzAsMTMgQEANCiAgICAgeyBMRU5f
U1RSX1BBSVIgKCIzNiIpIH0sCQkvKiBsbjogTGluZSBudW1iZXIgKi8NCiAgIH07DQoNCi1z
dGF0aWMgY29uc3QgY2hhciAqY29uc3QgaW5kaWNhdG9yX25hbWVbXSA9DQorY29uc3QgY2hh
ciAqY29uc3QgaW5kaWNhdG9yX25hbWVbOV0gPQ0KICAgew0KICAgICAibGMiLCAicmMiLCAi
ZWMiLCAicnMiLCAiaGQiLCAiYWQiLCAiZGUiLCAibG4iLCBOVUxMDQogICB9Ow0KIEFSR01B
VENIX1ZFUklGWSAoaW5kaWNhdG9yX25hbWUsIGNvbG9yX2luZGljYXRvcik7DQoNCi1zdGF0
aWMgY2hhciBjb25zdCAqY29sb3JfcGFsZXR0ZTsNCitjaGFyIGNvbnN0ICpjb2xvcl9wYWxl
dHRlOw0KDQogdm9pZA0KIHNldF9jb2xvcl9wYWxldHRlIChjaGFyIGNvbnN0ICpwYWxldHRl
KQ0KQEAgLTcxNCw5ICs3MjYsMTIgQEANCg0KICAgY29sb3JzX2VuYWJsZWQgPSAoY29sb3Jz
X3N0eWxlID09IEFMV0FZUw0KICAgICAgICAgICAgICAgICAgICAgfHwgKGNvbG9yc19zdHls
ZSA9PSBBVVRPICYmIG91dHB1dF9pc190dHkpKTsNCi0NCi0gIGlmIChjb2xvcnNfZW5hYmxl
ZCkNCisgIGlmIChjb2xvcnNfZW5hYmxlZCkgew0KICAgICBwYXJzZV9kaWZmX2NvbG9yICgp
Ow0KKyNpZmRlZiBXSU4zMg0KKyAgICAgaW5pdF93aW5jb24oKTsNCisjZW5kaWYNCisgIH0N
Cg0KICAgaWYgKG91dHB1dF9pc190dHkpDQogICAgIGluc3RhbGxfc2lnbmFsX2hhbmRsZXJz
ICgpOw0KQEAgLTEzNDEsNyArMTM1Niw0MCBAQA0KIHN0YXRpYyB2b2lkDQogcHV0X2luZGlj
YXRvciAoY29uc3Qgc3RydWN0IGJpbl9zdHIgKmluZCkNCiB7DQorI2lmZGVmIFdJTjMyDQor
I2RlZmluZSBJTkRfVE9fQUREUih4KSAgKChjb25zdCBjaGFyKilpbmQgPT0gKGNvbnN0IGNo
YXIqKSZjb2xvcl9pbmRpY2F0b3JbeF0pDQorDQorICBpZiAoSU5EX1RPX0FERFIoQ19MRUZU
KSB8fCBJTkRfVE9fQUREUihDX1JJR0hUKSkNCisgICAgIHJldHVybjsNCisNCisgIGlmIChJ
TkRfVE9fQUREUihDX1JFU0VUKSB8fCBpbnRlcnJ1cHRfc2lnbmFsKQ0KKyAgew0KKyAgICBm
Zmx1c2ggKG91dGZpbGUpOw0KKyAgICBzZXRfY29sb3IgKC0xKTsNCisgIH0NCisgIGVsc2Ug
aWYgKElORF9UT19BRERSKENfSEVBREVSKSkNCisgIHsNCisgICAgZmZsdXNoIChvdXRmaWxl
KTsNCisgICAgc2V0X2NvbG9yIChDX0hFQURFUik7DQorICB9DQorICBlbHNlIGlmIChJTkRf
VE9fQUREUihDX0xJTkUpKQ0KKyAgew0KKyAgICBmZmx1c2ggKG91dGZpbGUpOw0KKyAgICBz
ZXRfY29sb3IgKENfTElORSk7DQorICB9DQorICBlbHNlIGlmIChJTkRfVE9fQUREUihDX0FE
RCkpDQorICB7DQorICAgIGZmbHVzaCAob3V0ZmlsZSk7DQorICAgIHNldF9jb2xvciAoQ19B
REQpOw0KKyAgfQ0KKyAgZWxzZSBpZiAoSU5EX1RPX0FERFIoQ19ERUxFVEUpKQ0KKyAgew0K
KyAgICBmZmx1c2ggKG91dGZpbGUpOw0KKyAgICBzZXRfY29sb3IgKENfREVMRVRFKTsNCisg
IH0NCisjZWxzZQ0KICAgZndyaXRlIChpbmQtPnN0cmluZywgaW5kLT5sZW4sIDEsIG91dGZp
bGUpOw0KKyNlbmRpZg0KIH0NCg0KIHN0YXRpYyBlbnVtIGNvbG9yX2NvbnRleHQgbGFzdF9j
b250ZXh0ID0gUkVTRVRfQ09OVEVYVDsNCg==
--------------090302000907010504080707--




From MAILER-DAEMON Wed Feb 10 11:47:12 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1aTXv6-0001I9-Ol
	for mharc-bug-diffutils@gnu.org; Wed, 10 Feb 2016 11:47:12 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58329)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aTXuz-0001H6-HR
	for bug-diffutils@gnu.org; Wed, 10 Feb 2016 11:47:11 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aTXuw-0007XM-AA
	for bug-diffutils@gnu.org; Wed, 10 Feb 2016 11:47:05 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:54286)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aTXuw-0007XI-6X
	for bug-diffutils@gnu.org; Wed, 10 Feb 2016 11:47:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aTXuw-0004D0-1r
	for bug-diffutils@gnu.org; Wed, 10 Feb 2016 11:47:02 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Giuseppe Scrivano <gscrivano@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Wed, 10 Feb 2016 16:47:02 +0000
Resent-Message-ID: <handler.22067.B.145512277214425@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 22067
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: Gisle Vanem <gvanem@yahoo.no>
X-Debbugs-Original-Cc: "bug-diffutils@gnu.org" <bug-diffutils@gnu.org>
Received: via spool by submit@debbugs.gnu.org id=B.145512277214425
	(code B ref -1); Wed, 10 Feb 2016 16:47:02 +0000
Received: (at submit) by debbugs.gnu.org; 10 Feb 2016 16:46:12 +0000
Received: from localhost ([127.0.0.1]:35194 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1aTXu8-0003kH-5v
	for submit@debbugs.gnu.org; Wed, 10 Feb 2016 11:46:12 -0500
Received: from eggs.gnu.org ([208.118.235.92]:38683)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <gscrivano@gnu.org>) id 1aTXu7-0003dp-87
	for submit@debbugs.gnu.org; Wed, 10 Feb 2016 11:46:11 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1aTXu1-0007A9-9H
	for submit@debbugs.gnu.org; Wed, 10 Feb 2016 11:46:06 -0500
Received: from lists.gnu.org ([2001:4830:134:3::11]:58932)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1aTXu1-0007A3-6a
	for submit@debbugs.gnu.org; Wed, 10 Feb 2016 11:46:05 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57876)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1aTXu0-0000jj-Dc
	for bug-diffutils@gnu.org; Wed, 10 Feb 2016 11:46:05 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1aTXtw-00077w-EY
	for bug-diffutils@gnu.org; Wed, 10 Feb 2016 11:46:04 -0500
Received: from mx1.redhat.com ([209.132.183.28]:46651)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>)
	id 1aTXtw-00077e-3J; Wed, 10 Feb 2016 11:46:00 -0500
Received: from int-mx10.intmail.prod.int.phx2.redhat.com
	(int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
	by mx1.redhat.com (Postfix) with ESMTPS id 9976A80511;
	Wed, 10 Feb 2016 16:45:59 +0000 (UTC)
Received: from foo.bar.baz (vpn1-7-183.ams2.redhat.com [10.36.7.183])
	by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP
	id u1AGjuTp005382
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256
	verify=NO); Wed, 10 Feb 2016 11:45:58 -0500
From: Giuseppe Scrivano <gscrivano@gnu.org>
References: <565D6EF4.20903@yahoo.no> <87oac3peqc.fsf@foo.bar.baz>
	<56B86F8C.2010102@yahoo.no> <87zivb74c6.fsf@foo.bar.baz>
	<56B89827.5090909@yahoo.no>
Date: Wed, 10 Feb 2016 17:45:56 +0100
In-Reply-To: <56B89827.5090909@yahoo.no> (Gisle Vanem's message of "Mon, 8 Feb
	2016 14:29:11 +0100")
Message-ID: <8737t0ike3.fsf@foo.bar.baz>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Cc: 22067@debbugs.gnu.org
Subject: [bug-diffutils] bug#22067: bug#22067: bug#20062: bug#20062: [PATCH]
	diff: add support for --color
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Feb 2016 16:47:11 -0000

Gisle Vanem <gvanem@yahoo.no> writes:

> Giuseppe Scrivano wrote:
>
>> thanks for your patches.  Is it fine for you if we keep bug-diffutils in
>> the loop?
>
> Sure. I forgot it was in the CC-list.
> Attached again; wincolor.c + diff-1.txt.
> Excused my diff format; I'm a "git n00b". Hope you figure it out.

cannot talk for the diff maintainers, but personally I would split it
two patches: one that fixes the build on Windows, I would not care to
disable them as in any case the user specifies when to use them or not;
and another patch that adds the support for colors on Windows.

In this way the first one could be applied immediately and there is more
time to review the second one which adds support for colors on Windows.

Anyway, let's wait for the maintainers' opinion about it.  My previous
patch is also waiting to be applied.

Regards,
Giuseppe




From MAILER-DAEMON Wed Feb 10 13:43:08 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1aTZjI-0000nC-6Q
	for mharc-bug-diffutils@gnu.org; Wed, 10 Feb 2016 13:43:08 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:39300)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aTZjF-0000jc-Nu
	for bug-diffutils@gnu.org; Wed, 10 Feb 2016 13:43:06 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aTZjC-00063q-GN
	for bug-diffutils@gnu.org; Wed, 10 Feb 2016 13:43:05 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:54350)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aTZjC-00063k-D1
	for bug-diffutils@gnu.org; Wed, 10 Feb 2016 13:43:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aTZjC-0007AP-8K
	for bug-diffutils@gnu.org; Wed, 10 Feb 2016 13:43:02 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Jim Meyering <jim@meyering.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Wed, 10 Feb 2016 18:43:02 +0000
Resent-Message-ID: <handler.22067.B22067.145512972627462@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 22067
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: Giuseppe Scrivano <gscrivano@gnu.org>
Received: via spool by 22067-submit@debbugs.gnu.org id=B22067.145512972627462
	(code B ref 22067); Wed, 10 Feb 2016 18:43:02 +0000
Received: (at 22067) by debbugs.gnu.org; 10 Feb 2016 18:42:06 +0000
Received: from localhost ([127.0.0.1]:35247 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1aTZiI-00078r-CP
	for submit@debbugs.gnu.org; Wed, 10 Feb 2016 13:42:06 -0500
Received: from mail-ob0-f177.google.com ([209.85.214.177]:35304)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <meyering@gmail.com>) id 1aTZiG-00078O-P6
	for 22067@debbugs.gnu.org; Wed, 10 Feb 2016 13:42:05 -0500
Received: by mail-ob0-f177.google.com with SMTP id xk3so40420783obc.2
	for <22067@debbugs.gnu.org>; Wed, 10 Feb 2016 10:42:04 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; 
	h=mime-version:sender:in-reply-to:references:from:date:message-id
	:subject:to:cc:content-type;
	bh=CVOg1pQ83zU42sXGcYrKy9lWf5BbGs80HtUqRdJYB2I=;
	b=I7EKh97udU25v7ts4beB58t20CQzqRms5CdvtzXJ4ZIBrN8Jdj27ZwFInmfiqVgSSE
	rnJ5MbcYxp4r3a0Qqaxw/Fxn6mFM7NMMi8RuUszK1USL1BbRyjYGdSOwDgzpIAeFETcL
	BCtXYvnuoJVq1YnaiMdMdnt1SWRZV0BLmTIgf1zRQeZOGk6muhkqSsVAgjHyjziTXRKo
	ZNwZz0z5dEfkurbOnNAWOTX71xhqwRobCPDJEcQmnucmlvGfhmyO7RWDhIFI15KBQPTn
	En7wxA2sj+xW5jBMqVIzIRgxBX404KzmKDuz+lHpYnzXpYspWFCH7obc7eTOykjozgy7
	tKNA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
	:date:message-id:subject:to:cc:content-type;
	bh=CVOg1pQ83zU42sXGcYrKy9lWf5BbGs80HtUqRdJYB2I=;
	b=KOT7qn6shNAalYaXaAQapJBxaYle4PmUXtNXOxBIAhseZI7r4hD6KAzrs61L5Z+T9t
	NLtBLhiicLD49xiVPaAM9WHjJK/kwizHbSbLzbgvRFZditbGT9LIgD9ZHSdEhXrdzYzs
	mtteixObSATE8oo/ZBuCUztFcCr1eApkunTtuQGLGmUOierOn37k2Rwf+Mhw9dYjcOz+
	5w1jO3VKl+RFn8l2Qk00AMIZ4aLJvnWk9HSUpCjRqRN/qZVPJ5RquzwsQu/W7YFF40fB
	p7DoWan5VBiiNkeEME8zxUX/5MO/okL+4ioXogjvEc7KI7EDb2KtQYDrLIO4VVt6iTXu
	Ms5Q==
X-Gm-Message-State: AG10YOQ+Qs8zcm/zBPE7RVNd0iJlHnXplXH1CnJxGznank2qp6C+SiGFrykE+nRIs19Uw/D/XRAfDe2EbPBOhg==
X-Received: by 10.60.147.137 with SMTP id tk9mr40854997oeb.45.1455129719244;
	Wed, 10 Feb 2016 10:41:59 -0800 (PST)
MIME-Version: 1.0
Received: by 10.202.64.134 with HTTP; Wed, 10 Feb 2016 10:41:38 -0800 (PST)
In-Reply-To: <8737t0ike3.fsf@foo.bar.baz>
References: <565D6EF4.20903@yahoo.no> <87oac3peqc.fsf@foo.bar.baz>
	<56B86F8C.2010102@yahoo.no> <87zivb74c6.fsf@foo.bar.baz>
	<56B89827.5090909@yahoo.no> <8737t0ike3.fsf@foo.bar.baz>
From: Jim Meyering <jim@meyering.net>
Date: Wed, 10 Feb 2016 10:41:38 -0800
X-Google-Sender-Auth: bMa729hhufqHQrGwZ4qsQPFglBY
Message-ID: <CA+8g5KETyRKno98H18d_nLeO3SdywDGgXdfUBm5VF96hSxoxCw@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Cc: 22067@debbugs.gnu.org
Subject: [bug-diffutils] bug#22067: bug#22067: bug#22067: bug#20062:
	bug#20062: [PATCH] diff: add support for --color
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Feb 2016 18:43:07 -0000

On Wed, Feb 10, 2016 at 8:45 AM, Giuseppe Scrivano <gscrivano@gnu.org> wrote:
> Gisle Vanem <gvanem@yahoo.no> writes:
>
>> Giuseppe Scrivano wrote:
>>
>>> thanks for your patches.  Is it fine for you if we keep bug-diffutils in
>>> the loop?
>>
>> Sure. I forgot it was in the CC-list.
>> Attached again; wincolor.c + diff-1.txt.
>> Excused my diff format; I'm a "git n00b". Hope you figure it out.
>
> cannot talk for the diff maintainers, but personally I would split it
> two patches: one that fixes the build on Windows, I would not care to
> disable them as in any case the user specifies when to use them or not;
> and another patch that adds the support for colors on Windows.
>
> In this way the first one could be applied immediately and there is more
> time to review the second one which adds support for colors on Windows.
>
> Anyway, let's wait for the maintainers' opinion about it.  My previous
> patch is also waiting to be applied.

Hi Giuseppe,
The only thing missing from your infloop-fixing patch is an
addition to the regression test suite. Can you contrive an
example that induces the infinite recursion? It's not an
absolute requirement in this case, but would be nice...

Gisle, thanks for the patches. Giuseppe is right: we
would much prefer to keep patches as small as possible,
with separable changes in separate commits, so if you
can adjust that would be great.




From MAILER-DAEMON Thu Feb 11 07:44:08 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1aTqbQ-0004v4-LC
	for mharc-bug-diffutils@gnu.org; Thu, 11 Feb 2016 07:44:08 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36606)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aTqbO-0004uo-Hj
	for bug-diffutils@gnu.org; Thu, 11 Feb 2016 07:44:07 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aTqbK-0003zG-F4
	for bug-diffutils@gnu.org; Thu, 11 Feb 2016 07:44:06 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:54830)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aTqbK-0003z4-BN
	for bug-diffutils@gnu.org; Thu, 11 Feb 2016 07:44:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aTqbK-0005Yn-1g
	for bug-diffutils@gnu.org; Thu, 11 Feb 2016 07:44:02 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Giuseppe Scrivano <gscrivano@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Thu, 11 Feb 2016 12:44:02 +0000
Resent-Message-ID: <handler.22067.B22067.145519461221325@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 22067
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: Jim Meyering <jim@meyering.net>
Received: via spool by 22067-submit@debbugs.gnu.org id=B22067.145519461221325
	(code B ref 22067); Thu, 11 Feb 2016 12:44:02 +0000
Received: (at 22067) by debbugs.gnu.org; 11 Feb 2016 12:43:32 +0000
Received: from localhost ([127.0.0.1]:35738 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1aTqap-0005Xt-Pl
	for submit@debbugs.gnu.org; Thu, 11 Feb 2016 07:43:31 -0500
Received: from mx1.redhat.com ([209.132.183.28]:43327)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <gscrivano@gnu.org>) id 1aTqao-0005Xj-09
	for 22067@debbugs.gnu.org; Thu, 11 Feb 2016 07:43:30 -0500
Received: from int-mx11.intmail.prod.int.phx2.redhat.com
	(int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24])
	by mx1.redhat.com (Postfix) with ESMTPS id C74428E6EB;
	Thu, 11 Feb 2016 12:43:27 +0000 (UTC)
Received: from foo.bar.baz (vpn1-6-206.ams2.redhat.com [10.36.6.206])
	by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP
	id u1BChNDc012359
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256
	verify=NO); Thu, 11 Feb 2016 07:43:24 -0500
From: Giuseppe Scrivano <gscrivano@gnu.org>
References: <565D6EF4.20903@yahoo.no> <87oac3peqc.fsf@foo.bar.baz>
	<56B86F8C.2010102@yahoo.no> <87zivb74c6.fsf@foo.bar.baz>
	<56B89827.5090909@yahoo.no> <8737t0ike3.fsf@foo.bar.baz>
	<CA+8g5KETyRKno98H18d_nLeO3SdywDGgXdfUBm5VF96hSxoxCw@mail.gmail.com>
Date: Thu, 11 Feb 2016 13:43:22 +0100
In-Reply-To: <CA+8g5KETyRKno98H18d_nLeO3SdywDGgXdfUBm5VF96hSxoxCw@mail.gmail.com>
	(Jim Meyering's message of "Wed, 10 Feb 2016 10:41:38 -0800")
Message-ID: <871t8jbeol.fsf@foo.bar.baz>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Cc: 22067@debbugs.gnu.org
Subject: [bug-diffutils] bug#22067: bug#22067: bug#22067: bug#20062:
	bug#20062: [PATCH] diff: add support for --color
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Feb 2016 12:44:07 -0000

Jim Meyering <jim@meyering.net> writes:

> On Wed, Feb 10, 2016 at 8:45 AM, Giuseppe Scrivano <gscrivano@gnu.org> wrote:
>> Gisle Vanem <gvanem@yahoo.no> writes:
>>
>>> Giuseppe Scrivano wrote:
>>>
>>>> thanks for your patches.  Is it fine for you if we keep bug-diffutils in
>>>> the loop?
>>>
>>> Sure. I forgot it was in the CC-list.
>>> Attached again; wincolor.c + diff-1.txt.
>>> Excused my diff format; I'm a "git n00b". Hope you figure it out.
>>
>> cannot talk for the diff maintainers, but personally I would split it
>> two patches: one that fixes the build on Windows, I would not care to
>> disable them as in any case the user specifies when to use them or not;
>> and another patch that adds the support for colors on Windows.
>>
>> In this way the first one could be applied immediately and there is more
>> time to review the second one which adds support for colors on Windows.
>>
>> Anyway, let's wait for the maintainers' opinion about it.  My previous
>> patch is also waiting to be applied.
>
> Hi Giuseppe,
> The only thing missing from your infloop-fixing patch is an
> addition to the regression test suite. Can you contrive an
> example that induces the infinite recursion? It's not an
> absolute requirement in this case, but would be nice...

I can write one, but it will need a change in the code as well, since
the signals are installed only when outputting to a tty:

diff --git a/src/util.c b/src/util.c
index bf9ed97..be7d436 100644
--- a/src/util.c
+++ b/src/util.c
@@ -718,7 +718,7 @@ check_color_output (bool is_pipe)
   if (colors_enabled)
     parse_diff_color ();
 
-  if (output_is_tty)
+  if (output_is_tty || getenv ("DIFF_INSTALL_SIGNALS"))
     install_signal_handlers ();
 }

Is that fine?

Regards,
Giuseppe




From MAILER-DAEMON Thu Feb 11 14:15:09 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1aTwhp-0005kO-6u
	for mharc-bug-diffutils@gnu.org; Thu, 11 Feb 2016 14:15:09 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43653)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aTwhm-0005fi-L5
	for bug-diffutils@gnu.org; Thu, 11 Feb 2016 14:15:07 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aTwhi-0004Ht-KA
	for bug-diffutils@gnu.org; Thu, 11 Feb 2016 14:15:06 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:56016)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aTwhi-0004Hl-Ge
	for bug-diffutils@gnu.org; Thu, 11 Feb 2016 14:15:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aTwhi-0006qy-AD
	for bug-diffutils@gnu.org; Thu, 11 Feb 2016 14:15:02 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Jim Meyering <jim@meyering.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Thu, 11 Feb 2016 19:15:02 +0000
Resent-Message-ID: <handler.22067.B22067.145521809026310@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 22067
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: Giuseppe Scrivano <gscrivano@gnu.org>
Received: via spool by 22067-submit@debbugs.gnu.org id=B22067.145521809026310
	(code B ref 22067); Thu, 11 Feb 2016 19:15:02 +0000
Received: (at 22067) by debbugs.gnu.org; 11 Feb 2016 19:14:50 +0000
Received: from localhost ([127.0.0.1]:36924 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1aTwhW-0006qI-Ag
	for submit@debbugs.gnu.org; Thu, 11 Feb 2016 14:14:50 -0500
Received: from mail-ob0-f180.google.com ([209.85.214.180]:35889)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <meyering@gmail.com>) id 1aTwhU-0006q4-Q9
	for 22067@debbugs.gnu.org; Thu, 11 Feb 2016 14:14:49 -0500
Received: by mail-ob0-f180.google.com with SMTP id ba1so87967251obb.3
	for <22067@debbugs.gnu.org>; Thu, 11 Feb 2016 11:14:48 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; 
	h=mime-version:sender:in-reply-to:references:from:date:message-id
	:subject:to:cc:content-type;
	bh=xfYBMZm80KY0OwEJCYWDhE6yeFmXtfs/1YmiMBgKXmw=;
	b=jUN4h56Yb7+q5UPAxb9BoCF4A00EoURmAk0lIvMiy2JfDW2gfOIYgXgCKj82zBahgH
	lsxBXWOXOXU8EVAqZD0Dz3JzfZXjSxXMvRdU+p2wJbG9oSDXMKKJM5/HMcW4pSNhoSp/
	IAx3LH0CmNlIc/rncneePbnmmDtUcOiIWQv6cxg7nrVNDt6/HSefUf3UZllXqEYxqsZP
	36bW2R1MXcj9v5Lb4MS7l+g8d8AQ/5GalH0crjBH1ciVZweelT5HnAyZtS/t/C7yidms
	1zQrHo5qTP3L7Bmz8cs847cmi2rEfHqqFIhvVTj1KKKSY9vnGKJYwNxLK9i5NCFGIxws
	/9cg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
	:date:message-id:subject:to:cc:content-type;
	bh=xfYBMZm80KY0OwEJCYWDhE6yeFmXtfs/1YmiMBgKXmw=;
	b=lsgdCN4xrEzQf2NYp+Gm66umLR4P48DXz8rRm39wMB8RTp5RZTRMtFuQTI49tGoP+a
	s6MJMRdtZSkGFgY2WHrkpJEkjjuHDdiBJgWWPTkyr65VD28ynd+zY/Tomd3t/H0WpXjJ
	taZUfuKe69pUxRlKryoVyQEYJbpQSFQVE3FuROttWSi9Lmv8X2kEPfjsNxD5tYWG/YGf
	J8r6Se1O/nkgpA3UGybAeeRWLBi1TV2WbVuiDr02fbPfGzDSYNWo4lmo408499eYA4lj
	aEjI00erEpIKtsj9iXmD32f+Tb0cQWujMtYFD83DBUhIryuxfpNz6tu6DL7vbnnzGhvF
	F6UA==
X-Gm-Message-State: AG10YOSSToimRURVMwfKqzbpganGBVGUJwQ4U20dmX+2Fz7MsFLWmb0nxSjIvr7pMBOJlN30JrqFoRmFC/LExg==
X-Received: by 10.182.24.104 with SMTP id t8mr5228329obf.1.1455218083088; Thu,
	11 Feb 2016 11:14:43 -0800 (PST)
MIME-Version: 1.0
Received: by 10.202.64.134 with HTTP; Thu, 11 Feb 2016 11:14:23 -0800 (PST)
In-Reply-To: <871t8jbeol.fsf@foo.bar.baz>
References: <565D6EF4.20903@yahoo.no> <87oac3peqc.fsf@foo.bar.baz>
	<56B86F8C.2010102@yahoo.no> <87zivb74c6.fsf@foo.bar.baz>
	<56B89827.5090909@yahoo.no> <8737t0ike3.fsf@foo.bar.baz>
	<CA+8g5KETyRKno98H18d_nLeO3SdywDGgXdfUBm5VF96hSxoxCw@mail.gmail.com>
	<871t8jbeol.fsf@foo.bar.baz>
From: Jim Meyering <jim@meyering.net>
Date: Thu, 11 Feb 2016 11:14:23 -0800
X-Google-Sender-Auth: oLZTneBNNnKTmWYTx_RQgw3Fm2Q
Message-ID: <CA+8g5KESKFNbniaRE6RnjkXzJQ7SAVMnrgURKLy1jOoO74ug2A@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Cc: 22067@debbugs.gnu.org
Subject: [bug-diffutils] bug#22067: bug#22067: bug#22067: bug#20062:
	bug#20062: [PATCH] diff: add support for --color
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Feb 2016 19:15:07 -0000

On Thu, Feb 11, 2016 at 4:43 AM, Giuseppe Scrivano <gscrivano@gnu.org> wrote:
> Jim Meyering <jim@meyering.net> writes:
>
>> On Wed, Feb 10, 2016 at 8:45 AM, Giuseppe Scrivano <gscrivano@gnu.org> wrote:
>>> Gisle Vanem <gvanem@yahoo.no> writes:
>>>
>>>> Giuseppe Scrivano wrote:
>>>>
>>>>> thanks for your patches.  Is it fine for you if we keep bug-diffutils in
>>>>> the loop?
>>>>
>>>> Sure. I forgot it was in the CC-list.
>>>> Attached again; wincolor.c + diff-1.txt.
>>>> Excused my diff format; I'm a "git n00b". Hope you figure it out.
>>>
>>> cannot talk for the diff maintainers, but personally I would split it
>>> two patches: one that fixes the build on Windows, I would not care to
>>> disable them as in any case the user specifies when to use them or not;
>>> and another patch that adds the support for colors on Windows.
>>>
>>> In this way the first one could be applied immediately and there is more
>>> time to review the second one which adds support for colors on Windows.
>>>
>>> Anyway, let's wait for the maintainers' opinion about it.  My previous
>>> patch is also waiting to be applied.
>>
>> Hi Giuseppe,
>> The only thing missing from your infloop-fixing patch is an
>> addition to the regression test suite. Can you contrive an
>> example that induces the infinite recursion? It's not an
>> absolute requirement in this case, but would be nice...
>
> I can write one,

Great! Thank you.

> but it will need a change in the code as well, since
> the signals are installed only when outputting to a tty:
...
> -  if (output_is_tty)
> +  if (output_is_tty || getenv ("DIFF_INSTALL_SIGNALS"))
>      install_signal_handlers ();

However, we try very hard to avoid making tools depend on
environment variable settings more than they already do,
so how about a hidden, three-hyphen option, say,
---presume-output-tty, analogous to rm's ---presume-input-tty?




From MAILER-DAEMON Fri Feb 12 10:15:10 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1aUFR8-0007q9-FJ
	for mharc-bug-diffutils@gnu.org; Fri, 12 Feb 2016 10:15:10 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46553)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aUFR4-0007k8-Da
	for bug-diffutils@gnu.org; Fri, 12 Feb 2016 10:15:07 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aUFQz-0002up-Vk
	for bug-diffutils@gnu.org; Fri, 12 Feb 2016 10:15:06 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:57194)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aUFQz-0002uh-Ll
	for bug-diffutils@gnu.org; Fri, 12 Feb 2016 10:15:01 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aUFQz-0002U6-Ho
	for bug-diffutils@gnu.org; Fri, 12 Feb 2016 10:15:01 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Giuseppe Scrivano <gscrivano@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Fri, 12 Feb 2016 15:15:01 +0000
Resent-Message-ID: <handler.22067.B22067.14552900559486@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 22067
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: Jim Meyering <jim@meyering.net>
Received: via spool by 22067-submit@debbugs.gnu.org id=B22067.14552900559486
	(code B ref 22067); Fri, 12 Feb 2016 15:15:01 +0000
Received: (at 22067) by debbugs.gnu.org; 12 Feb 2016 15:14:15 +0000
Received: from localhost ([127.0.0.1]:38102 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1aUFQF-0002Sr-9l
	for submit@debbugs.gnu.org; Fri, 12 Feb 2016 10:14:15 -0500
Received: from mx1.redhat.com ([209.132.183.28]:42778)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <gscrivano@gnu.org>) id 1aUFQC-0002SW-RM
	for 22067@debbugs.gnu.org; Fri, 12 Feb 2016 10:14:13 -0500
Received: from int-mx13.intmail.prod.int.phx2.redhat.com
	(int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26])
	by mx1.redhat.com (Postfix) with ESMTPS id 6B83BBACDB;
	Fri, 12 Feb 2016 15:14:09 +0000 (UTC)
Received: from foo.bar.baz (vpn1-6-247.ams2.redhat.com [10.36.6.247])
	by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP
	id u1CFE5Y5021987
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256
	verify=NO); Fri, 12 Feb 2016 10:14:07 -0500
From: Giuseppe Scrivano <gscrivano@gnu.org>
References: <565D6EF4.20903@yahoo.no> <87oac3peqc.fsf@foo.bar.baz>
	<56B86F8C.2010102@yahoo.no> <87zivb74c6.fsf@foo.bar.baz>
	<56B89827.5090909@yahoo.no> <8737t0ike3.fsf@foo.bar.baz>
	<CA+8g5KETyRKno98H18d_nLeO3SdywDGgXdfUBm5VF96hSxoxCw@mail.gmail.com>
	<871t8jbeol.fsf@foo.bar.baz>
	<CA+8g5KESKFNbniaRE6RnjkXzJQ7SAVMnrgURKLy1jOoO74ug2A@mail.gmail.com>
Date: Fri, 12 Feb 2016 16:14:04 +0100
In-Reply-To: <CA+8g5KESKFNbniaRE6RnjkXzJQ7SAVMnrgURKLy1jOoO74ug2A@mail.gmail.com>
	(Jim Meyering's message of "Thu, 11 Feb 2016 11:14:23 -0800")
Message-ID: <87lh6q55c3.fsf@foo.bar.baz>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Cc: 22067@debbugs.gnu.org
Subject: [bug-diffutils] bug#22067: bug#22067: bug#22067: bug#20062:
	bug#20062: [PATCH] diff: add support for --color
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Feb 2016 15:15:08 -0000

--=-=-=
Content-Type: text/plain

Jim Meyering <jim@meyering.net> writes:

> Great! Thank you.
>
>> but it will need a change in the code as well, since
>> the signals are installed only when outputting to a tty:
> ...
>> -  if (output_is_tty)
>> +  if (output_is_tty || getenv ("DIFF_INSTALL_SIGNALS"))
>>      install_signal_handlers ();
>
> However, we try very hard to avoid making tools depend on
> environment variable settings more than they already do,
> so how about a hidden, three-hyphen option, say,
> ---presume-output-tty, analogous to rm's ---presume-input-tty?

I have added a test that uses the new option ---presume-output-tty.


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline;
 filename=0001-Fix-an-infinite-recursion-with-color.patch

>From 4aea918d31454fdeaada5e2453bea3dfc2e25f8b Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 1 Feb 2016 09:58:52 +0100
Subject: [PATCH] Fix an infinite recursion with --color

* src/diff.h: New extern variable `presume_output_tty'.
* src/diff.c: New enum PRESUME_OUTPUT_TTY_OPTION.
(group_format_option): Add '-presume-output-tty'.
(main): Handle PRESUME_OUTPUT_TTY_OPTION.
* src/util.c: New variable `presume_output_tty'.
(check_color_output): Handle presume_output_tty.
(set_color_context): Call process_signals only when color_context is
not RESET_CONTEXT.
* tests/colors: Check that diff doesn't crash when interrupted
in the middle of a color sequence.

Reported by Gisle Vanem in http://debbugs.gnu.org/22067
---
 src/diff.c   | 9 +++++++++
 src/diff.h   | 2 ++
 src/util.c   | 7 +++++--
 tests/colors | 7 +++++++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/diff.c b/src/diff.c
index 3a566b8..9bc1d96 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -141,6 +141,8 @@ enum
 
   COLOR_OPTION,
   COLOR_PALETTE_OPTION,
+
+  PRESUME_OUTPUT_TTY_OPTION,
 };
 
 static char const group_format_option[][sizeof "--unchanged-group-format"] =
@@ -219,6 +221,9 @@ static struct option const longopts[] =
   {"unified", 2, 0, 'U'},
   {"version", 0, 0, 'v'},
   {"width", 1, 0, 'W'},
+
+  /* This is solely for testing.  Do not document.  */
+  {"-presume-output-tty", no_argument, NULL, PRESUME_OUTPUT_TTY_OPTION},
   {0, 0, 0, 0}
 };
 
@@ -641,6 +646,10 @@ main (int argc, char **argv)
 	  set_color_palette (optarg);
 	  break;
 
+        case PRESUME_OUTPUT_TTY_OPTION:
+          presume_output_tty = true;
+          break;
+
 	default:
 	  try_help (NULL, NULL);
 	}
diff --git a/src/diff.h b/src/diff.h
index e4c138c..0983e7c 100644
--- a/src/diff.h
+++ b/src/diff.h
@@ -417,5 +417,7 @@ enum color_context
   LINE_NUMBER_CONTEXT,
 };
 
+XTERN bool presume_output_tty;
+
 extern void set_color_context (enum color_context color_context);
 extern void set_color_palette (char const *palette);
diff --git a/src/util.c b/src/util.c
index bf9ed97..d7b8925 100644
--- a/src/util.c
+++ b/src/util.c
@@ -44,6 +44,8 @@
 
 char const pr_program[] = PR_PROGRAM;
 
+bool presume_output_tty;
+
 /* Queue up one-line messages to be printed at the end,
    when -l is specified.  Each message is recorded with a 'struct msg'.  */
 
@@ -710,7 +712,7 @@ check_color_output (bool is_pipe)
   if (! outfile || colors_style == NEVER)
     return;
 
-  output_is_tty = !is_pipe && isatty (fileno (outfile));
+  output_is_tty = presume_output_tty || (!is_pipe && isatty (fileno (outfile)));
 
   colors_enabled = (colors_style == ALWAYS
                     || (colors_style == AUTO && output_is_tty));
@@ -1349,7 +1351,8 @@ static enum color_context last_context = RESET_CONTEXT;
 void
 set_color_context (enum color_context color_context)
 {
-  process_signals ();
+  if (color_context != RESET_CONTEXT)
+    process_signals ();
   if (colors_enabled && last_context != color_context)
     {
       put_indicator (&color_indicator[C_LEFT]);
diff --git a/tests/colors b/tests/colors
index facfd8d..df395ec 100755
--- a/tests/colors
+++ b/tests/colors
@@ -116,4 +116,11 @@ test $? = 1 || fail=1
 gen_exp_u > exp || framework_failure_
 compare exp out || fail=1
 
+mkfifo fifo
+printf '%*s' 1000000 | tr ' ' a > a
+printf '%*s' 1000000 | tr ' ' b > b
+head -c 10 < fifo > /dev/null &
+diff --color=always ---presume-output-tty a b > fifo
+test $? = 141 || fail=1
+
 Exit $fail
-- 
2.5.0


--=-=-=
Content-Type: text/plain


Thanks,
Giuseppe

--=-=-=--




From MAILER-DAEMON Mon Feb 15 12:57:11 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1aVNOZ-0002Y0-Ae
	for mharc-bug-diffutils@gnu.org; Mon, 15 Feb 2016 12:57:11 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40081)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aVNOV-0002W1-6v
	for bug-diffutils@gnu.org; Mon, 15 Feb 2016 12:57:09 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aVNOR-00007L-Cv
	for bug-diffutils@gnu.org; Mon, 15 Feb 2016 12:57:07 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:49634)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aVNOR-00007B-9W
	for bug-diffutils@gnu.org; Mon, 15 Feb 2016 12:57:03 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aVNOR-0005iR-4r
	for bug-diffutils@gnu.org; Mon, 15 Feb 2016 12:57:03 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: "afsto" <oq2013@sina.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 15 Feb 2016 17:57:02 +0000
Resent-Message-ID: <handler.22685.B.145555899621900@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 22685
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 22685@debbugs.gnu.org
X-Debbugs-Original-To: "bug-diffutils" <bug-diffutils@gnu.org>
Received: via spool by submit@debbugs.gnu.org id=B.145555899621900
	(code B ref -1); Mon, 15 Feb 2016 17:57:02 +0000
Received: (at submit) by debbugs.gnu.org; 15 Feb 2016 17:56:36 +0000
Received: from localhost ([127.0.0.1]:40405 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1aVNNx-0005h6-Nh
	for submit@debbugs.gnu.org; Mon, 15 Feb 2016 12:56:36 -0500
Received: from eggs.gnu.org ([208.118.235.92]:59356)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <oq2013@sina.com>) id 1aVHrE-0001xO-Qh
	for submit@debbugs.gnu.org; Mon, 15 Feb 2016 07:02:34 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <oq2013@sina.com>) id 1aVHr4-0003ie-Ju
	for submit@debbugs.gnu.org; Mon, 15 Feb 2016 07:02:19 -0500
Received: from lists.gnu.org ([2001:4830:134:3::11]:34277)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <oq2013@sina.com>) id 1aVHr4-0003ia-HJ
	for submit@debbugs.gnu.org; Mon, 15 Feb 2016 07:02:14 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50292)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <oq2013@sina.com>) id 1aVHqy-00089k-U3
	for bug-diffutils@gnu.org; Mon, 15 Feb 2016 07:02:14 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <oq2013@sina.com>) id 1aVHqv-0003hC-7T
	for bug-diffutils@gnu.org; Mon, 15 Feb 2016 07:02:08 -0500
Received: from mail228-171.sinamail.sina.com.cn ([60.28.228.171]:47422
	helo=smtp2911-208.mail.sina.com.cn)
	by eggs.gnu.org with smtp (Exim 4.71)
	(envelope-from <oq2013@sina.com>) id 1aVHqu-0003cI-1C
	for bug-diffutils@gnu.org; Mon, 15 Feb 2016 07:02:05 -0500
Received: from unknown (HELO webmail.sinamail.sina.com.cn)([172.16.201.149])
	by sina.com with SMTP 15 Feb 2016 20:01:50 +0800 (CST)
X-Sender: oq2013@sina.com
X-SMAIL-MID: 96653013003460
Received: by webmail.sinamail.sina.com.cn (Postfix, from userid 496)
	id 9F85970007E; Mon, 15 Feb 2016 20:01:50 +0800 (CST)
Date: Mon, 15 Feb 2016 20:01:50 +0800
Received: from oq2013@sina.com([172.16.228.17]) by m0.mail.sina.com.cn via
	HTTP; Mon, 15 Feb 2016 20:01:50 +0800 (CST)
From: "afsto" <oq2013@sina.com>
MIME-Version: 1.0
X-Priority: 3
X-MessageID: 56c1be2e17683b4
X-Originating-IP: [172.16.201.149]
X-Mailer: Sina WebMail 4.0
Content-Type: multipart/mixed;
	boundary="=-sinamail_mix_e314244f3b635b9c2692cc03ed5fd025"
Message-Id: <20160215120150.9F85970007E@webmail.sinamail.sina.com.cn>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy]
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Mailman-Approved-At: Mon, 15 Feb 2016 12:56:33 -0500
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#22685: FAIL: test-update-copyright.sh
X-BeenThere: bug-diffutils@gnu.org
Reply-To: oq2013@sina.com
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Feb 2016 17:57:09 -0000


--=-sinamail_mix_e314244f3b635b9c2692cc03ed5fd025
Content-Type: multipart/alternative;
	 boundary="=-sinamail_alt_b8cc73c7b2b80fa89fbeb063773387f4"

--=-sinamail_alt_b8cc73c7b2b80fa89fbeb063773387f4
Content-Type: text/plain;
	charset=GBK
Content-Transfer-Encoding: base64
Content-Disposition: inline

SGVsbG8hIEkgYW0gdHJ5aW5nIHRvIGJ1aWxkIG15IGxpbnV4IGZyb20gc2NyYXRjaC4gV2hlbiBJ
IGFtIGNvbXBpbGVkIHRoZSAiZGlmZnV0aWxzLTMuMyIsSSBydW4gIm1ha2UgY2hlY2siLiBJIGdv
dCBhIGZhaWwgISBBcyB0aGUgdGl0bGUgc2hvd3MgIkZBSUw6IHRlc3QtdXBkYXRlLWNvcHlyaWdo
dC5zaCIuIEkgYWxzbyB1cGxvYWQgdGhlIGdudWxpYi10ZXN0cy90ZXN0LXN1aXRlLmxvZyBpbiB0
aGUgYXR0YWNobWVudHMuCg==


--=-sinamail_alt_b8cc73c7b2b80fa89fbeb063773387f4
Content-Type: text/html; charset=GBK
Content-Transfer-Encoding: base64
Content-Disposition: inline

SGVsbG8hIEkgYW0gdHJ5aW5nIHRvIGJ1aWxkIG15IGxpbnV4IGZyb20gc2NyYXRjaC4gV2hlbiBJ
IGFtIGNvbXBpbGVkIHRoZSAiZGlmZnV0aWxzLTMuMyIsSSBydW4gIm1ha2UgY2hlY2siLiBJIGdv
dCBhIGZhaWwgISBBcyB0aGUgdGl0bGUgc2hvd3MgIkZBSUw6IHRlc3QtdXBkYXRlLWNvcHlyaWdo
dC5zaCIuIEkgYWxzbyB1cGxvYWQgdGhlIGdudWxpYi10ZXN0cy90ZXN0LXN1aXRlLmxvZyBpbiB0
aGUgYXR0YWNobWVudHMuPGJyPg==


--=-sinamail_alt_b8cc73c7b2b80fa89fbeb063773387f4--

--=-sinamail_mix_e314244f3b635b9c2692cc03ed5fd025
Content-Type: text/x-log; name="=?GBK?B?dGVzdC1zdWl0ZS5sb2c=?="
Content-Disposition: attachment; filename="=?GBK?B?dGVzdC1zdWl0ZS5sb2c=?="
Content-Transfer-Encoding: base64

PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQogICBH
TlUgZGlmZnV0aWxzIDMuMzogZ251bGliLXRlc3RzL3Rlc3Qtc3VpdGUubG9nCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KCiMgVE9UQUw6IDE0MAoj
IFBBU1M6ICAxMTIKIyBTS0lQOiAgMjcKIyBYRkFJTDogMAojIEZBSUw6ICAxCiMgWFBBU1M6IDAK
IyBFUlJPUjogMAoKLi4gY29udGVudHM6OiA6ZGVwdGg6IDIKClNLSVA6IHRlc3QtYnRvd2MxLnNo
Cj09PT09PT09PT09PT09PT09PT09CgpTa2lwcGluZyB0ZXN0OiBubyB0cmFkaXRpb25hbCBmcmVu
Y2ggbG9jYWxlIGlzIGluc3RhbGxlZAoKU0tJUDogdGVzdC1idG93YzIuc2gKPT09PT09PT09PT09
PT09PT09PT0KClNraXBwaW5nIHRlc3Q6IG5vIGZyZW5jaCBVbmljb2RlIGxvY2FsZSBpcyBpbnN0
YWxsZWQKClNLSVA6IHRlc3QtYy1zdGFjazIuc2gKPT09PT09PT09PT09PT09PT09PT09PQoKY2Fu
bm90IHRlbGwgc3RhY2sgb3ZlcmZsb3cgZnJvbSBjcmFzaDsgY29uc2lkZXIgaW5zdGFsbGluZyBs
aWJzaWdzZWd2CgpTS0lQOiB0ZXN0LW1icnRvd2MxLnNoCj09PT09PT09PT09PT09PT09PT09PT0K
ClNraXBwaW5nIHRlc3Q6IG5vIHRyYWRpdGlvbmFsIGZyZW5jaCBsb2NhbGUgaXMgaW5zdGFsbGVk
CgpTS0lQOiB0ZXN0LW1icnRvd2MyLnNoCj09PT09PT09PT09PT09PT09PT09PT0KClNraXBwaW5n
IHRlc3Q6IG5vIGZyZW5jaCBVbmljb2RlIGxvY2FsZSBpcyBpbnN0YWxsZWQKClNLSVA6IHRlc3Qt
bWJydG93YzMuc2gKPT09PT09PT09PT09PT09PT09PT09PQoKU2tpcHBpbmcgdGVzdDogbm8gdHJh
ZGl0aW9uYWwgamFwYW5lc2UgbG9jYWxlIGlzIGluc3RhbGxlZAoKU0tJUDogdGVzdC1tYnJ0b3dj
NC5zaAo9PT09PT09PT09PT09PT09PT09PT09CgpTa2lwcGluZyB0ZXN0OiBubyB0cmFuc2l0aW9u
YWwgY2hpbmVzZSBsb2NhbGUgaXMgaW5zdGFsbGVkCgpTS0lQOiB0ZXN0LW1icnRvd2MtdzMyLTEu
c2gKPT09PT09PT09PT09PT09PT09PT09PT09PT09CgpTa2lwcGluZyB0ZXN0OiBub3QgYSBuYXRp
dmUgV2luZG93cyBzeXN0ZW0KClNLSVA6IHRlc3QtbWJydG93Yy13MzItMi5zaAo9PT09PT09PT09
PT09PT09PT09PT09PT09PT0KClNraXBwaW5nIHRlc3Q6IG5vdCBhIG5hdGl2ZSBXaW5kb3dzIHN5
c3RlbQoKU0tJUDogdGVzdC1tYnJ0b3djLXczMi0zLnNoCj09PT09PT09PT09PT09PT09PT09PT09
PT09PQoKU2tpcHBpbmcgdGVzdDogbm90IGEgbmF0aXZlIFdpbmRvd3Mgc3lzdGVtCgpTS0lQOiB0
ZXN0LW1icnRvd2MtdzMyLTQuc2gKPT09PT09PT09PT09PT09PT09PT09PT09PT09CgpTa2lwcGlu
ZyB0ZXN0OiBub3QgYSBuYXRpdmUgV2luZG93cyBzeXN0ZW0KClNLSVA6IHRlc3QtbWJydG93Yy13
MzItNS5zaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT0KClNraXBwaW5nIHRlc3Q6IG5vdCBh
IG5hdGl2ZSBXaW5kb3dzIHN5c3RlbQoKU0tJUDogdGVzdC1tYnNjYXNlY21wLnNoCj09PT09PT09
PT09PT09PT09PT09PT09PQoKU2tpcHBpbmcgdGVzdDogbm8gdHVya2lzaCBVbmljb2RlIGxvY2Fs
ZSBpcyBpbnN0YWxsZWQKClNLSVA6IHRlc3QtbWJzaW5pdC5zaAo9PT09PT09PT09PT09PT09PT09
PT0KClNraXBwaW5nIHRlc3Q6IG5vIGZyZW5jaCBVbmljb2RlIGxvY2FsZSBpcyBpbnN0YWxsZWQK
ClNLSVA6IHRlc3QtbWJzcnRvd2NzMS5zaAo9PT09PT09PT09PT09PT09PT09PT09PT0KClNraXBw
aW5nIHRlc3Q6IG5vIHRyYWRpdGlvbmFsIGZyZW5jaCBsb2NhbGUgaXMgaW5zdGFsbGVkCgpTS0lQ
OiB0ZXN0LW1ic3J0b3djczIuc2gKPT09PT09PT09PT09PT09PT09PT09PT09CgpTa2lwcGluZyB0
ZXN0OiBubyBmcmVuY2ggVW5pY29kZSBsb2NhbGUgaXMgaW5zdGFsbGVkCgpTS0lQOiB0ZXN0LW1i
c3J0b3djczMuc2gKPT09PT09PT09PT09PT09PT09PT09PT09CgpTa2lwcGluZyB0ZXN0OiBubyB0
cmFkaXRpb25hbCBqYXBhbmVzZSBsb2NhbGUgaXMgaW5zdGFsbGVkCgpTS0lQOiB0ZXN0LW1ic3J0
b3djczQuc2gKPT09PT09PT09PT09PT09PT09PT09PT09CgpTa2lwcGluZyB0ZXN0OiBubyB0cmFu
c2l0aW9uYWwgY2hpbmVzZSBsb2NhbGUgaXMgaW5zdGFsbGVkCgpTS0lQOiB0ZXN0LW1ic3N0cjIu
c2gKPT09PT09PT09PT09PT09PT09PT09CgpTa2lwcGluZyB0ZXN0OiBubyBmcmVuY2ggVW5pY29k
ZSBsb2NhbGUgaXMgaW5zdGFsbGVkCgpTS0lQOiB0ZXN0LW1ic3N0cjMuc2gKPT09PT09PT09PT09
PT09PT09PT09CgpTa2lwcGluZyB0ZXN0OiBubyBjaGluZXNlIEdCMTgwMzAgbG9jYWxlIGlzIGlu
c3RhbGxlZAoKU0tJUDogdGVzdC1zZXRsb2NhbGUxLnNoCj09PT09PT09PT09PT09PT09PT09PT09
PQoKU2tpcHBpbmcgdGVzdDogbm8gbG9jYWxlIGZvciB0ZXN0aW5nIGlzIGluc3RhbGxlZAoKRkFJ
TDogdGVzdC11cGRhdGUtY29weXJpZ2h0LnNoCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQoKLS0tIC0JMjAxNi0wMi0xNSAxODo1MDowNi4wMjQ2NzU5MzAgKzA4MDAKKysrIHVwZGF0ZS1j
b3B5cmlnaHQudGVzdC1leC1zdGRlcnIJMjAxNi0wMi0xNSAxODo1MDowNi4wMTc0Nzk5MDMgKzA4
MDAKQEAgLTEsMiArMSwxOCBAQAorVW5lc2NhcGVkIGxlZnQgYnJhY2UgaW4gcmVnZXggaXMgZGVw
cmVjYXRlZCwgcGFzc2VkIHRocm91Z2ggaW4gcmVnZXg7IG1hcmtlZCBieSA8LS0gSEVSRSBpbiBt
L1xHKD86KD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcbilbIFx0XHJcZl0qKSg/OlwoW2NDXVwp
fEBjb3B5cmlnaHR7IDwtLSBIRVJFIH18JmNvcHk7KSk/KD86WyBcdFxyXGZdKig/OlsgXHRcclxm
XXxcbilbIFx0XHJcZl0qKSg/Oig/OlxkXGQpP1xkXGQoPzosKD86WyBcdFxyXGZdKig/OlsgXHRc
clxmXXxcbilbIFx0XHJcZl0qKT98LSkpKigoPzpcZFxkKT9cZFxkKSg/OlsgXHRcclxmXSooPzpb
IFx0XHJcZl18XG4pWyBcdFxyXGZdKilGcmVlKD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcbilb
IFx0XHJcZl0qKVNvZnR3YXJlKD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcbilbIFx0XHJcZl0q
KUZvdW5kYXRpb24sKD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcbilbIFx0XHJcZl0qKUluYy4v
IGF0IC9tbnQvbGZzL3NvdXJjZXMvZGlmZnV0aWxzLTMuMy9idWlsZC1hdXgvdXBkYXRlLWNvcHly
aWdodCBsaW5lIDE3NCwgPD4gY2h1bmsgMS4KK1VuZXNjYXBlZCBsZWZ0IGJyYWNlIGluIHJlZ2V4
IGlzIGRlcHJlY2F0ZWQsIHBhc3NlZCB0aHJvdWdoIGluIHJlZ2V4OyBtYXJrZWQgYnkgPC0tIEhF
UkUgaW4gbS8oQ29weXJpZ2h0KD86KD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcbilbIFx0XHJc
Zl0qKSg/OlwoW2NDXVwpfEBjb3B5cmlnaHR7IDwtLSBIRVJFIH18JmNvcHk7KSk/KD86WyBcdFxy
XGZdKig/OlsgXHRcclxmXXxcbilbIFx0XHJcZl0qKSg/Oig/OlxkXGQpP1xkXGQoPzosKD86WyBc
dFxyXGZdKig/OlsgXHRcclxmXXxcbilbIFx0XHJcZl0qKT98LSkpKigoPzpcZFxkKT9cZFxkKSg/
OlsgXHRcclxmXSooPzpbIFx0XHJcZl18XG4pWyBcdFxyXGZdKilGcmVlKD86WyBcdFxyXGZdKig/
OlsgXHRcclxmXXxcbilbIFx0XHJcZl0qKVNvZnR3YXJlKD86WyBcdFxyXGZdKig/OlsgXHRcclxm
XXxcbilbIFx0XHJcZl0qKUZvdW5kYXRpb24sKD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcbilb
IFx0XHJcZl0qKUluYy4pLyBhdCAvbW50L2xmcy9zb3VyY2VzL2RpZmZ1dGlscy0zLjMvYnVpbGQt
YXV4L3VwZGF0ZS1jb3B5cmlnaHQgbGluZSAxODMsIDw+IGNodW5rIDEuCitVbmVzY2FwZWQgbGVm
dCBicmFjZSBpbiByZWdleCBpcyBkZXByZWNhdGVkLCBwYXNzZWQgdGhyb3VnaCBpbiByZWdleDsg
bWFya2VkIGJ5IDwtLSBIRVJFIGluIG0vXEcoPzooPzpbIFx0XHJcZl0qKD86WyBcdFxyXGZdfFxu
XCNcIClbIFx0XHJcZl0qKSg/OlwoW2NDXVwpfEBjb3B5cmlnaHR7IDwtLSBIRVJFIH18JmNvcHk7
KSk/KD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcblwjXCApWyBcdFxyXGZdKikoPzooPzpcZFxk
KT9cZFxkKD86LCg/OlsgXHRcclxmXSooPzpbIFx0XHJcZl18XG5cI1wgKVsgXHRcclxmXSopP3wt
KSkqKCg/OlxkXGQpP1xkXGQpKD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcblwjXCApWyBcdFxy
XGZdKilGcmVlKD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcblwjXCApWyBcdFxyXGZdKilTb2Z0
d2FyZSg/OlsgXHRcclxmXSooPzpbIFx0XHJcZl18XG5cI1wgKVsgXHRcclxmXSopRm91bmRhdGlv
biwoPzpbIFx0XHJcZl0qKD86WyBcdFxyXGZdfFxuXCNcIClbIFx0XHJcZl0qKUluYy4vIGF0IC9t
bnQvbGZzL3NvdXJjZXMvZGlmZnV0aWxzLTMuMy9idWlsZC1hdXgvdXBkYXRlLWNvcHlyaWdodCBs
aW5lIDE3NCwgPD4gY2h1bmsgMi4KK1VuZXNjYXBlZCBsZWZ0IGJyYWNlIGluIHJlZ2V4IGlzIGRl
cHJlY2F0ZWQsIHBhc3NlZCB0aHJvdWdoIGluIHJlZ2V4OyBtYXJrZWQgYnkgPC0tIEhFUkUgaW4g
bS9cI1wgKENvcHlyaWdodCg/Oig/OlsgXHRcclxmXSooPzpbIFx0XHJcZl18XG5cI1wgKVsgXHRc
clxmXSopKD86XChbY0NdXCl8QGNvcHlyaWdodHsgPC0tIEhFUkUgfXwmY29weTspKT8oPzpbIFx0
XHJcZl0qKD86WyBcdFxyXGZdfFxuXCNcIClbIFx0XHJcZl0qKSg/Oig/OlxkXGQpP1xkXGQoPzos
KD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcblwjXCApWyBcdFxyXGZdKik/fC0pKSooKD86XGRc
ZCk/XGRcZCkoPzpbIFx0XHJcZl0qKD86WyBcdFxyXGZdfFxuXCNcIClbIFx0XHJcZl0qKUZyZWUo
PzpbIFx0XHJcZl0qKD86WyBcdFxyXGZdfFxuXCNcIClbIFx0XHJcZl0qKVNvZnR3YXJlKD86WyBc
dFxyXGZdKig/OlsgXHRcclxmXXxcblwjXCApWyBcdFxyXGZdKilGb3VuZGF0aW9uLCg/OlsgXHRc
clxmXSooPzpbIFx0XHJcZl18XG5cI1wgKVsgXHRcclxmXSopSW5jLikvIGF0IC9tbnQvbGZzL3Nv
dXJjZXMvZGlmZnV0aWxzLTMuMy9idWlsZC1hdXgvdXBkYXRlLWNvcHlyaWdodCBsaW5lIDE4Mywg
PD4gY2h1bmsgMi4KK1VuZXNjYXBlZCBsZWZ0IGJyYWNlIGluIHJlZ2V4IGlzIGRlcHJlY2F0ZWQs
IHBhc3NlZCB0aHJvdWdoIGluIHJlZ2V4OyBtYXJrZWQgYnkgPC0tIEhFUkUgaW4gbS9cRyg/Oig/
OlsgXHRcclxmXSooPzpbIFx0XHJcZl18XG5cIFwqXCApWyBcdFxyXGZdKikoPzpcKFtjQ11cKXxA
Y29weXJpZ2h0eyA8LS0gSEVSRSB9fCZjb3B5OykpPyg/OlsgXHRcclxmXSooPzpbIFx0XHJcZl18
XG5cIFwqXCApWyBcdFxyXGZdKikoPzooPzpcZFxkKT9cZFxkKD86LCg/OlsgXHRcclxmXSooPzpb
IFx0XHJcZl18XG5cIFwqXCApWyBcdFxyXGZdKik/fC0pKSooKD86XGRcZCk/XGRcZCkoPzpbIFx0
XHJcZl0qKD86WyBcdFxyXGZdfFxuXCBcKlwgKVsgXHRcclxmXSopRnJlZSg/OlsgXHRcclxmXSoo
PzpbIFx0XHJcZl18XG5cIFwqXCApWyBcdFxyXGZdKilTb2Z0d2FyZSg/OlsgXHRcclxmXSooPzpb
IFx0XHJcZl18XG5cIFwqXCApWyBcdFxyXGZdKilGb3VuZGF0aW9uLCg/OlsgXHRcclxmXSooPzpb
IFx0XHJcZl18XG5cIFwqXCApWyBcdFxyXGZdKilJbmMuLyBhdCAvbW50L2xmcy9zb3VyY2VzL2Rp
ZmZ1dGlscy0zLjMvYnVpbGQtYXV4L3VwZGF0ZS1jb3B5cmlnaHQgbGluZSAxNzQsIDw+IGNodW5r
IDMuCitVbmVzY2FwZWQgbGVmdCBicmFjZSBpbiByZWdleCBpcyBkZXByZWNhdGVkLCBwYXNzZWQg
dGhyb3VnaCBpbiByZWdleDsgbWFya2VkIGJ5IDwtLSBIRVJFIGluIG0vXAorXCBcKlwgKENvcHly
aWdodCg/Oig/OlsgXHRcclxmXSooPzpbIFx0XHJcZl18XG5cIFwqXCApWyBcdFxyXGZdKikoPzpc
KFtjQ11cKXxAY29weXJpZ2h0eyA8LS0gSEVSRSB9fCZjb3B5OykpPyg/OlsgXHRcclxmXSooPzpb
IFx0XHJcZl18XG5cIFwqXCApWyBcdFxyXGZdKikoPzooPzpcZFxkKT9cZFxkKD86LCg/OlsgXHRc
clxmXSooPzpbIFx0XHJcZl18XG5cIFwqXCApWyBcdFxyXGZdKik/fC0pKSooKD86XGRcZCk/XGRc
ZCkoPzpbIFx0XHJcZl0qKD86WyBcdFxyXGZdfFxuXCBcKlwgKVsgXHRcclxmXSopRnJlZSg/Olsg
XHRcclxmXSooPzpbIFx0XHJcZl18XG5cIFwqXCApWyBcdFxyXGZdKilTb2Z0d2FyZSg/OlsgXHRc
clxmXSooPzpbIFx0XHJcZl18XG5cIFwqXCApWyBcdFxyXGZdKilGb3VuZGF0aW9uLCg/OlsgXHRc
clxmXSooPzpbIFx0XHJcZl18XG5cIFwqXCApWyBcdFxyXGZdKilJbmMuKS8gYXQgL21udC9sZnMv
c291cmNlcy9kaWZmdXRpbHMtMy4zL2J1aWxkLWF1eC91cGRhdGUtY29weXJpZ2h0IGxpbmUgMTgz
LCA8PiBjaHVuayAzLgorVW5lc2NhcGVkIGxlZnQgYnJhY2UgaW4gcmVnZXggaXMgZGVwcmVjYXRl
ZCwgcGFzc2VkIHRocm91Z2ggaW4gcmVnZXg7IG1hcmtlZCBieSA8LS0gSEVSRSBpbiBtL1xHKD86
KD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcblwjXCNcIClbIFx0XHJcZl0qKSg/OlwoW2NDXVwp
fEBjb3B5cmlnaHR7IDwtLSBIRVJFIH18JmNvcHk7KSk/KD86WyBcdFxyXGZdKig/OlsgXHRcclxm
XXxcblwjXCNcIClbIFx0XHJcZl0qKSg/Oig/OlxkXGQpP1xkXGQoPzosKD86WyBcdFxyXGZdKig/
OlsgXHRcclxmXXxcblwjXCNcIClbIFx0XHJcZl0qKT98LSkpKigoPzpcZFxkKT9cZFxkKSg/Olsg
XHRcclxmXSooPzpbIFx0XHJcZl18XG5cI1wjXCApWyBcdFxyXGZdKilGcmVlKD86WyBcdFxyXGZd
Kig/OlsgXHRcclxmXXxcblwjXCNcIClbIFx0XHJcZl0qKVNvZnR3YXJlKD86WyBcdFxyXGZdKig/
OlsgXHRcclxmXXxcblwjXCNcIClbIFx0XHJcZl0qKUZvdW5kYXRpb24sKD86WyBcdFxyXGZdKig/
OlsgXHRcclxmXXxcblwjXCNcIClbIFx0XHJcZl0qKUluYy4vIGF0IC9tbnQvbGZzL3NvdXJjZXMv
ZGlmZnV0aWxzLTMuMy9idWlsZC1hdXgvdXBkYXRlLWNvcHlyaWdodCBsaW5lIDE3NCwgPD4gY2h1
bmsgNC4KIHVwZGF0ZS1jb3B5cmlnaHQudGVzdC1leC40OiB3YXJuaW5nOiBjb3B5cmlnaHQgc3Rh
dGVtZW50IG5vdCBmb3VuZAorVW5lc2NhcGVkIGxlZnQgYnJhY2UgaW4gcmVnZXggaXMgZGVwcmVj
YXRlZCwgcGFzc2VkIHRocm91Z2ggaW4gcmVnZXg7IG1hcmtlZCBieSA8LS0gSEVSRSBpbiBtL1xH
KD86KD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcbilbIFx0XHJcZl0qKSg/OlwoW2NDXVwpfEBj
b3B5cmlnaHR7IDwtLSBIRVJFIH18JmNvcHk7KSk/KD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxc
bilbIFx0XHJcZl0qKSg/Oig/OlxkXGQpP1xkXGQoPzosKD86WyBcdFxyXGZdKig/OlsgXHRcclxm
XXxcbilbIFx0XHJcZl0qKT98LSkpKigoPzpcZFxkKT9cZFxkKSg/OlsgXHRcclxmXSooPzpbIFx0
XHJcZl18XG4pWyBcdFxyXGZdKilGcmVlKD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcbilbIFx0
XHJcZl0qKVNvZnR3YXJlKD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcbilbIFx0XHJcZl0qKUZv
dW5kYXRpb24sKD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcbilbIFx0XHJcZl0qKUluYy4vIGF0
IC9tbnQvbGZzL3NvdXJjZXMvZGlmZnV0aWxzLTMuMy9idWlsZC1hdXgvdXBkYXRlLWNvcHlyaWdo
dCBsaW5lIDE3NCwgPD4gY2h1bmsgNS4KIHVwZGF0ZS1jb3B5cmlnaHQudGVzdC1leC41OiB3YXJu
aW5nOiBjb3B5cmlnaHQgc3RhdGVtZW50IG5vdCBmb3VuZAorVW5lc2NhcGVkIGxlZnQgYnJhY2Ug
aW4gcmVnZXggaXMgZGVwcmVjYXRlZCwgcGFzc2VkIHRocm91Z2ggaW4gcmVnZXg7IG1hcmtlZCBi
eSA8LS0gSEVSRSBpbiBtL1xHKD86KD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcblwjXCNcIClb
IFx0XHJcZl0qKSg/OlwoW2NDXVwpfEBjb3B5cmlnaHR7IDwtLSBIRVJFIH18JmNvcHk7KSk/KD86
WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcblwjXCNcIClbIFx0XHJcZl0qKSg/Oig/OlxkXGQpP1xk
XGQoPzosKD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcblwjXCNcIClbIFx0XHJcZl0qKT98LSkp
KigoPzpcZFxkKT9cZFxkKSg/OlsgXHRcclxmXSooPzpbIFx0XHJcZl18XG5cI1wjXCApWyBcdFxy
XGZdKilGcmVlKD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcblwjXCNcIClbIFx0XHJcZl0qKVNv
ZnR3YXJlKD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcblwjXCNcIClbIFx0XHJcZl0qKUZvdW5k
YXRpb24sKD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcblwjXCNcIClbIFx0XHJcZl0qKUluYy4v
IGF0IC9tbnQvbGZzL3NvdXJjZXMvZGlmZnV0aWxzLTMuMy9idWlsZC1hdXgvdXBkYXRlLWNvcHly
aWdodCBsaW5lIDE3NCwgPD4gY2h1bmsgNi4KK1VuZXNjYXBlZCBsZWZ0IGJyYWNlIGluIHJlZ2V4
IGlzIGRlcHJlY2F0ZWQsIHBhc3NlZCB0aHJvdWdoIGluIHJlZ2V4OyBtYXJrZWQgYnkgPC0tIEhF
UkUgaW4gbS9cRyg/Oig/OlsgXHRcclxmXSooPzpbIFx0XHJcZl18XG4pWyBcdFxyXGZdKikoPzpc
KFtjQ11cKXxAY29weXJpZ2h0eyA8LS0gSEVSRSB9fCZjb3B5OykpPyg/OlsgXHRcclxmXSooPzpb
IFx0XHJcZl18XG4pWyBcdFxyXGZdKikoPzooPzpcZFxkKT9cZFxkKD86LCg/OlsgXHRcclxmXSoo
PzpbIFx0XHJcZl18XG4pWyBcdFxyXGZdKik/fC0pKSooKD86XGRcZCk/XGRcZCkoPzpbIFx0XHJc
Zl0qKD86WyBcdFxyXGZdfFxuKVsgXHRcclxmXSopRnJlZSg/OlsgXHRcclxmXSooPzpbIFx0XHJc
Zl18XG4pWyBcdFxyXGZdKilTb2Z0d2FyZSg/OlsgXHRcclxmXSooPzpbIFx0XHJcZl18XG4pWyBc
dFxyXGZdKilGb3VuZGF0aW9uLCg/OlsgXHRcclxmXSooPzpbIFx0XHJcZl18XG4pWyBcdFxyXGZd
KilJbmMuLyBhdCAvbW50L2xmcy9zb3VyY2VzL2RpZmZ1dGlscy0zLjMvYnVpbGQtYXV4L3VwZGF0
ZS1jb3B5cmlnaHQgbGluZSAxNzQsIDw+IGNodW5rIDYuCitVbmVzY2FwZWQgbGVmdCBicmFjZSBp
biByZWdleCBpcyBkZXByZWNhdGVkLCBwYXNzZWQgdGhyb3VnaCBpbiByZWdleDsgbWFya2VkIGJ5
IDwtLSBIRVJFIGluIG0vXAorKENvcHlyaWdodCg/Oig/OlsgXHRcclxmXSooPzpbIFx0XHJcZl18
XG4pWyBcdFxyXGZdKikoPzpcKFtjQ11cKXxAY29weXJpZ2h0eyA8LS0gSEVSRSB9fCZjb3B5Oykp
Pyg/OlsgXHRcclxmXSooPzpbIFx0XHJcZl18XG4pWyBcdFxyXGZdKikoPzooPzpcZFxkKT9cZFxk
KD86LCg/OlsgXHRcclxmXSooPzpbIFx0XHJcZl18XG4pWyBcdFxyXGZdKik/fC0pKSooKD86XGRc
ZCk/XGRcZCkoPzpbIFx0XHJcZl0qKD86WyBcdFxyXGZdfFxuKVsgXHRcclxmXSopRnJlZSg/Olsg
XHRcclxmXSooPzpbIFx0XHJcZl18XG4pWyBcdFxyXGZdKilTb2Z0d2FyZSg/OlsgXHRcclxmXSoo
PzpbIFx0XHJcZl18XG4pWyBcdFxyXGZdKilGb3VuZGF0aW9uLCg/OlsgXHRcclxmXSooPzpbIFx0
XHJcZl18XG4pWyBcdFxyXGZdKilJbmMuKS8gYXQgL21udC9sZnMvc291cmNlcy9kaWZmdXRpbHMt
My4zL2J1aWxkLWF1eC91cGRhdGUtY29weXJpZ2h0IGxpbmUgMTgzLCA8PiBjaHVuayA2LgorVW5l
c2NhcGVkIGxlZnQgYnJhY2UgaW4gcmVnZXggaXMgZGVwcmVjYXRlZCwgcGFzc2VkIHRocm91Z2gg
aW4gcmVnZXg7IG1hcmtlZCBieSA8LS0gSEVSRSBpbiBtL1xHKD86KD86WyBcdFxyXGZdKig/Olsg
XHRcclxmXXxcblwjXCApWyBcdFxyXGZdKikoPzpcKFtjQ11cKXxAY29weXJpZ2h0eyA8LS0gSEVS
RSB9fCZjb3B5OykpPyg/OlsgXHRcclxmXSooPzpbIFx0XHJcZl18XG5cI1wgKVsgXHRcclxmXSop
KD86KD86XGRcZCk/XGRcZCg/OiwoPzpbIFx0XHJcZl0qKD86WyBcdFxyXGZdfFxuXCNcIClbIFx0
XHJcZl0qKT98LSkpKigoPzpcZFxkKT9cZFxkKSg/OlsgXHRcclxmXSooPzpbIFx0XHJcZl18XG5c
I1wgKVsgXHRcclxmXSopRnJlZSg/OlsgXHRcclxmXSooPzpbIFx0XHJcZl18XG5cI1wgKVsgXHRc
clxmXSopU29mdHdhcmUoPzpbIFx0XHJcZl0qKD86WyBcdFxyXGZdfFxuXCNcIClbIFx0XHJcZl0q
KUZvdW5kYXRpb24sKD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcblwjXCApWyBcdFxyXGZdKilJ
bmMuLyBhdCAvbW50L2xmcy9zb3VyY2VzL2RpZmZ1dGlscy0zLjMvYnVpbGQtYXV4L3VwZGF0ZS1j
b3B5cmlnaHQgbGluZSAxNzQsIDw+IGNodW5rIDcuCitVbmVzY2FwZWQgbGVmdCBicmFjZSBpbiBy
ZWdleCBpcyBkZXByZWNhdGVkLCBwYXNzZWQgdGhyb3VnaCBpbiByZWdleDsgbWFya2VkIGJ5IDwt
LSBIRVJFIGluIG0vXAorXCNcIChDb3B5cmlnaHQoPzooPzpbIFx0XHJcZl0qKD86WyBcdFxyXGZd
fFxuXCNcIClbIFx0XHJcZl0qKSg/OlwoW2NDXVwpfEBjb3B5cmlnaHR7IDwtLSBIRVJFIH18JmNv
cHk7KSk/KD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcblwjXCApWyBcdFxyXGZdKikoPzooPzpc
ZFxkKT9cZFxkKD86LCg/OlsgXHRcclxmXSooPzpbIFx0XHJcZl18XG5cI1wgKVsgXHRcclxmXSop
P3wtKSkqKCg/OlxkXGQpP1xkXGQpKD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcblwjXCApWyBc
dFxyXGZdKilGcmVlKD86WyBcdFxyXGZdKig/OlsgXHRcclxmXXxcblwjXCApWyBcdFxyXGZdKilT
b2Z0d2FyZSg/OlsgXHRcclxmXSooPzpbIFx0XHJcZl18XG5cI1wgKVsgXHRcclxmXSopRm91bmRh
dGlvbiwoPzpbIFx0XHJcZl0qKD86WyBcdFxyXGZdfFxuXCNcIClbIFx0XHJcZl0qKUluYy4pLyBh
dCAvbW50L2xmcy9zb3VyY2VzL2RpZmZ1dGlscy0zLjMvYnVpbGQtYXV4L3VwZGF0ZS1jb3B5cmln
aHQgbGluZSAxODMsIDw+IGNodW5rIDcuCgpTS0lQOiB0ZXN0LXZjLWxpc3QtZmlsZXMtY3ZzLnNo
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KCisrIGluaXRpYWxfY3dkXz0vbW50L2xm
cy9zb3VyY2VzL2RpZmZ1dGlscy0zLjMvZ251bGliLXRlc3RzCisrIGZhaWw9MAorKysgdGVzdGRp
cl9wcmVmaXhfCisrKyBwcmludGYgZ3QKKysgcGZ4Xz1ndAorKysgbWt0ZW1wZF8gL21udC9sZnMv
c291cmNlcy9kaWZmdXRpbHMtMy4zL2dudWxpYi10ZXN0cyBndC10ZXN0LXZjLWxpc3QtZmlsZXMt
Y3ZzLnNoLlhYWFgKKysrIGNhc2UgJCMgaW4KKysrIGRlc3RkaXJfPS9tbnQvbGZzL3NvdXJjZXMv
ZGlmZnV0aWxzLTMuMy9nbnVsaWItdGVzdHMKKysrIHRlbXBsYXRlXz1ndC10ZXN0LXZjLWxpc3Qt
ZmlsZXMtY3ZzLnNoLlhYWFgKKysrIE1BWF9UUklFU189NAorKysgY2FzZSAkZGVzdGRpcl8gaW4K
KysrIGNhc2UgJHRlbXBsYXRlXyBpbgorKysrIHVuc2V0IFRNUERJUgorKysgZD0vbW50L2xmcy9z
b3VyY2VzL2RpZmZ1dGlscy0zLjMvZ251bGliLXRlc3RzL2d0LXRlc3QtdmMtbGlzdC1maWxlcy1j
dnMuc2guTVViYworKysgY2FzZSAkZCBpbgorKysgdGVzdCAtZCAvbW50L2xmcy9zb3VyY2VzL2Rp
ZmZ1dGlscy0zLjMvZ251bGliLXRlc3RzL2d0LXRlc3QtdmMtbGlzdC1maWxlcy1jdnMuc2guTVVi
YworKysrIGxzIC1kZ28gL21udC9sZnMvc291cmNlcy9kaWZmdXRpbHMtMy4zL2dudWxpYi10ZXN0
cy9ndC10ZXN0LXZjLWxpc3QtZmlsZXMtY3ZzLnNoLk1VYmMKKysrKyB0ciBTIC0KKysrIHBlcm1z
PSdkcnd4LS0tLS0tIDIgNDA5NiBGZWIgMTUgMTA6NTAgL21udC9sZnMvc291cmNlcy9kaWZmdXRp
bHMtMy4zL2dudWxpYi10ZXN0cy9ndC10ZXN0LXZjLWxpc3QtZmlsZXMtY3ZzLnNoLk1VYmMnCisr
KyBjYXNlICRwZXJtcyBpbgorKysgdGVzdCAwID0gMAorKysgZWNobyAvbW50L2xmcy9zb3VyY2Vz
L2RpZmZ1dGlscy0zLjMvZ251bGliLXRlc3RzL2d0LXRlc3QtdmMtbGlzdC1maWxlcy1jdnMuc2gu
TVViYworKysgcmV0dXJuCisrIHRlc3RfZGlyXz0vbW50L2xmcy9zb3VyY2VzL2RpZmZ1dGlscy0z
LjMvZ251bGliLXRlc3RzL2d0LXRlc3QtdmMtbGlzdC1maWxlcy1jdnMuc2guTVViYworKyBjZCAv
bW50L2xmcy9zb3VyY2VzL2RpZmZ1dGlscy0zLjMvZ251bGliLXRlc3RzL2d0LXRlc3QtdmMtbGlz
dC1maWxlcy1jdnMuc2guTVViYworKyBnbF9pbml0X3NoX25sXz0nCicKKysgSUZTPScgCQonCisr
IGZvciBzaWdfIGluIDEgMiAzIDEzIDE1CisrKyBleHByIDEgKyAxMjgKKysgZXZhbCAndHJhcCAn
XCcnRXhpdCAxMjknXCcnIDEnCisrKyB0cmFwICdFeGl0IDEyOScgMQorKyBmb3Igc2lnXyBpbiAx
IDIgMyAxMyAxNQorKysgZXhwciAyICsgMTI4CisrIGV2YWwgJ3RyYXAgJ1wnJ0V4aXQgMTMwJ1wn
JyAyJworKysgdHJhcCAnRXhpdCAxMzAnIDIKKysgZm9yIHNpZ18gaW4gMSAyIDMgMTMgMTUKKysr
IGV4cHIgMyArIDEyOAorKyBldmFsICd0cmFwICdcJydFeGl0IDEzMSdcJycgMycKKysrIHRyYXAg
J0V4aXQgMTMxJyAzCisrIGZvciBzaWdfIGluIDEgMiAzIDEzIDE1CisrKyBleHByIDEzICsgMTI4
CisrIGV2YWwgJ3RyYXAgJ1wnJ0V4aXQgMTQxJ1wnJyAxMycKKysrIHRyYXAgJ0V4aXQgMTQxJyAx
MworKyBmb3Igc2lnXyBpbiAxIDIgMyAxMyAxNQorKysgZXhwciAxNSArIDEyOAorKyBldmFsICd0
cmFwICdcJydFeGl0IDE0MydcJycgMTUnCisrKyB0cmFwICdFeGl0IDE0MycgMTUKKysgdHJhcCBy
ZW1vdmVfdG1wXyAwCisgcGF0aF9wcmVwZW5kXyAvbW50L2xmcy9zb3VyY2VzL2RpZmZ1dGlscy0z
LjMvYnVpbGQtYXV4IC4KKyB0ZXN0IDIgJyE9JyAwCisgcGF0aF9kaXJfPS9tbnQvbGZzL3NvdXJj
ZXMvZGlmZnV0aWxzLTMuMy9idWlsZC1hdXgKKyBjYXNlICRwYXRoX2Rpcl8gaW4KKyBhYnNfcGF0
aF9kaXJfPS9tbnQvbGZzL3NvdXJjZXMvZGlmZnV0aWxzLTMuMy9idWlsZC1hdXgKKyBjYXNlICRh
YnNfcGF0aF9kaXJfIGluCisgUEFUSD0vbW50L2xmcy9zb3VyY2VzL2RpZmZ1dGlscy0zLjMvYnVp
bGQtYXV4Oi90b29scy9iaW46L2JpbjovdXNyL2JpbgorIGNyZWF0ZV9leGVfc2hpbXNfIC9tbnQv
bGZzL3NvdXJjZXMvZGlmZnV0aWxzLTMuMy9idWlsZC1hdXgKKyBjYXNlICRFWEVFWFQgaW4KKyBy
ZXR1cm4gMAorIHNoaWZ0CisgdGVzdCAxICchPScgMAorIHBhdGhfZGlyXz0uCisgY2FzZSAkcGF0
aF9kaXJfIGluCisgYWJzX3BhdGhfZGlyXz0vbW50L2xmcy9zb3VyY2VzL2RpZmZ1dGlscy0zLjMv
Z251bGliLXRlc3RzLy4KKyBjYXNlICRhYnNfcGF0aF9kaXJfIGluCisgUEFUSD0vbW50L2xmcy9z
b3VyY2VzL2RpZmZ1dGlscy0zLjMvZ251bGliLXRlc3RzLy46L21udC9sZnMvc291cmNlcy9kaWZm
dXRpbHMtMy4zL2J1aWxkLWF1eDovdG9vbHMvYmluOi9iaW46L3Vzci9iaW4KKyBjcmVhdGVfZXhl
X3NoaW1zXyAvbW50L2xmcy9zb3VyY2VzL2RpZmZ1dGlscy0zLjMvZ251bGliLXRlc3RzLy4KKyBj
YXNlICRFWEVFWFQgaW4KKyByZXR1cm4gMAorIHNoaWZ0CisgdGVzdCAwICchPScgMAorIGV4cG9y
dCBQQVRICisgdG1wZGlyPXZjLWN2cworKyBwd2QKKyByZXBvPS9tbnQvbGZzL3NvdXJjZXMvZGlm
ZnV0aWxzLTMuMy9nbnVsaWItdGVzdHMvZ3QtdGVzdC12Yy1saXN0LWZpbGVzLWN2cy5zaC5NVWJj
L3ZjLWN2cy9yZXBvCisgZmFpbD0wCisgZm9yIGkgaW4gd2l0aC1jdnN1IHdpdGhvdXQKKyB0ZXN0
IHdpdGgtY3ZzdSA9IHdpdGhvdXQKKyBvaz0wCisgbWtkaXIgdmMtY3ZzCisgY2QgdmMtY3ZzCisg
c2tpcF8gJ2N2cyBub3QgZm91bmQgaW4gUEFUSCcKKyB3YXJuXyAndGVzdC12Yy1saXN0LWZpbGVz
LWN2cy5zaDogc2tpcHBlZCB0ZXN0OiBjdnMgbm90IGZvdW5kIGluIFBBVEgnCisgY2FzZSAkSUZT
IGluCisgcHJpbnRmICclc1xuJyAndGVzdC12Yy1saXN0LWZpbGVzLWN2cy5zaDogc2tpcHBlZCB0
ZXN0OiBjdnMgbm90IGZvdW5kIGluIFBBVEgnCnRlc3QtdmMtbGlzdC1maWxlcy1jdnMuc2g6IHNr
aXBwZWQgdGVzdDogY3ZzIG5vdCBmb3VuZCBpbiBQQVRICisgdGVzdCAyID0gMgorIEV4aXQgNzcK
KyBzZXQgK2UKKyBleGl0IDc3CisgZXhpdCA3NworIHJlbW92ZV90bXBfCisgX19zdD03NworIGNs
ZWFudXBfCisgOgorIGNkIC9tbnQvbGZzL3NvdXJjZXMvZGlmZnV0aWxzLTMuMy9nbnVsaWItdGVz
dHMKKyBjaG1vZCAtUiB1K3J3eCAvbW50L2xmcy9zb3VyY2VzL2RpZmZ1dGlscy0zLjMvZ251bGli
LXRlc3RzL2d0LXRlc3QtdmMtbGlzdC1maWxlcy1jdnMuc2guTVViYworIHJtIC1yZiAvbW50L2xm
cy9zb3VyY2VzL2RpZmZ1dGlscy0zLjMvZ251bGliLXRlc3RzL2d0LXRlc3QtdmMtbGlzdC1maWxl
cy1jdnMuc2guTVViYworIGV4aXQgNzcKClNLSVA6IHRlc3Qtd2NydG9tYi13MzItMS5zaAo9PT09
PT09PT09PT09PT09PT09PT09PT09PT0KClNraXBwaW5nIHRlc3Q6IG5vdCBhIG5hdGl2ZSBXaW5k
b3dzIHN5c3RlbQoKU0tJUDogdGVzdC13Y3J0b21iLXczMi0yLnNoCj09PT09PT09PT09PT09PT09
PT09PT09PT09PQoKU2tpcHBpbmcgdGVzdDogbm90IGEgbmF0aXZlIFdpbmRvd3Mgc3lzdGVtCgpT
S0lQOiB0ZXN0LXdjcnRvbWItdzMyLTMuc2gKPT09PT09PT09PT09PT09PT09PT09PT09PT09CgpT
a2lwcGluZyB0ZXN0OiBub3QgYSBuYXRpdmUgV2luZG93cyBzeXN0ZW0KClNLSVA6IHRlc3Qtd2Ny
dG9tYi13MzItNC5zaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT0KClNraXBwaW5nIHRlc3Q6
IG5vdCBhIG5hdGl2ZSBXaW5kb3dzIHN5c3RlbQoKU0tJUDogdGVzdC13Y3J0b21iLXczMi01LnNo
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PQoKU2tpcHBpbmcgdGVzdDogbm90IGEgbmF0aXZl
IFdpbmRvd3Mgc3lzdGVtCgo=


--=-sinamail_mix_e314244f3b635b9c2692cc03ed5fd025--





From MAILER-DAEMON Tue Feb 16 01:14:09 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1aVYtl-0007IY-8d
	for mharc-bug-diffutils@gnu.org; Tue, 16 Feb 2016 01:14:09 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45074)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aVYth-0007Ge-PC
	for bug-diffutils@gnu.org; Tue, 16 Feb 2016 01:14:06 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aVYte-0003GC-Im
	for bug-diffutils@gnu.org; Tue, 16 Feb 2016 01:14:05 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:49896)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aVYte-0003G6-FF
	for bug-diffutils@gnu.org; Tue, 16 Feb 2016 01:14:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aVYte-0001BJ-9g
	for bug-diffutils@gnu.org; Tue, 16 Feb 2016 01:14:02 -0500
Resent-From: Jim Meyering <jim@meyering.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-To: bug-diffutils@gnu.org
Resent-Date: Tue, 16 Feb 2016 06:14:02 +0000
Resent-Message-ID: <handler.22685.D22685.14556032354517.done@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: cc-closed 22685
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: oq2013@sina.com
Mail-Followup-To: 22685@debbugs.gnu.org, jim@meyering.net, oq2013@sina.com
Received: via spool by 22685-done@debbugs.gnu.org id=D22685.14556032354517
	(code D ref 22685); Tue, 16 Feb 2016 06:14:02 +0000
Received: (at 22685-done) by debbugs.gnu.org; 16 Feb 2016 06:13:55 +0000
Received: from localhost ([127.0.0.1]:40671 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1aVYtW-0001An-R3
	for submit@debbugs.gnu.org; Tue, 16 Feb 2016 01:13:55 -0500
Received: from mail-ob0-f172.google.com ([209.85.214.172]:35421)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <meyering@gmail.com>) id 1aVYtV-0001Aa-0S
	for 22685-done@debbugs.gnu.org; Tue, 16 Feb 2016 01:13:54 -0500
Received: by mail-ob0-f172.google.com with SMTP id xk3so243154825obc.2
	for <22685-done@debbugs.gnu.org>; Mon, 15 Feb 2016 22:13:53 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; 
	h=mime-version:sender:in-reply-to:references:from:date:message-id
	:subject:to:cc:content-type;
	bh=nftCdsWJQkZR2S+b33WGdeQFJh0RHQmexiJHtCR5sxc=;
	b=lLR7VcfqlQKneKkEy/Nfg0N2W/v3GISy4zY+ImBe/gGNaMTbu05+JWl1iQ4mIcnpd2
	UiOE/URQq12JflTZwe6NmwJ5gdj2WU7j9go4xHxwZwA01l6+tRrmkmQ4uEtt/9gL4qps
	x3G8VKE9VaZpRX/DX3kXsn/+CqLiI0spuOVa5CjAPbnJFsstwh2MPcxtkJ7Q+A+HRakj
	peNwrkRwuI9FLy2Trtl/CiR7RIAog8LuoU8nkJeIVbMjHkm9lmY7h5X8Z4dc6vUYT6DS
	cvxPjlsJN1M80Q0DfEDQinf8xKFDtiZvmoCjsjsTrzONSWPVU3DK+3V5140XjpEEhyvI
	i35g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
	:date:message-id:subject:to:cc:content-type;
	bh=nftCdsWJQkZR2S+b33WGdeQFJh0RHQmexiJHtCR5sxc=;
	b=ECq6WwmKPpHTsKQ3duyipRtXmTaTjCkrI44MtdIutwqRA6b+XC/o6rPx835ExQA5PU
	o6FBKRsZicAWKWgnL+bR1nqbUzoN6mlJzAnf5nGdK389n+6ns+T49NmTCVD+Yr8uzp4A
	1mCicoP1sTTBqzL155LhdWNLDBuNbaAyx7KpYmyyUOKuRaewuu+S+lTCwai4OUJIiKeO
	nRX/XvmZv/f0n7ThDgG7yz5+nJuIRVmXmRJUNQ+iCsXUVpqnxm1IMhrX1QQtBpgIi7+o
	4qjTxcUJ+MAfGSNEYU1Wq/yH8pWnzJO2zwE1hqL4WzaklZB+7f7BAkLbZM1Ld7bLRFFt
	RIyg==
X-Gm-Message-State: AG10YOSORxhJ1KhqyiQFNR3FrBhwFYhQE7S7fWqwzAxvAqTx8t0UMOBUe/f2BUdeHpu92V1FjCqeuawGuMLKFw==
X-Received: by 10.202.83.194 with SMTP id h185mr13588471oib.134.1455603227299; 
	Mon, 15 Feb 2016 22:13:47 -0800 (PST)
MIME-Version: 1.0
Received: by 10.202.177.65 with HTTP; Mon, 15 Feb 2016 22:13:26 -0800 (PST)
In-Reply-To: <20160215120150.9F85970007E@webmail.sinamail.sina.com.cn>
References: <20160215120150.9F85970007E@webmail.sinamail.sina.com.cn>
From: Jim Meyering <jim@meyering.net>
Date: Mon, 15 Feb 2016 22:13:26 -0800
X-Google-Sender-Auth: sjOFh7sfNaCUqwjdDoWnlvwFZuI
Message-ID: <CA+8g5KFySmK6zRkJKVTKY6_UcBLwK6u-1pesmw0BqDmZ87G-SA@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Cc: 22685-done@debbugs.gnu.org
Subject: [bug-diffutils] bug#22685: bug#22685: FAIL: test-update-copyright.sh
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Feb 2016 06:14:07 -0000

On Mon, Feb 15, 2016 at 4:01 AM, afsto <oq2013@sina.com> wrote:
> Hello! I am trying to build my linux from scratch. When I am compiled the
> "diffutils-3.3",I run "make check". I got a fail ! As the title shows "FAIL:
> test-update-copyright.sh". I also upload the gnulib-tests/test-suite.log in
> the attachments.

Thank you. That is a relatively harmless test-only failure,
and it has been fixed for the next release, so I'm marking
this auto-created "issue" as "done".




From MAILER-DAEMON Mon Feb 22 09:40:08 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1aXrei-0001LF-0r
	for mharc-bug-diffutils@gnu.org; Mon, 22 Feb 2016 09:40:08 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48771)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aXref-0001Ft-PG
	for bug-diffutils@gnu.org; Mon, 22 Feb 2016 09:40:06 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aXrec-0007hZ-0Y
	for bug-diffutils@gnu.org; Mon, 22 Feb 2016 09:40:05 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:39846)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aXreb-0007hR-T5
	for bug-diffutils@gnu.org; Mon, 22 Feb 2016 09:40:01 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aXreb-0001th-Oo
	for bug-diffutils@gnu.org; Mon, 22 Feb 2016 09:40:01 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Gisle Vanem <gvanem@yahoo.no>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 22 Feb 2016 14:40:01 +0000
Resent-Message-ID: <handler.22067.B.14561519897269@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 22067
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: 22067@debbugs.gnu.org
X-Debbugs-Original-To: "bug-diffutils@gnu.org" <bug-diffutils@gnu.org>
Received: via spool by submit@debbugs.gnu.org id=B.14561519897269
	(code B ref -1); Mon, 22 Feb 2016 14:40:01 +0000
Received: (at submit) by debbugs.gnu.org; 22 Feb 2016 14:39:49 +0000
Received: from localhost ([127.0.0.1]:36973 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1aXreP-0001tB-HQ
	for submit@debbugs.gnu.org; Mon, 22 Feb 2016 09:39:49 -0500
Received: from eggs.gnu.org ([208.118.235.92]:57648)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <gvanem@yahoo.no>) id 1aXreO-0001sz-94
	for submit@debbugs.gnu.org; Mon, 22 Feb 2016 09:39:48 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gvanem@yahoo.no>) id 1aXreI-0007br-75
	for submit@debbugs.gnu.org; Mon, 22 Feb 2016 09:39:42 -0500
Received: from lists.gnu.org ([2001:4830:134:3::11]:35103)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gvanem@yahoo.no>) id 1aXreI-0007bm-4a
	for submit@debbugs.gnu.org; Mon, 22 Feb 2016 09:39:42 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48612)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gvanem@yahoo.no>) id 1aXreH-0000QO-6Z
	for bug-diffutils@gnu.org; Mon, 22 Feb 2016 09:39:42 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gvanem@yahoo.no>) id 1aXreD-0007b0-OV
	for bug-diffutils@gnu.org; Mon, 22 Feb 2016 09:39:41 -0500
Received: from nm6-vm9.bullet.mail.ir2.yahoo.com ([212.82.96.125]:42243)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gvanem@yahoo.no>) id 1aXreD-0007au-FG
	for bug-diffutils@gnu.org; Mon, 22 Feb 2016 09:39:37 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.no; s=s2048;
	t=1456151974; bh=NcGNx3knnCYyy3suTwNVsMZnJZ3VcaqaX4W4rzN8msk=;
	h=Subject:To:References:From:Date:In-Reply-To:From:Subject;
	b=pSpXZAd+Y6HyDDFj5xifj+GCFIpBTz34LQwA2T9tjk7k96J4pBdi3dilEQrWUzQ8PrnjkVOo2UCn2OmtbdMEkWsSaAA6P/4sWGTK3h5FUhIifDdxD0e5MUFf5z6nFzgE+LGeania73r9gqSB4y6ruX0bDtN8GscWTGLoF0JBvJfh7wtd37y32GqFYrhUoxi0yuCoUIxGxDZA+qRLUUv9bBYLekEAWOcPJ0yQILuXg7z3lGKmNNCSHDseRQMiUBQcKU60a7/RrxdY3F90d+4V2tEVcEs4hTpqzbVMwSxkAGQ1E8b16u7Av6zaW4izAahWhhX97IXoYb8vJsHL7MkxBQ==
Received: from [212.82.98.49] by nm6.bullet.mail.ir2.yahoo.com with NNFMP;
	22 Feb 2016 14:39:34 -0000
Received: from [46.228.39.96] by tm2.bullet.mail.ir2.yahoo.com with NNFMP;
	22 Feb 2016 14:39:34 -0000
Received: from [127.0.0.1] by smtp133.mail.ir2.yahoo.com with NNFMP;
	22 Feb 2016 14:39:34 -0000
X-Yahoo-Newman-Id: 838633.17654.bm@smtp133.mail.ir2.yahoo.com
X-Yahoo-Newman-Property: ymail-3
X-YMail-OSG: t2u.W6IVM1li7YTby8hXHZMEvnO4gijVX_jufjXUvrEnCfJ
	9AxMTYRmScVz.DKNKlxnSFrSmM3vpAilF0ctRTevgSNNGDHBQvgVG5MZ8nPP
	LrId.R5Zf1prQD.XXnD0X472eBVATOyAOqnFY7eIMCTovCKEHg2UwtwL.4fh
	CH1GG5MQGEGlrMcdo0AIHelshINFKjhYli2AYn7SZhhg0tLeGe1lh2jBQ2Qt
	VInnTMAXSVO6GU9Z.38_II4sRXsdNZ7YUCOigFU4s8FGzZXnzaCY53o_pliz
	92nN6kFOjsJ18woDumV9yHUX3.fGyl5FG6op4leXglag2SrOrv87WWb5oB0q
	vv4i582IRl99L4PkwszKepVhOlnHi2KN8Lm_Ie0CReVkDhyKyEpNj7lfIm5K
	kFCixYH5o2z9Q5zW.ILjXAN3VzRHj3RR8aTEKiRw9yDEuxsrIDSOFiTsJC5x
	pqIZ9VRmQ3QYowHW_JAYARzpfgDzQpv8Dpo6sYiDtYsenoYmvDeAgn8KttHd
	VU5wdMoBwowkUYr4_53WLYvk-
X-Yahoo-SMTP: 8zhYLGyswBB3AGU8c4pvFIFOfA--
References: <565D6EF4.20903@yahoo.no> <87oac3peqc.fsf@foo.bar.baz>
	<56B86F8C.2010102@yahoo.no> <87zivb74c6.fsf@foo.bar.baz>
	<56B89827.5090909@yahoo.no> <8737t0ike3.fsf@foo.bar.baz>
	<CA+8g5KETyRKno98H18d_nLeO3SdywDGgXdfUBm5VF96hSxoxCw@mail.gmail.com>
From: Gisle Vanem <gvanem@yahoo.no>
Message-ID: <56CB1DAC.9050109@yahoo.no>
Date: Mon, 22 Feb 2016 15:39:40 +0100
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101
	Thunderbird/38.6.0
MIME-Version: 1.0
In-Reply-To: <CA+8g5KETyRKno98H18d_nLeO3SdywDGgXdfUBm5VF96hSxoxCw@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#22067: bug#22067: bug#22067: bug#20062:
	bug#20062: [PATCH] diff: add support for --color
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Feb 2016 14:40:06 -0000

Sorry for the late reply. Jim Meyering wrote:

> Gisle, thanks for the patches. Giuseppe is right: we
> would much prefer to keep patches as small as possible,
> with separable changes in separate commits, so if you
> can adjust that would be great.

I'm not really sure what you mean here.

I've provided all patches [1] needed to enable coloured diffs
for the Windows console API (disregarding CygWin which has
ANSI-decoding built-in).

So it would just takes someone with a bit more "git-skills" than
I have, to do make a proper "git email-formatted" patch or whatever
you mean. And frankly I don't care if you do enable this feature
or not. So there you have it. It's your call.

[1] in an private email to Guiseppe.

-- 
--gv




From MAILER-DAEMON Fri Feb 26 04:54:07 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1aZF67-00013w-Sg
	for mharc-bug-diffutils@gnu.org; Fri, 26 Feb 2016 04:54:07 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:33970)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aZF66-00013k-6W
	for bug-diffutils@gnu.org; Fri, 26 Feb 2016 04:54:06 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aZF63-0001v6-0j
	for bug-diffutils@gnu.org; Fri, 26 Feb 2016 04:54:06 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:49785)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aZF62-0001v2-TO
	for bug-diffutils@gnu.org; Fri, 26 Feb 2016 04:54:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1aZF62-0003M8-MM
	for bug-diffutils@gnu.org; Fri, 26 Feb 2016 04:54:02 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: =?UTF-8?Q?=E7=A9=8D=E4=B8=B9=E5=B0=BC?= Dan Jacobson
	<jidanni@jidanni.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Fri, 26 Feb 2016 09:54:02 +0000
Resent-Message-ID: <handler.22816.B.145648041012858@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 22816
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 22816@debbugs.gnu.org
X-Debbugs-Original-To: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.145648041012858
	(code B ref -1); Fri, 26 Feb 2016 09:54:02 +0000
Received: (at submit) by debbugs.gnu.org; 26 Feb 2016 09:53:30 +0000
Received: from localhost ([127.0.0.1]:46912 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1aZF5W-0003LK-7Q
	for submit@debbugs.gnu.org; Fri, 26 Feb 2016 04:53:30 -0500
Received: from eggs.gnu.org ([208.118.235.92]:41438)
	by debbugs.gnu.org with esmtp (Exim 4.84)
	(envelope-from <jidanni@jidanni.org>) id 1aZF5U-0003L7-VP
	for submit@debbugs.gnu.org; Fri, 26 Feb 2016 04:53:29 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jidanni@jidanni.org>) id 1aZF5P-0001jw-4U
	for submit@debbugs.gnu.org; Fri, 26 Feb 2016 04:53:23 -0500
Received: from lists.gnu.org ([2001:4830:134:3::11]:41686)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jidanni@jidanni.org>) id 1aZF5P-0001jr-1B
	for submit@debbugs.gnu.org; Fri, 26 Feb 2016 04:53:23 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:60520)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jidanni@jidanni.org>) id 1aZF5O-0000zL-8P
	for bug-diffutils@gnu.org; Fri, 26 Feb 2016 04:53:22 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jidanni@jidanni.org>) id 1aZF5K-0001iq-DE
	for bug-diffutils@gnu.org; Fri, 26 Feb 2016 04:53:22 -0500
Received: from homie.mail.dreamhost.com ([208.97.132.208]:50056
	helo=homiemail-a38.g.dreamhost.com)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jidanni@jidanni.org>) id 1aZF5K-0001i4-5O
	for bug-diffutils@gnu.org; Fri, 26 Feb 2016 04:53:18 -0500
Received: from homiemail-a38.g.dreamhost.com (localhost [127.0.0.1])
	by homiemail-a38.g.dreamhost.com (Postfix) with ESMTP id B2C7A10AFC2
	for <bug-diffutils@gnu.org>; Fri, 26 Feb 2016 01:53:11 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=jidanni.org; h=from:to
	:subject:date:message-id:mime-version:content-type; s=
	jidanni.org; bh=MbpruyU05xLRRR2nW5SPF4tbqF8=; b=WEoiaAuqSYDQNMdg
	QmdrygL72Y7uPY4P0gTWQJBeLO4xq47JoghMglHaQ7EBd+gVRTI5iWphCwJjnOjK
	6QGHi07PSFl0yvHbn8IXHJ5ubjDQZR0b/5zemc0mRKaeYl7Gx2HoV7+G4/Wuz910
	u1neBTrA5nq9nwXpmeFuzUBIAtw=
Received: from jidanni.org (114-41-31-80.dynamic.hinet.net [114.41.31.80])
	(using TLSv1 with cipher AES128-SHA (128/128 bits))
	(No client certificate requested)
	(Authenticated sender: jidanni@jidanni.org)
	by homiemail-a38.g.dreamhost.com (Postfix) with ESMTPSA id 6468C10AFBE
	for <bug-diffutils@gnu.org>; Fri, 26 Feb 2016 01:53:11 -0800 (PST)
From: =?UTF-8?Q?=E7=A9=8D=E4=B8=B9=E5=B0=BC?= Dan Jacobson
	<jidanni@jidanni.org>
Date: Fri, 26 Feb 2016 17:53:07 +0800
Message-ID: <87mvqnkdbw.fsf@jidanni.org>
MIME-Version: 1.0
Content-Type: text/plain
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#22816: cmp --verbose EOF message could be more
	verbose
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Feb 2016 09:54:07 -0000

One would think the "cmp: EOF on SHORTER-FILE" message
should at least say what line number if --verbose or --print-bytes is given.




