From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 01 04:57:03 2015 Received: (at submit) by debbugs.gnu.org; 1 Dec 2015 09:57:03 +0000 Received: from localhost ([127.0.0.1]:33641 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1a3hgF-0008RJ-3t for submit@debbugs.gnu.org; Tue, 01 Dec 2015 04:57:03 -0500 Received: from eggs.gnu.org ([208.118.235.92]:36499) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1a3hgD-0008Qy-Cc for submit@debbugs.gnu.org; Tue, 01 Dec 2015 04:57:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3hgC-00042S-5r for submit@debbugs.gnu.org; Tue, 01 Dec 2015 04:57:00 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:53365) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3hgC-00042O-3C for submit@debbugs.gnu.org; Tue, 01 Dec 2015 04:57:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46499) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3hgB-0008KZ-7v for bug-diffutils@gnu.org; Tue, 01 Dec 2015 04:57:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3hg7-00041V-Ak for bug-diffutils@gnu.org; Tue, 01 Dec 2015 04:56:59 -0500 Received: from nm36-vm5.bullet.mail.ir2.yahoo.com ([212.82.97.137]:55356) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3hg7-00040I-13 for bug-diffutils@gnu.org; Tue, 01 Dec 2015 04:56:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.no; s=s2048; t=1448963813; bh=FgMR3B3CPmZo22oc6iJoaZCyU2ef43CAwY9VV01oyjM=; h=From:Subject:To:Date:From:Subject; b=Jh1lGNaLjFDX0d6MG4nhh53Iqqs7gHnbxAhe4PBVXmzJnnbYm3xmxoidhiYT3Yi6iV1f1Jg/BK+artxQrwUs3U+S3S5VrMZdfR2G/VVWjDlY9zZ2SgPB57c8wW8QnMUdDMEulWHYAEJQjrbEdzrHjlA8IK6UhOHaxxXiqr4TZEALaHkCLk6Is3mvvyv5RqKvnfPSDXtktYzRN2QchUy7cbU6KEasgfTFTWniaMBmEnDVYNE4HcfugBXj5Ynr8vk3xIzdgPjOBLXx3aRyMNtiwUe6hVk6yR/v1ZP4AVEdRYIluQLgPzmeXUdiLpVFpU1QpH7Nbntb29lApn3nR/53jQ== Received: from [212.82.98.62] by nm36.bullet.mail.ir2.yahoo.com with NNFMP; 01 Dec 2015 09:56:53 -0000 Received: from [46.228.39.67] by tm15.bullet.mail.ir2.yahoo.com with NNFMP; 01 Dec 2015 09:56:53 -0000 Received: from [127.0.0.1] by smtp104.mail.ir2.yahoo.com with NNFMP; 01 Dec 2015 09:56:53 -0000 X-Yahoo-Newman-Id: 706454.71187.bm@smtp104.mail.ir2.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: kkXJ6ZkVM1mtygrfiHa_w0zM9mjE6Ytj6m8Ze0oqdJ12NQX w4oYchEwrASOe3nLbVzwS0ceKWixrY9Gkcdq1ASo1hF4nuFHRBsGxqRSAFuu h_9il8xLvqhtHL4xUJl2cIaQvAxjAh3N5kIeDyLzTEu.MD4sSAOaOkUp69z0 n0UzzX.7hv2wqTML.qOqvvx_.CJ3Gl1Cbf1cTIOGCfcAm1RaB4ye.ItbPdLh VuGQFHPSun8RT870D5LGH_EhmiDVD6T.yC_q7wAqLrsLP3NGbYe3vccLN9XF H_GVFlcu49R2Cwr65fLyIzlP5aPOVE9kQLEqBIQCm42k1G2x3prdZf.2Y8lD J1hXXQsbfygu12I9NLTPP.vlLEIKLbgkth76RMvGnGFYckQxww4GAV1LDXRm dyTHd0PUGy1EcVBMqUOjFY5CU5swrT974skKbbkuqBcxerp.qKLyyiwQb5wF vsV_tYwmBuhgeTXFQSntq0BKdzijtAkqUjFoPk_GkW7RYEUiRxhKFnege5K0 8FrhYB4aIBcaIUOugSqYSr_E- X-Yahoo-SMTP: 8zhYLGyswBB3AGU8c4pvFIFOfA-- From: Gisle Vanem Subject: [bug-diffutils] bug#20062: bug#20062: [PATCH] diff: add support for --color To: "bug-diffutils@gnu.org" Message-ID: <565D6EF4.20903@yahoo.no> Date: Tue, 1 Dec 2015 10:57:08 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Jim Meyering wrote: > Good! Worthwhile after all. Thank you. > I have just pushed those commits. Trying this color-patch on Windows, there are a few issues: 1) ANSI-sequences are no good on Windows. 2) Some signals are not in MSVC, MinGW nor in Gnulib; i.e. SIGTSTP, SIGSTOP etc. 3) I'm getting a stack-overflow in handling a SIGINT. AFAICS there is a infinite recursion in process_signals(). This function calls 'set_color_context (RESET_CONTEXT)'. But 'set_color_context()' again calls 'process_signals()'. How can that *not* stack-fault on any platform? 1+2) I've patched here to get colors. Although hard-coded; ignoring the '--palette' option etc. -- --gv From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 30 05:02:32 2016 Received: (at 22067) by debbugs.gnu.org; 30 Jan 2016 10:02:32 +0000 Received: from localhost ([127.0.0.1]:41014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aPSMR-0000pt-VX for submit@debbugs.gnu.org; Sat, 30 Jan 2016 05:02:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50052) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aPSMQ-0000pd-AK for 22067@debbugs.gnu.org; Sat, 30 Jan 2016 05:02: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 47B1BA853; Sat, 30 Jan 2016 10:02:23 +0000 (UTC) Received: from foo.bar.baz (vpn-54-250.rdu2.redhat.com [10.10.54.250]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0UA2KuL004964 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sat, 30 Jan 2016 05:02:22 -0500 From: Giuseppe Scrivano To: Gisle Vanem Subject: Re: [bug-diffutils] bug#22067: bug#20062: bug#20062: [PATCH] diff: add support for --color References: <565D6EF4.20903@yahoo.no> Date: Sat, 30 Jan 2016 11:02:19 +0100 Message-ID: <87oac3peqc.fsf@foo.bar.baz> MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: 22067 Cc: 22067@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) Gisle Vanem writes: > Jim Meyering wrote: > >> Good! Worthwhile after all. Thank you. >> I have just pushed those commits. > > Trying this color-patch on Windows, there are a few issues: > > 1) ANSI-sequences are no good on Windows. > 2) Some signals are not in MSVC, MinGW nor in Gnulib; i.e. SIGTSTP, > SIGSTOP etc. > 3) I'm getting a stack-overflow in handling a SIGINT. > AFAICS there is a infinite recursion in process_signals(). > This function calls 'set_color_context (RESET_CONTEXT)'. But > 'set_color_context()' again calls 'process_signals()'. How can > that *not* stack-fault on any platform? > > 1+2) I've patched here to get colors. Although hard-coded; ignoring > the '--palette' option etc. Could you share your patch? I've no Windows machine, altough I am interested in how that could be done. 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. Thanks, Giuseppe From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 01 04:10:12 2016 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 ) 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 ) 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 To: Gisle Vanem Subject: Re: [bug-diffutils] bug#22067: bug#20062: bug#20062: [PATCH] diff: add support for --color 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-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: 22067 Cc: Jim Meyering , 22067@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) --=-=-= Content-Type: text/plain Giuseppe Scrivano 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 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 debbugs-submit-bounces@debbugs.gnu.org Sat Feb 06 01:16:48 2016 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 ) 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 ) 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: Subject: [PATCH] color for windows and fix sigxxx handling From: KW Kam To: 22067@debbugs.gnu.org Content-Type: multipart/mixed; boundary=001a1140ed4481486c052b133383 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 22067 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 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --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
w32_sgr2attr is copied from grep
--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 debbugs-submit-bounces@debbugs.gnu.org Mon Feb 08 08:29:27 2016 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 ) 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 ) 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 ) id 1aSlsU-0000tA-UX for submit@debbugs.gnu.org; Mon, 08 Feb 2016 08:29:20 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35150) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) 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 ) 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 ) 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 ) 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 Subject: Re: [bug-diffutils] bug#22067: bug#20062: bug#20062: [PATCH] diff: add support for --color To: Giuseppe Scrivano , "bug-diffutils@gnu.org" 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) 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 debbugs-submit-bounces@debbugs.gnu.org Wed Feb 10 11:46:12 2016 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 ) 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 ) 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 ) id 1aTXu1-0007A9-9H for submit@debbugs.gnu.org; Wed, 10 Feb 2016 11:46:06 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:58932) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) 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 ) 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 ) 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 ) 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 To: Gisle Vanem Subject: Re: [bug-diffutils] bug#22067: bug#20062: bug#20062: [PATCH] diff: add support for --color 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.3 (-----) X-Debbugs-Envelope-To: submit Cc: "bug-diffutils@gnu.org" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.3 (-----) Gisle Vanem 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 debbugs-submit-bounces@debbugs.gnu.org Wed Feb 10 13:42:06 2016 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 ) 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 ) 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 Date: Wed, 10 Feb 2016 10:41:38 -0800 X-Google-Sender-Auth: bMa729hhufqHQrGwZ4qsQPFglBY Message-ID: Subject: Re: [bug-diffutils] bug#22067: bug#22067: bug#20062: bug#20062: [PATCH] diff: add support for --color To: Giuseppe Scrivano Content-Type: text/plain; charset=UTF-8 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 22067 Cc: Gisle Vanem , 22067@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On Wed, Feb 10, 2016 at 8:45 AM, Giuseppe Scrivano wrote: > Gisle Vanem 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 debbugs-submit-bounces@debbugs.gnu.org Thu Feb 11 07:43:32 2016 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 ) 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 ) 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 To: Jim Meyering Subject: Re: [bug-diffutils] bug#22067: bug#22067: bug#20062: bug#20062: [PATCH] diff: add support for --color 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> Date: Thu, 11 Feb 2016 13:43:22 +0100 In-Reply-To: (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-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: 22067 Cc: Gisle Vanem , 22067@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) Jim Meyering writes: > On Wed, Feb 10, 2016 at 8:45 AM, Giuseppe Scrivano wrote: >> Gisle Vanem 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 debbugs-submit-bounces@debbugs.gnu.org Thu Feb 11 14:14:50 2016 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 ) 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 ) 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> <871t8jbeol.fsf@foo.bar.baz> From: Jim Meyering Date: Thu, 11 Feb 2016 11:14:23 -0800 X-Google-Sender-Auth: oLZTneBNNnKTmWYTx_RQgw3Fm2Q Message-ID: Subject: Re: [bug-diffutils] bug#22067: bug#22067: bug#20062: bug#20062: [PATCH] diff: add support for --color To: Giuseppe Scrivano Content-Type: text/plain; charset=UTF-8 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 22067 Cc: Gisle Vanem , 22067@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On Thu, Feb 11, 2016 at 4:43 AM, Giuseppe Scrivano wrote: > Jim Meyering writes: > >> On Wed, Feb 10, 2016 at 8:45 AM, Giuseppe Scrivano wrote: >>> Gisle Vanem 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 debbugs-submit-bounces@debbugs.gnu.org Fri Feb 12 10:14:15 2016 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 ) 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 ) 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 To: Jim Meyering Subject: Re: [bug-diffutils] bug#22067: bug#22067: bug#20062: bug#20062: [PATCH] diff: add support for --color 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> <871t8jbeol.fsf@foo.bar.baz> Date: Fri, 12 Feb 2016 16:14:04 +0100 In-Reply-To: (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-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: 22067 Cc: Gisle Vanem , 22067@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) --=-=-= Content-Type: text/plain Jim Meyering 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 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 debbugs-submit-bounces@debbugs.gnu.org Mon Feb 22 09:39:49 2016 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 ) 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 ) 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 ) id 1aXreI-0007br-75 for submit@debbugs.gnu.org; Mon, 22 Feb 2016 09:39:42 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35103) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) 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 ) 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 ) 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 ) 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-- Subject: Re: [bug-diffutils] bug#22067: bug#22067: bug#20062: bug#20062: [PATCH] diff: add support for --color To: "bug-diffutils@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> From: Gisle Vanem 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: 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) 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 debbugs-submit-bounces@debbugs.gnu.org Tue Mar 01 03:25:13 2016 Received: (at 22067) by debbugs.gnu.org; 1 Mar 2016 08:25:13 +0000 Received: from localhost ([127.0.0.1]:54711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aafcG-0006yp-UW for submit@debbugs.gnu.org; Tue, 01 Mar 2016 03:25:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58277) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aafcF-0006yb-CP for 22067@debbugs.gnu.org; Tue, 01 Mar 2016 03:25:11 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 76A4064D33; Tue, 1 Mar 2016 08:25:05 +0000 (UTC) Received: from foo.bar.baz (vpn1-4-41.ams2.redhat.com [10.36.4.41]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u218P1kX028214 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 1 Mar 2016 03:25:03 -0500 From: Giuseppe Scrivano To: Jim Meyering Subject: Re: [bug-diffutils] bug#22067: bug#22067: bug#20062: bug#20062: [PATCH] diff: add support for --color 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> <871t8jbeol.fsf@foo.bar.baz> <87lh6q55c3.fsf@foo.bar.baz> Date: Tue, 01 Mar 2016 09:25:01 +0100 In-Reply-To: <87lh6q55c3.fsf@foo.bar.baz> (Giuseppe Scrivano's message of "Fri, 12 Feb 2016 16:14:04 +0100") Message-ID: <87h9gq38rm.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.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 01 Mar 2016 08:25:05 +0000 (UTC) X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: 22067 Cc: Gisle Vanem , 22067@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) Giuseppe Scrivano writes: > Jim Meyering 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. > > From 4aea918d31454fdeaada5e2453bea3dfc2e25f8b Mon Sep 17 00:00:00 2001 > From: Giuseppe Scrivano > 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 > --- ping. Regards, Giuseppe From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 07 10:19:34 2016 Received: (at 22067) by debbugs.gnu.org; 7 Mar 2016 15:19:34 +0000 Received: from localhost ([127.0.0.1]:38208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1acwwX-0003xz-R2 for submit@debbugs.gnu.org; Mon, 07 Mar 2016 10:19:34 -0500 Received: from mail-oi0-f54.google.com ([209.85.218.54]:33027) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1acwwV-0003xm-O0 for 22067@debbugs.gnu.org; Mon, 07 Mar 2016 10:19:32 -0500 Received: by mail-oi0-f54.google.com with SMTP id d205so81380264oia.0 for <22067@debbugs.gnu.org>; Mon, 07 Mar 2016 07:19:31 -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; bh=PS5+2a+pWFVsqSpzwvSz6ns+EOZIJ70+dUznhj7tuZw=; b=wttiIGFfFk2hT0xTg3Jqn5GOIXw5AXVOq4DPe5B7876yHwMVVNO5gHm95xDHdeSqdL RopgtYNBuvOgRULnKYOYg5ESEQWLBtbRTvt6fR8WrWAISUAdXs91t6rDItLperZQj7bM 71pe6qZ6S1SZuos9ww1FNIXbXYo6FTtagce1zFT7udQOYtjmcO3/qVyu5Vh2RHekDeu4 k8K7NCKi2lLCXcJbH1t+XqxXJpmqF1i5pd9cknMg0a+dXMaIrtpmF/7o85IFR6KGw+Fs kTxTeZoSzUUbXxvWbPM4XX5AndMYA1VpzTA1vRb91t6Y4PkutvNEqkZwPTIwzHI8m6SG LYvw== 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; bh=PS5+2a+pWFVsqSpzwvSz6ns+EOZIJ70+dUznhj7tuZw=; b=P1X1bzyvsGiTAr+DWCmx+nHMR4BVYEh0224UIwHcrfBns/5hgr2N2NbN0arvRSuhZ8 VfIJhhXFpPl4T8FWKRSYX5tKTI0lVbFJqa0dttK53RnAO7Is78Brtp4e40pARdBHYZz7 Jdq/FGhmMN1ixxNPhlH1i5xAC+REB0t5OivYp/kNu8lw3laq8UJ+E+pEHoXesT7skAjZ jHVLji6cJN9yOOQdiCnrRcp/Ie+lG+5mEbAxDZ45k8b2Uw0WDY1K3+3PjX2Tl1bbGNUo hlzgqtBBeWYbOdprWV+emA4n4C62cGi8DWJ9X/ZHU+rd5aXfXXZNp/zV8CDi5vF3fKZu SQ8g== X-Gm-Message-State: AD7BkJJ04yKPQ16Rx4Lltm+LsxR529M1gMQQ9TO3WBrLwb3pykid9Ftp/8uDOpP3cM/luMCWLKo6od6S5wJ2ow== X-Received: by 10.202.56.86 with SMTP id f83mr14385984oia.64.1457363966187; Mon, 07 Mar 2016 07:19:26 -0800 (PST) MIME-Version: 1.0 Received: by 10.202.82.194 with HTTP; Mon, 7 Mar 2016 07:19:06 -0800 (PST) In-Reply-To: <87h9gq38rm.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> <871t8jbeol.fsf@foo.bar.baz> <87lh6q55c3.fsf@foo.bar.baz> <87h9gq38rm.fsf@foo.bar.baz> From: Jim Meyering Date: Mon, 7 Mar 2016 07:19:06 -0800 X-Google-Sender-Auth: klOaXciP5SlPpoWdr0yKcvohqRk Message-ID: Subject: Re: [bug-diffutils] bug#22067: bug#22067: bug#20062: bug#20062: [PATCH] diff: add support for --color To: Giuseppe Scrivano Content-Type: multipart/mixed; boundary=001a113cc114837531052d76fdfa X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 22067 Cc: Gisle Vanem , 22067@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) --001a113cc114837531052d76fdfa Content-Type: text/plain; charset=UTF-8 On Tue, Mar 1, 2016 at 12:25 AM, Giuseppe Scrivano wrote: > Giuseppe Scrivano writes: > >> Jim Meyering 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. >> >> From 4aea918d31454fdeaada5e2453bea3dfc2e25f8b Mon Sep 17 00:00:00 2001 >> From: Giuseppe Scrivano >> 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 Thank you, and sorry about the delay. I noticed that on OS X, the new test passed even without the fix, but didn't want to let that hold up the fix any longer. I've adjusted the test slightly, to eliminate the tr pipes. Will wait for your "ack", before pushing. --001a113cc114837531052d76fdfa Content-Type: text/x-patch; charset=US-ASCII; name="0001-diff-color-fix-an-infinite-recursion-bug.patch" Content-Disposition: attachment; filename="0001-diff-color-fix-an-infinite-recursion-bug.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ili4tztg0 RnJvbSAxN2UyNjk4YmNiZWUzMGE2Y2MyODJkNjFhZDYyNDJhNjRiYTljN2NmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHaXVzZXBwZSBTY3JpdmFubyA8Z3Njcml2YW5vQGdudS5vcmc+ CkRhdGU6IE1vbiwgMSBGZWIgMjAxNiAwOTo1ODo1MiArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIGRp ZmY6IC0tY29sb3I6IGZpeCBhbiBpbmZpbml0ZSByZWN1cnNpb24gYnVnCgoqIHNyYy9kaWZmLmgg KHByZXN1bWVfb3V0cHV0X3R0eSk6IE5ldyBleHRlcm4gdmFyaWFibGUuCiogc3JjL2RpZmYuYyAo UFJFU1VNRV9PVVRQVVRfVFRZX09QVElPTik6IE5ldyBlbnVtLgooZ3JvdXBfZm9ybWF0X29wdGlv bik6IEFkZCAnLXByZXN1bWUtb3V0cHV0LXR0eScuCihtYWluKTogSGFuZGxlIFBSRVNVTUVfT1VU UFVUX1RUWV9PUFRJT04uCiogc3JjL3V0aWwuYzogTmV3IHZhcmlhYmxlIGBwcmVzdW1lX291dHB1 dF90dHknLgooY2hlY2tfY29sb3Jfb3V0cHV0KTogSGFuZGxlIHByZXN1bWVfb3V0cHV0X3R0eS4K KHNldF9jb2xvcl9jb250ZXh0KTogQ2FsbCBwcm9jZXNzX3NpZ25hbHMgb25seSB3aGVuIGNvbG9y X2NvbnRleHQgaXMKbm90IFJFU0VUX0NPTlRFWFQuCiogdGVzdHMvY29sb3JzOiBDaGVjayB0aGF0 IGRpZmYgZG9lc24ndCBjcmFzaCB3aGVuIGludGVycnVwdGVkCmluIHRoZSBtaWRkbGUgb2YgYSBj b2xvciBzZXF1ZW5jZS4KClJlcG9ydGVkIGJ5IEdpc2xlIFZhbmVtIGluIGh0dHA6Ly9kZWJidWdz LmdudS5vcmcvMjIwNjcKLS0tCiBzcmMvZGlmZi5jICAgfCA5ICsrKysrKysrKwogc3JjL2RpZmYu aCAgIHwgMiArKwogc3JjL3V0aWwuYyAgIHwgNyArKysrKy0tCiB0ZXN0cy9jb2xvcnMgfCA5ICsr KysrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCAyNSBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL3NyYy9kaWZmLmMgYi9zcmMvZGlmZi5jCmluZGV4IDNhNTY2YjguLjli YzFkOTYgMTAwNjQ0Ci0tLSBhL3NyYy9kaWZmLmMKKysrIGIvc3JjL2RpZmYuYwpAQCAtMTQxLDYg KzE0MSw4IEBAIGVudW0KCiAgIENPTE9SX09QVElPTiwKICAgQ09MT1JfUEFMRVRURV9PUFRJT04s CisKKyAgUFJFU1VNRV9PVVRQVVRfVFRZX09QVElPTiwKIH07Cgogc3RhdGljIGNoYXIgY29uc3Qg Z3JvdXBfZm9ybWF0X29wdGlvbltdW3NpemVvZiAiLS11bmNoYW5nZWQtZ3JvdXAtZm9ybWF0Il0g PQpAQCAtMjE5LDYgKzIyMSw5IEBAIHN0YXRpYyBzdHJ1Y3Qgb3B0aW9uIGNvbnN0IGxvbmdvcHRz W10gPQogICB7InVuaWZpZWQiLCAyLCAwLCAnVSd9LAogICB7InZlcnNpb24iLCAwLCAwLCAndid9 LAogICB7IndpZHRoIiwgMSwgMCwgJ1cnfSwKKworICAvKiBUaGlzIGlzIHNvbGVseSBmb3IgdGVz dGluZy4gIERvIG5vdCBkb2N1bWVudC4gICovCisgIHsiLXByZXN1bWUtb3V0cHV0LXR0eSIsIG5v X2FyZ3VtZW50LCBOVUxMLCBQUkVTVU1FX09VVFBVVF9UVFlfT1BUSU9OfSwKICAgezAsIDAsIDAs IDB9CiB9OwoKQEAgLTY0MSw2ICs2NDYsMTAgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2 KQogCSAgc2V0X2NvbG9yX3BhbGV0dGUgKG9wdGFyZyk7CiAJICBicmVhazsKCisgICAgICAgIGNh c2UgUFJFU1VNRV9PVVRQVVRfVFRZX09QVElPTjoKKyAgICAgICAgICBwcmVzdW1lX291dHB1dF90 dHkgPSB0cnVlOworICAgICAgICAgIGJyZWFrOworCiAJZGVmYXVsdDoKIAkgIHRyeV9oZWxwIChO VUxMLCBOVUxMKTsKIAl9CmRpZmYgLS1naXQgYS9zcmMvZGlmZi5oIGIvc3JjL2RpZmYuaAppbmRl eCBlNGMxMzhjLi4wOTgzZTdjIDEwMDY0NAotLS0gYS9zcmMvZGlmZi5oCisrKyBiL3NyYy9kaWZm LmgKQEAgLTQxNyw1ICs0MTcsNyBAQCBlbnVtIGNvbG9yX2NvbnRleHQKICAgTElORV9OVU1CRVJf Q09OVEVYVCwKIH07CgorWFRFUk4gYm9vbCBwcmVzdW1lX291dHB1dF90dHk7CisKIGV4dGVybiB2 b2lkIHNldF9jb2xvcl9jb250ZXh0IChlbnVtIGNvbG9yX2NvbnRleHQgY29sb3JfY29udGV4dCk7 CiBleHRlcm4gdm9pZCBzZXRfY29sb3JfcGFsZXR0ZSAoY2hhciBjb25zdCAqcGFsZXR0ZSk7CmRp ZmYgLS1naXQgYS9zcmMvdXRpbC5jIGIvc3JjL3V0aWwuYwppbmRleCBiZjllZDk3Li5kN2I4OTI1 IDEwMDY0NAotLS0gYS9zcmMvdXRpbC5jCisrKyBiL3NyYy91dGlsLmMKQEAgLTQ0LDYgKzQ0LDgg QEAKCiBjaGFyIGNvbnN0IHByX3Byb2dyYW1bXSA9IFBSX1BST0dSQU07CgorYm9vbCBwcmVzdW1l X291dHB1dF90dHk7CisKIC8qIFF1ZXVlIHVwIG9uZS1saW5lIG1lc3NhZ2VzIHRvIGJlIHByaW50 ZWQgYXQgdGhlIGVuZCwKICAgIHdoZW4gLWwgaXMgc3BlY2lmaWVkLiAgRWFjaCBtZXNzYWdlIGlz IHJlY29yZGVkIHdpdGggYSAnc3RydWN0IG1zZycuICAqLwoKQEAgLTcxMCw3ICs3MTIsNyBAQCBj aGVja19jb2xvcl9vdXRwdXQgKGJvb2wgaXNfcGlwZSkKICAgaWYgKCEgb3V0ZmlsZSB8fCBjb2xv cnNfc3R5bGUgPT0gTkVWRVIpCiAgICAgcmV0dXJuOwoKLSAgb3V0cHV0X2lzX3R0eSA9ICFpc19w aXBlICYmIGlzYXR0eSAoZmlsZW5vIChvdXRmaWxlKSk7CisgIG91dHB1dF9pc190dHkgPSBwcmVz dW1lX291dHB1dF90dHkgfHwgKCFpc19waXBlICYmIGlzYXR0eSAoZmlsZW5vIChvdXRmaWxlKSkp OwoKICAgY29sb3JzX2VuYWJsZWQgPSAoY29sb3JzX3N0eWxlID09IEFMV0FZUwogICAgICAgICAg ICAgICAgICAgICB8fCAoY29sb3JzX3N0eWxlID09IEFVVE8gJiYgb3V0cHV0X2lzX3R0eSkpOwpA QCAtMTM0OSw3ICsxMzUxLDggQEAgc3RhdGljIGVudW0gY29sb3JfY29udGV4dCBsYXN0X2NvbnRl eHQgPSBSRVNFVF9DT05URVhUOwogdm9pZAogc2V0X2NvbG9yX2NvbnRleHQgKGVudW0gY29sb3Jf Y29udGV4dCBjb2xvcl9jb250ZXh0KQogewotICBwcm9jZXNzX3NpZ25hbHMgKCk7CisgIGlmIChj b2xvcl9jb250ZXh0ICE9IFJFU0VUX0NPTlRFWFQpCisgICAgcHJvY2Vzc19zaWduYWxzICgpOwog ICBpZiAoY29sb3JzX2VuYWJsZWQgJiYgbGFzdF9jb250ZXh0ICE9IGNvbG9yX2NvbnRleHQpCiAg ICAgewogICAgICAgcHV0X2luZGljYXRvciAoJmNvbG9yX2luZGljYXRvcltDX0xFRlRdKTsKZGlm ZiAtLWdpdCBhL3Rlc3RzL2NvbG9ycyBiL3Rlc3RzL2NvbG9ycwppbmRleCBmYWNmZDhkLi44ODFj MWI4IDEwMDc1NQotLS0gYS90ZXN0cy9jb2xvcnMKKysrIGIvdGVzdHMvY29sb3JzCkBAIC0xMTYs NCArMTE2LDEzIEBAIHRlc3QgJD8gPSAxIHx8IGZhaWw9MQogZ2VuX2V4cF91ID4gZXhwIHx8IGZy YW1ld29ya19mYWlsdXJlXwogY29tcGFyZSBleHAgb3V0IHx8IGZhaWw9MQoKKyMgQmVmb3JlIHRo ZSBmaXggaW4gaHR0cDovL2RlYmJ1Z3MuZ251Lm9yZy8yMjA2NywKKyMgdGhpcyB0ZXN0IHdvdWxk IHRyaWdnZXIgYW4gaW5maW5pdGUgbG9vcCBidWcuCitta2ZpZm8gZmlmbworcHJpbnRmICclKnMt YScgMTAwMDAwMCA+IGEKK3ByaW50ZiAnJSpzLWInIDEwMDAwMDAgPiBiCitoZWFkIC1jIDEwIDwg ZmlmbyA+IC9kZXYvbnVsbCAmCitkaWZmIC0tY29sb3I9YWx3YXlzIC0tLXByZXN1bWUtb3V0cHV0 LXR0eSBhIGIgPiBmaWZvCit0ZXN0ICQ/ID0gMTQxIHx8IGZhaWw9MQorCiBFeGl0ICRmYWlsCi0t IAoyLjcuMgoK --001a113cc114837531052d76fdfa-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 07 11:17:59 2016 Received: (at 22067) by debbugs.gnu.org; 7 Mar 2016 16:17:59 +0000 Received: from localhost ([127.0.0.1]:38245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1acxr5-0005LA-7r for submit@debbugs.gnu.org; Mon, 07 Mar 2016 11:17:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42548) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1acxr3-0005Kw-PS for 22067@debbugs.gnu.org; Mon, 07 Mar 2016 11:17:58 -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 BDA972548; Mon, 7 Mar 2016 16:17:51 +0000 (UTC) Received: from foo.bar.baz (vpn1-4-43.ams2.redhat.com [10.36.4.43]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u27GHmaB029744 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 7 Mar 2016 11:17:50 -0500 From: Giuseppe Scrivano To: Jim Meyering Subject: Re: [bug-diffutils] bug#22067: bug#22067: bug#20062: bug#20062: [PATCH] diff: add support for --color 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> <871t8jbeol.fsf@foo.bar.baz> <87lh6q55c3.fsf@foo.bar.baz> <87h9gq38rm.fsf@foo.bar.baz> Date: Mon, 07 Mar 2016 17:17:48 +0100 In-Reply-To: (Jim Meyering's message of "Mon, 7 Mar 2016 07:19:06 -0800") Message-ID: <87y49ui7o3.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.26 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: 22067 Cc: Gisle Vanem , 22067@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) Jim Meyering writes: > Thank you, and sorry about the delay. > I noticed that on OS X, the new test passed even without > the fix, but didn't want to let that hold up the fix any longer. > I've adjusted the test slightly, to eliminate the tr pipes. > Will wait for your "ack", before pushing. Unfortunately I have no access to OS X to test it out by myself. It is fine by me without the 'tr' so ACK from me. Thanks for the review, Giuseppe From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 07 11:32:10 2016 Received: (at 22067-done) by debbugs.gnu.org; 7 Mar 2016 16:32:10 +0000 Received: from localhost ([127.0.0.1]:38264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1acy4o-0005gv-7m for submit@debbugs.gnu.org; Mon, 07 Mar 2016 11:32:10 -0500 Received: from mail-oi0-f42.google.com ([209.85.218.42]:36185) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1acy4m-0005gj-AU for 22067-done@debbugs.gnu.org; Mon, 07 Mar 2016 11:32:08 -0500 Received: by mail-oi0-f42.google.com with SMTP id r187so82899554oih.3 for <22067-done@debbugs.gnu.org>; Mon, 07 Mar 2016 08:32:08 -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; bh=p4rdKoZkalTkZIjJOdUmzj/l4ZFLtRWt5eQMBMUwDH8=; b=gUQle3UvdWCK3MCIq8Pgo6Z6U3xLYNdiAFIlYailL0bZyoC+K1s/QAOjFWpwEtZCGW e1G0w8AOOpTHtBSlbLpnFiXU6kSiy8N8Iw2obtLlGgJbbRFs0xsILGonLloedu3AEmeL RDFaIbYZ43NjENjm0Q1H93IcWsgm31GYywiUMaXVW+NRGg5HYr/1a/MnMOxVxaleFx0J Dc27vQKkIxSx25G8Wu8PyAvJSjswsRkav5oe5HpyxntbKHWbBZ071BPKJ8vBd0MGpUb5 Tu4uZeDleFii9PT5pWReXI4zgXdVn0XoLwt1GJCM1EQG93/3ZM9jYmE0Rf3Kb+AWI0PC XLKw== 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; bh=p4rdKoZkalTkZIjJOdUmzj/l4ZFLtRWt5eQMBMUwDH8=; b=JUWUbELtugMgxjEvSPwpJOIVg1Br8qatZ0UAhdTk3ClRrTKEy5AXYOmeZtHiUgDbu9 Ig4Df9TQNDU0nSR+YMXcT4UG7ENrRZ1RLlid2edWYFUHucmzMg6M1xHdk/9KG/yL1td5 BBMmfrbYUEIU3reiVlj5/vygON0Jp9ujoDE387JgUQah2v9ov9Otu9qmF7ihk3dWAf+5 otk259rIpsrAT0jrjaktxrKBXPAEe237Y7jqzIV5PqzEXBG+IWK98ihwjAwmhHjRIhFG 7RellLLwZWR7meZUh4tkdU+F0Y6agB3j7Qxfi18IDG+Bf0KwJtMCnR/4bABjswVBSqig vkDQ== X-Gm-Message-State: AD7BkJKhp4xUh5mMCcG5elbXYmJp9SC/aUO30C62P/FfCpUC2PrzPljA+cdPfW4+8REotGx/hrB44oDrl4FZzw== X-Received: by 10.202.79.83 with SMTP id d80mr8879826oib.69.1457368322665; Mon, 07 Mar 2016 08:32:02 -0800 (PST) MIME-Version: 1.0 Received: by 10.202.82.194 with HTTP; Mon, 7 Mar 2016 08:31:42 -0800 (PST) In-Reply-To: <87y49ui7o3.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> <871t8jbeol.fsf@foo.bar.baz> <87lh6q55c3.fsf@foo.bar.baz> <87h9gq38rm.fsf@foo.bar.baz> <87y49ui7o3.fsf@foo.bar.baz> From: Jim Meyering Date: Mon, 7 Mar 2016 08:31:42 -0800 X-Google-Sender-Auth: L5PbhKS21Nbc-FjyCsybO4IXpjk Message-ID: Subject: Re: [bug-diffutils] bug#22067: bug#22067: bug#20062: bug#20062: [PATCH] diff: add support for --color To: Giuseppe Scrivano Content-Type: text/plain; charset=UTF-8 X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 22067-done Cc: Gisle Vanem , 22067-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) pushed. From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 07 12:20:30 2016 Received: (at 22067) by debbugs.gnu.org; 7 Mar 2016 17:20:30 +0000 Received: from localhost ([127.0.0.1]:38315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1acypa-0006w5-A7 for submit@debbugs.gnu.org; Mon, 07 Mar 2016 12:20:30 -0500 Received: from nm35-vm6.bullet.mail.ir2.yahoo.com ([212.82.97.129]:43683) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1acypY-0006vr-Ay for 22067@debbugs.gnu.org; Mon, 07 Mar 2016 12:20:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.no; s=s2048; t=1457371222; bh=h1UYGUle1NMk4+yOAqApI9o/4sFsyN/s0mKwiC0JcGQ=; h=Subject:To:References:From:Date:In-Reply-To:From:Subject; b=LMr1D+moTnIIsszJVSSUwZh38I6MOTFUiSzUr6TcdTRwmU3hvVTmr2+iHd0YSUWttjbKZCEgIS6Toz1EzTJJXCJRyjkaJH+k+Tg+Ml+ockgXz37eUR//fQJnUPfl+5fkNqutYDWF1RZvKQ1TdIJY7XzotHZ5v7OJBGix3hSOfAyUsGk4RCmeIwFTk3+2+hAQqvCd/mpZ4ao+bRCBLoEICI/SKknvnB1fmBqBBAtup5V7+h6grQFo8iFgTvWyzfs0MspyDSnvf5rSb2f5rzp9/ITPrHposmE+NXb9S1zRepXDHQ2T3p0b71umrrq2//Plg//keBz0WAxKEjG8KAlBtg== Received: from [212.82.98.61] by nm35.bullet.mail.ir2.yahoo.com with NNFMP; 07 Mar 2016 17:20:22 -0000 Received: from [46.228.39.78] by tm14.bullet.mail.ir2.yahoo.com with NNFMP; 07 Mar 2016 17:20:22 -0000 Received: from [127.0.0.1] by smtp115.mail.ir2.yahoo.com with NNFMP; 07 Mar 2016 17:20:22 -0000 X-Yahoo-Newman-Id: 418952.62788.bm@smtp115.mail.ir2.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: VjFwAcoVM1le1z88CHDtEh1rh1Nq_HgLnDtfovdko4m1NSK 4kno5FocVoE2_u0ElBqBR2lZxvA.fQzFHOSQ9fCn2DXBflAwxT1J_qbDDn5t mkjfdreuktb3.DzZ0AkDOVYSq0bxKNfdNWV9e3M3JxIASZCe7q28s0IOLRsZ 80P.st1oGbfaBRYu5fUNW8SJIwBuVn6v7KQAzU4PrXyQSppo2pdul6tWX67w QHovCfKIlfVNjUnHG2rm5UmUyJWL.UZoJLDjS3tnbbBUBbWYR4oz1HiRZ9re 0_jO55OUfMNHHGKQt8wsqjYSdWZ3grM8iSl2seeZHPi.xQEqtul.gGv5JvaY IBvsKpMtytInmeKk7Z9BJD_WbwMybN8neOFhQdCSZWmuJ.L07ahZHvLGrCxH L.YrtDXhOeeaKYjQd94ROyQOOOamQt.IX3G_L7yRxg4DxIqChJ4ZZJrk.Rnb MdJzY4niFALpLdW8VOR36sBZXQDZFm7LeXw2zQRiNScjD8H.HU4QmplxYe7_ GFsfU_5rHwHjxLgJM761i38M- X-Yahoo-SMTP: 8zhYLGyswBB3AGU8c4pvFIFOfA-- Subject: Re: bug#22067: closed (Re: [bug-diffutils] bug#22067: bug#22067: bug#20062: bug#20062: [PATCH] diff: add support for --color) To: 22067@debbugs.gnu.org References: <565D6EF4.20903@yahoo.no> From: Gisle Vanem Message-ID: <56DDB85B.2040904@yahoo.no> Date: Mon, 7 Mar 2016 18:20:27 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 22067 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) > #22067: [bug-diffutils] bug#20062: bug#20062: [PATCH] diff: add support for --color > > which was filed against the diffutils package, has been closed. But still no support for colours on a plain Windows console (except for Cygwin which has ANSI-colour support). -- --gv From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 08 17:01:09 2016 Received: (at 22067-done) by debbugs.gnu.org; 8 Mar 2016 22:01:09 +0000 Received: from localhost ([127.0.0.1]:40193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1adPgi-0004BF-Ta for submit@debbugs.gnu.org; Tue, 08 Mar 2016 17:01:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55617) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1adPgh-0004An-FL for 22067-done@debbugs.gnu.org; Tue, 08 Mar 2016 17:01:07 -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 AA84E9134F; Tue, 8 Mar 2016 22:01:01 +0000 (UTC) Received: from foo.bar.baz (vpn1-5-103.ams2.redhat.com [10.36.5.103]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u28M0wZh026993 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 8 Mar 2016 17:01:00 -0500 From: Giuseppe Scrivano To: Jim Meyering Subject: Re: [bug-diffutils] bug#22067: bug#22067: bug#20062: bug#20062: [PATCH] diff: add support for --color 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> <871t8jbeol.fsf@foo.bar.baz> <87lh6q55c3.fsf@foo.bar.baz> <87h9gq38rm.fsf@foo.bar.baz> <87y49ui7o3.fsf@foo.bar.baz> Date: Tue, 08 Mar 2016 23:00:57 +0100 In-Reply-To: (Jim Meyering's message of "Mon, 7 Mar 2016 08:31:42 -0800") Message-ID: <87ziu8iq92.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-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: 22067-done Cc: Gisle Vanem , 22067-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) Jim Meyering writes: > pushed. thanks! Is there going to be any release of diffutils with the new changes? Regards, Giuseppe From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 08 21:33:20 2016 Received: (at 22067-done) by debbugs.gnu.org; 9 Mar 2016 02:33:20 +0000 Received: from localhost ([127.0.0.1]:40309 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1adTw7-0002g7-Re for submit@debbugs.gnu.org; Tue, 08 Mar 2016 21:33:20 -0500 Received: from mail-ob0-f181.google.com ([209.85.214.181]:36653) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1adTw6-0002fv-15 for 22067-done@debbugs.gnu.org; Tue, 08 Mar 2016 21:33:18 -0500 Received: by mail-ob0-f181.google.com with SMTP id m7so33493511obh.3 for <22067-done@debbugs.gnu.org>; Tue, 08 Mar 2016 18:33:17 -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; bh=EdS8zc8hLRv/00toePxIXmedhxpApvSFlCEpgHtmLs8=; b=sBZ68bDZPAA8Frt2iA9dp9zXMzOYCx/AhCBTl1/j5+6Q+So6MBGPkxFTjwVrd+tAgm /7B1SQpD5Uzekw/Xx6KNl6imD81CNZWpCuGMRQ0sSiOffUJSw38Ji76G++sP9HqVJZYU ZfiVCu35yQHPZQYI4B/VgZD9DX3kjR87xLZtVGESXCH01I9mSaVqiXm4uqQtP1m4g6du 8SWmmXOcBg1BAIY0S0BK15qN/wTTzPEWR3gSZANgKyXP4gHZrsPcD8OOSBHTbVPGOcHS 2R6l9+6s0a8FRFMTnH58ln9X8kyMPkz6MQYc2r4Dv+Un20aVid9eDb2Zpgp9bKivMvZp Hiww== 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; bh=EdS8zc8hLRv/00toePxIXmedhxpApvSFlCEpgHtmLs8=; b=NLYuZOlkLyS8hYS45U0iXr9uf3a6QINiBlH5wIWG2X8AjBuZOqTWVlkH0Bv6/Du4ko l+aQamw4CsW6B2dtUZWnVh0HSKy4ILi0CziaAHoYXPnORjD501JaP1EvvkmCYXZpqjRV +FTgfRuPUhR2xAw/ginubzvzGdugkbW5q1cm8Kl3AccsnhjPTkSQ8TnzYofaTS/lrNUi gDpg4O+FFXzpXNXsJZOtz4ub0O2YC7LmI9GpKNYwZnKX2DvI4PPk4Vx2ojHA30dMaqGT 6E2A6A0YVdyesLwvkrvwTkpmjhS0LQsi61G7gCEdPU6MqMMC1gGzaQr2ysP3REpYgB6L zIrg== X-Gm-Message-State: AD7BkJIH02x/ekXArsYBCi2CaB4ePYT4UWJXNRHtNbnFqXuKR79PbXAE3qGqNQI/y9VPXef/VNKFdW05addBMw== X-Received: by 10.60.227.105 with SMTP id rz9mr12107138oec.72.1457490792418; Tue, 08 Mar 2016 18:33:12 -0800 (PST) MIME-Version: 1.0 Received: by 10.202.82.194 with HTTP; Tue, 8 Mar 2016 18:32:52 -0800 (PST) In-Reply-To: <87ziu8iq92.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> <871t8jbeol.fsf@foo.bar.baz> <87lh6q55c3.fsf@foo.bar.baz> <87h9gq38rm.fsf@foo.bar.baz> <87y49ui7o3.fsf@foo.bar.baz> <87ziu8iq92.fsf@foo.bar.baz> From: Jim Meyering Date: Tue, 8 Mar 2016 18:32:52 -0800 X-Google-Sender-Auth: Pk-N5PieJF8bdqj9yX3ZEwz5fNw Message-ID: Subject: Re: [bug-diffutils] bug#22067: bug#22067: bug#20062: bug#20062: [PATCH] diff: add support for --color To: Giuseppe Scrivano Content-Type: text/plain; charset=UTF-8 X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 22067-done Cc: Gisle Vanem , 22067-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On Tue, Mar 8, 2016 at 2:00 PM, Giuseppe Scrivano wrote: > Jim Meyering writes: > >> pushed. > > thanks! > > Is there going to be any release of diffutils with the new changes? Yes. It's in the queue, but first I'll make releases for grep and gzip. sed is also overdue. Any help with triaging things in the bug lists would be most welcome: http://debbugs.gnu.org/cgi/pkgreport.cgi?package=diffutils From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 10 16:02:49 2016 Received: (at 22067-done) by debbugs.gnu.org; 10 Mar 2016 21:02:49 +0000 Received: from localhost ([127.0.0.1]:44113 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1ae7jI-0004Dl-Ss for submit@debbugs.gnu.org; Thu, 10 Mar 2016 16:02:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35706) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1ae7jG-0004Dc-8V for 22067-done@debbugs.gnu.org; Thu, 10 Mar 2016 16:02:42 -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 50854C03C4; Thu, 10 Mar 2016 21:02:41 +0000 (UTC) Received: from foo.bar.baz (vpn1-4-234.ams2.redhat.com [10.36.4.234]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2AL2cTt032286 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 10 Mar 2016 16:02:40 -0500 From: Giuseppe Scrivano To: Jim Meyering Subject: Re: [bug-diffutils] bug#22067: bug#22067: bug#20062: bug#20062: [PATCH] diff: add support for --color 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> <871t8jbeol.fsf@foo.bar.baz> <87lh6q55c3.fsf@foo.bar.baz> <87h9gq38rm.fsf@foo.bar.baz> <87y49ui7o3.fsf@foo.bar.baz> <87ziu8iq92.fsf@foo.bar.baz> Date: Thu, 10 Mar 2016 22:02:38 +0100 In-Reply-To: (Jim Meyering's message of "Tue, 8 Mar 2016 18:32:52 -0800") Message-ID: <87pov2f3m9.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.26 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: 22067-done Cc: 22067-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.9 (/) Hi Jim, Jim Meyering writes: > Yes. It's in the queue, but first I'll make releases for grep and gzip. > sed is also overdue. Any help with triaging things in the bug > lists would be most welcome: > > http://debbugs.gnu.org/cgi/pkgreport.cgi?package=diffutils I went through the open bugs (I skipped the ones already on wishlist) and this is what I've found: * 18641 [diffutils] [PATCH] diff: Add --only=REGEX option to parse only files that match REGEX RFC * 19508 [diffutils] [PATCH] diff: compare major, minor numbers of block/character special files * 19509 [diffutils] [PATCH] diff: treat fifos as identical not blocking issue, patch needs review * 17185 diff --help doesn't mention short forms of some options minor issue, not blocking * 18655 Regression in 3.3 documentation versus 3.2 answered, bug must be closed * 18973 diffutils-3.3 test-mbrtowc3.sh fails on Solaris without European localization not triaged, no access to solaris to try it * 19489 FYI: I've updated copyright dates -- and gnulib not a bug, must be closed * 19825 unified output format, number of consecutive unaffected lines, and POSIX answered, can be closed * 19835 RFC: diff: skip initial columns before comparing RFC with patch not reviewed * 19984 [diffutils] Diff and symlinks commented, can be closed * 20250 [diffutils] diff by size RFC for size only comparison (I would close as NOTFIX) * 20279 [diffutils] With -r, option to avoid duplicate differences due to relative symbolic links RFC * 20794 [diffutils] ignore subdirectory with diff Went unanswered, looks like a RFC for a weird use case * 20929 [diffutils] problem with diff -B and incomplete lines Fixed by: commit d2fd9d4683ef60c259a3b426f71cef1b89ff383d Author: Paul Eggert Date: Wed Sep 3 15:58:03 2014 -0700 diff: fix bug with diff -B and incomplete lines * 21034 [diffutils] [bug-diffutils] bug#21023: bug#21023: REQUEST: --no-dereference missing from manpage + please make a short option for it RFC, should probably be closed and pointed out that --no-d will work as well * 21579 [diffutils] diffutils 3.3 man page may need update Fixed by: commit 2cd4ff3a5ff52d89b6b992d158f389b757f4faf4 Author: Jim Meyering Date: Mon Aug 31 23:12:43 2015 -0700 build: correct man-page generation rule * 21665 [diffutils] Use of mmap for large files already answered as WONTFIX, must be closed * 21674 [diffutils] Fix for context-header plain diff patch proposed, changes the format of the header * 21715 [diffutils] feat req: an option to skip directory inode comparison RFC * 22108 [diffutils] diff wrapper script for very large files, low memory duplicate of 21665 * 22245 [diffutils] [lamby@debian.org: Bug* 809007: diffutils: FTBFS: FAIL: test-update-copyright.sh] I had that issue some time ago but it was fixed upstream. I have not bisected * 22507 [diffutils] diffutils releases not a bug, working for the release :) * 22529 [diffutils] cmp man page too sophisticated not a bug * 22535 [diffutils] REQ: regex dialect switching (for -F and -I) RFC, I would close it as a WONTFIX * 22816 [diffutils] cmp --verbose EOF message could be more verbose RFC * 16467 [diffutils] Diffutils 3.3 v. VMS (et al.) could be fixed in gnulib, not a regression anyway Regards, Giuseppe From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 10 16:23:21 2016 Received: (at 22067-done) by debbugs.gnu.org; 10 Mar 2016 21:23:22 +0000 Received: from localhost ([127.0.0.1]:44127 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1ae83F-0004gd-IA for submit@debbugs.gnu.org; Thu, 10 Mar 2016 16:23:21 -0500 Received: from mail-ob0-f170.google.com ([209.85.214.170]:34736) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1ae83D-0004gP-My for 22067-done@debbugs.gnu.org; Thu, 10 Mar 2016 16:23:20 -0500 Received: by mail-ob0-f170.google.com with SMTP id ts10so94207768obc.1 for <22067-done@debbugs.gnu.org>; Thu, 10 Mar 2016 13:23:19 -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; bh=i3jUCPjOiDYahIQYEwrRUTIFGsg/2V8CvKfFh8LnLBI=; b=b2KtQD6l5HsCcne8tU8JWGKjXZcw+YH/HiR9jZuA1GNnUnPx/vLBNlDERlLdO/nrfw Na9SvYPSyMaD0eYN4S8kElW10ezaLTXC9pyk2vw9SgZvSt5UTWkpVrTOZLF25gfqdY7N LQAUC5d72VSnbC5RdA1l3OqFHCSiDFU9VaJOXFmZiIWKErBXYmRBDrQKBBndNT7AdYv2 WL77zU7i1euYGRW8gVRmgwQZD+96O1DcYrkmTz7cJ7FI2f5LVf+6OITA2PmEVI4nN1rH XnbpnpBIp5L6UR5wEsRdd5T1bEuXd9hxnBdOyq5wzC/A84cDUFDRG829zKHcdyG4qWhO A0Pg== 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; bh=i3jUCPjOiDYahIQYEwrRUTIFGsg/2V8CvKfFh8LnLBI=; b=E6uqW8h2Ex2PEcJ8oUm1qIVSwvhUJaABIOj6WZGMbaoKDlN9qezsIyEc4nYrkJ5RCd VwvRVOQknMKpdTGVPzI8+sETn8ux7pRo8176k2doztQQiI0J43Cb7uJn5rJ3a6UQRje8 LDieI+JFLBvB7HC/S5Qx5LWz6ddY3HXLH8u3gV3WKbPByX84R2F/EzYKr8/hBr7Tn4+s qAIBXyPynccThflt1Dg4+jxhxUz7e45y1c8AokjFMC3kMBnWwKeIZ9x8pwftgTFpjN7R 22aQcTZ9pluOK6GMsj/+RjsI3+Wmq1QNlOd8URm7wEwuvh+YgHnTCeq8HQYGQY2S6j04 aBLw== X-Gm-Message-State: AD7BkJIcyX4HWDVVNt+yKqdN0hgZKGFTlh12/T0kpK0IdN2pcsneHNoBFhSGc5hDfPjCdiPb5ReXgScORfZbZQ== X-Received: by 10.182.142.69 with SMTP id ru5mr3459297obb.82.1457644994157; Thu, 10 Mar 2016 13:23:14 -0800 (PST) MIME-Version: 1.0 Received: by 10.202.44.5 with HTTP; Thu, 10 Mar 2016 13:22:54 -0800 (PST) In-Reply-To: <87pov2f3m9.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> <871t8jbeol.fsf@foo.bar.baz> <87lh6q55c3.fsf@foo.bar.baz> <87h9gq38rm.fsf@foo.bar.baz> <87y49ui7o3.fsf@foo.bar.baz> <87ziu8iq92.fsf@foo.bar.baz> <87pov2f3m9.fsf@foo.bar.baz> From: Jim Meyering Date: Thu, 10 Mar 2016 13:22:54 -0800 X-Google-Sender-Auth: tW_1TWMrofIJWgWFPbbEjE261Fs Message-ID: Subject: Re: [bug-diffutils] bug#22067: bug#22067: bug#20062: bug#20062: [PATCH] diff: add support for --color To: Giuseppe Scrivano Content-Type: text/plain; charset=UTF-8 X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 22067-done Cc: 22067-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On Thu, Mar 10, 2016 at 1:02 PM, Giuseppe Scrivano wrote: > Hi Jim, > > Jim Meyering writes: > >> Yes. It's in the queue, but first I'll make releases for grep and gzip. >> sed is also overdue. Any help with triaging things in the bug >> lists would be most welcome: >> >> http://debbugs.gnu.org/cgi/pkgreport.cgi?package=diffutils > > I went through the open bugs (I skipped the ones already on wishlist) > and this is what I've found: [... lots of triage! ...] Wow!!! Thank you for all that work. I have no excuse to delay, now :-) For anything that is obviously not a bug, you are welcome (encouraged, even) to mark them as such and to close them in the bug db. I suppose you know how to do that? One way is to reply to the affected message and to include something like this at the top of it: Here's an example that merges two bugs, tags as NOTABUG, and closes. forcemerge 7354 7353 tags 7353 notabug close 7353 thanks Or just send that text to control@debbugs.gnu.org. Anyone can do that. If you just want to close a bug, it's easy to do that with a reply to the original where you change the auto-provided DDDDD@debbugs.gnu.org recipient address to be DDDDD-done@debbugs.gnu.org Thanks again. I will take time to go through any you do not close/resolve within the next few days. Thanks again, Jim From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 12 06:58:17 2016 Received: (at submit) by debbugs.gnu.org; 12 Mar 2016 11:58:18 +0000 Received: from localhost ([127.0.0.1]:45755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aeiBP-0003pZ-Ps for submit@debbugs.gnu.org; Sat, 12 Mar 2016 06:58:17 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41727) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aeiBN-0003pN-8E for submit@debbugs.gnu.org; Sat, 12 Mar 2016 06:58:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aeiBG-0001rK-FQ for submit@debbugs.gnu.org; Sat, 12 Mar 2016 06:58:04 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:44558) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeiBG-0001rG-Bs for submit@debbugs.gnu.org; Sat, 12 Mar 2016 06:58:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60925) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeiBE-0005IO-TW for bug-diffutils@gnu.org; Sat, 12 Mar 2016 06:58:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aeiBA-0001qL-E3 for bug-diffutils@gnu.org; Sat, 12 Mar 2016 06:58:00 -0500 Received: from kolbaba.stable.cz ([88.86.120.223]:54902) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeiBA-0001qH-4P for bug-diffutils@gnu.org; Sat, 12 Mar 2016 06:57:56 -0500 Received: from localhost (kolbaba.miton.cz [127.0.0.1]) by kolbaba.stable.cz (Postfix) with ESMTP id 57A842248A for ; Sat, 12 Mar 2016 12:57:53 +0100 (CET) X-Virus-Scanned: amavisd-new at kolbaba.stable.cz Received: from kolbaba.stable.cz ([127.0.0.1]) by localhost (kolbaba.stable.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id i4u52WyUixRW for ; Sat, 12 Mar 2016 12:57:51 +0100 (CET) Received: from [192.168.168.25] (154.198.broadband11.iol.cz [90.178.198.154]) by kolbaba.stable.cz (Postfix) with ESMTPSA id 795EA2389D for ; Sat, 12 Mar 2016 12:57:51 +0100 (CET) Subject: Re: [bug-diffutils] bug#22067: bug#22067: bug#22067: bug#20062: bug#20062: [PATCH] diff: add support for --color To: bug-diffutils@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> <871t8jbeol.fsf@foo.bar.baz> <87lh6q55c3.fsf@foo.bar.baz> <87h9gq38rm.fsf@foo.bar.baz> <87y49ui7o3.fsf@foo.bar.baz> <87ziu8iq92.fsf@foo.bar.baz> <87pov2f3m9.fsf@foo.bar.baz> From: =?UTF-8?Q?Ond=c5=99ej_Svoboda?= Message-ID: <56E4043F.3090501@svobodasoft.cz> Date: Sat, 12 Mar 2016 12:57:51 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <87pov2f3m9.fsf@foo.bar.baz> Content-Type: text/plain; charset=windows-1252; format=flowed 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Giuseppe, Jim, guys, I am the author of "compare major, minor numbers of block/character special files" (19508) and "treat fifos as identical" (19509). I needed them to compare backups of my Maemo 5 system (Nokia N900) -- there are static device files in /dev and some fifos too. The first patch hasn't received a code review yet -- may I ask you or the list to give it a look? I think the patch is in a better shape than "treat fifos as identical" which isn't finished although it received a suggestion by Eric Blake (on 12 Feb last year) that fstat could be used to compare the fifos. I rebased the patches in my working copy and I will at least send new versions to the list. I am finishing my studies now so I can dedicate only limited time to finishing the patches. Let me know if you would like the functionality in the next release and I'll see what I can do. Cheers, Ondra On 10.3.2016 22:02, Giuseppe Scrivano wrote: > Hi Jim, > > Jim Meyering writes: > >> Yes. It's in the queue, but first I'll make releases for grep and gzip. >> sed is also overdue. Any help with triaging things in the bug >> lists would be most welcome: >> >> http://debbugs.gnu.org/cgi/pkgreport.cgi?package=diffutils > I went through the open bugs (I skipped the ones already on wishlist) > and this is what I've found: > > * 18641 [diffutils] [PATCH] diff: Add --only=REGEX option to parse only files that match REGEX > RFC > > * 19508 [diffutils] [PATCH] diff: compare major, minor numbers of block/character special files > * 19509 [diffutils] [PATCH] diff: treat fifos as identical > not blocking issue, patch needs review > > * 17185 diff --help doesn't mention short forms of some options > minor issue, not blocking > > * 18655 Regression in 3.3 documentation versus 3.2 > answered, bug must be closed > > * 18973 diffutils-3.3 test-mbrtowc3.sh fails on Solaris without European localization > not triaged, no access to solaris to try it > > * 19489 FYI: I've updated copyright dates -- and gnulib > not a bug, must be closed > > * 19825 unified output format, number of consecutive unaffected lines, and POSIX > answered, can be closed > > * 19835 RFC: diff: skip initial columns before comparing > RFC with patch not reviewed > > * 19984 [diffutils] Diff and symlinks > commented, can be closed > > * 20250 [diffutils] diff by size > RFC for size only comparison (I would close as NOTFIX) > > * 20279 [diffutils] With -r, option to avoid duplicate differences due to relative symbolic links > RFC > > * 20794 [diffutils] ignore subdirectory with diff > Went unanswered, looks like a RFC for a weird use case > > * 20929 [diffutils] problem with diff -B and incomplete lines > Fixed by: > > commit d2fd9d4683ef60c259a3b426f71cef1b89ff383d > Author: Paul Eggert > Date: Wed Sep 3 15:58:03 2014 -0700 > > diff: fix bug with diff -B and incomplete lines > > > * 21034 [diffutils] [bug-diffutils] bug#21023: bug#21023: REQUEST: --no-dereference missing from manpage + please make a short option for it > RFC, should probably be closed and pointed out that --no-d will work as well > > * 21579 [diffutils] diffutils 3.3 man page may need update > > Fixed by: > > commit 2cd4ff3a5ff52d89b6b992d158f389b757f4faf4 > Author: Jim Meyering > Date: Mon Aug 31 23:12:43 2015 -0700 > > build: correct man-page generation rule > > > * 21665 [diffutils] Use of mmap for large files > already answered as WONTFIX, must be closed > > * 21674 [diffutils] Fix for context-header > plain diff patch proposed, changes the format of the header > > * 21715 [diffutils] feat req: an option to skip directory inode comparison > RFC > > * 22108 [diffutils] diff wrapper script for very large files, low memory > duplicate of 21665 > > * 22245 [diffutils] [lamby@debian.org: Bug* 809007: diffutils: FTBFS: FAIL: test-update-copyright.sh] > I had that issue some time ago but it was fixed upstream. I have not bisected > > * 22507 [diffutils] diffutils releases > not a bug, working for the release :) > > * 22529 [diffutils] cmp man page too sophisticated > not a bug > > * 22535 [diffutils] REQ: regex dialect switching (for -F and -I) > RFC, I would close it as a WONTFIX > > * 22816 [diffutils] cmp --verbose EOF message could be more verbose > RFC > > * 16467 [diffutils] Diffutils 3.3 v. VMS (et al.) > could be fixed in gnulib, not a regression anyway > > Regards, > Giuseppe > From unknown Sun Jun 15 13:01:44 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 10 Apr 2016 11:24:03 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator