From unknown Sat Jun 21 10:39:32 2025 X-Loop: help-debbugs@gnu.org Subject: bug#16864: overlapping chunks with the -I option Resent-From: Vincent Lefevre Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Mon, 24 Feb 2014 14:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 16864 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: 16864@debbugs.gnu.org X-Debbugs-Original-To: bug-diffutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.13932523316624 (code B ref -1); Mon, 24 Feb 2014 14:33:03 +0000 Received: (at submit) by debbugs.gnu.org; 24 Feb 2014 14:32:11 +0000 Received: from localhost ([127.0.0.1]:37516 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WHwZm-0001im-7v for submit@debbugs.gnu.org; Mon, 24 Feb 2014 09:32:10 -0500 Received: from eggs.gnu.org ([208.118.235.92]:59212) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WHwZi-0001iF-A3 for submit@debbugs.gnu.org; Mon, 24 Feb 2014 09:32:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WHwZX-0004Qm-KO for submit@debbugs.gnu.org; Mon, 24 Feb 2014 09:32:01 -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]:60012) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WHwZX-0004Qi-HY for submit@debbugs.gnu.org; Mon, 24 Feb 2014 09:31:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60923) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WHwZS-0003eJ-LW for bug-diffutils@gnu.org; Mon, 24 Feb 2014 09:31:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WHwZN-0004OD-PN for bug-diffutils@gnu.org; Mon, 24 Feb 2014 09:31:50 -0500 Received: from ypig.lip.ens-lyon.fr ([140.77.13.48]:57423) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WHwZN-0004NG-Ip for bug-diffutils@gnu.org; Mon, 24 Feb 2014 09:31:45 -0500 Received: from vlefevre by ypig.lip.ens-lyon.fr with local (Exim 4.82) (envelope-from ) id 1WHwZF-0001CW-Mi; Mon, 24 Feb 2014 15:31:37 +0100 Date: Mon, 24 Feb 2014 15:31:37 +0100 From: Vincent Lefevre Message-ID: <20140224143137.GC5928@ypig.lip.ens-lyon.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Mailer-Info: http://www.vinc17.net/mutt/ User-Agent: Mutt/1.5.21-6305-vl-r59709 (2013-04-16) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) 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 (-----) Consider two files: file1: 1a 2 3a 4 5 6 file2: 1b 2 3b 4 5 6 7 With diff (GNU diffutils) 3.3 under Debian/unstable, I get: $ diff -u -I3 file1 file2 --- file1 2014-02-24 12:58:12.485367096 +0100 +++ file2 2014-02-24 12:58:08.879933593 +0100 @@ -1,6 +1,6 @@ -1a +1b 2 -3a +3b 4 5 6 @@ -4,3 +4,4 @@ 4 5 6 +7 i.e. with overlapping chunks. Ditto with the latest patches. Here I would expect: --- file1 2014-02-24 12:58:12.485367096 +0100 +++ file2 2014-02-24 12:58:08.879933593 +0100 @@ -1,6 +1,7 @@ -1a +1b 2 -3a +3b 4 5 6 +7 Note that if the 3rd line is the same in both files, one gets only one chunk: @@ -1,6 +1,7 @@ -1a +1b 2 3 4 5 6 +7 so that getting 2 chunks with -I is definitely unexpected. -- Vincent Lefèvre - Web: 100% accessible validated (X)HTML - Blog: Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon) From unknown Sat Jun 21 10:39:32 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.503 (Entity 5.503) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Vincent Lefevre Subject: bug#16864: closed (Re: [bug-diffutils] bug#16864: overlapping chunks with the -I option) Message-ID: References: <530C31A1.4030104@cs.ucla.edu> <20140224143137.GC5928@ypig.lip.ens-lyon.fr> X-Gnu-PR-Message: they-closed 16864 X-Gnu-PR-Package: diffutils Reply-To: 16864@debbugs.gnu.org Date: Tue, 25 Feb 2014 06:02:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1393308123-27677-1" This is a multi-part message in MIME format... ------------=_1393308123-27677-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #16864: overlapping chunks with the -I option which was filed against the diffutils package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 16864@debbugs.gnu.org. --=20 16864: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D16864 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1393308123-27677-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 16864-done) by debbugs.gnu.org; 25 Feb 2014 06:01:18 +0000 Received: from localhost ([127.0.0.1]:38465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WIB4v-0007B7-FD for submit@debbugs.gnu.org; Tue, 25 Feb 2014 01:01:18 -0500 Received: from smtp.cs.ucla.edu ([131.179.128.62]:59294) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WIB4s-0007Aq-AO for 16864-done@debbugs.gnu.org; Tue, 25 Feb 2014 01:01:15 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 515B6A60001; Mon, 24 Feb 2014 22:01:08 -0800 (PST) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id m-+u0TGdFOtF; Mon, 24 Feb 2014 22:01:06 -0800 (PST) Received: from [192.168.1.9] (pool-108-0-233-62.lsanca.fios.verizon.net [108.0.233.62]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 6E30639E8008; Mon, 24 Feb 2014 22:01:06 -0800 (PST) Message-ID: <530C31A1.4030104@cs.ucla.edu> Date: Mon, 24 Feb 2014 22:01:05 -0800 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Vincent Lefevre , 16864-done@debbugs.gnu.org Subject: Re: [bug-diffutils] bug#16864: overlapping chunks with the -I option References: <20140224143137.GC5928@ypig.lip.ens-lyon.fr> In-Reply-To: <20140224143137.GC5928@ypig.lip.ens-lyon.fr> Content-Type: multipart/mixed; boundary="------------040604040509070208020606" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 16864-done 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: -2.3 (--) This is a multi-part message in MIME format. --------------040604040509070208020606 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Thanks for reporting that. I applied the attached patches. The first fixes the bug and adds a test case, the second fixes some unlikely and hard-to-test-for integer-overflow bugs I noticed while I was in the neighborhood. --------------040604040509070208020606 Content-Type: text/plain; charset=UTF-8; name="0001-diff-fix-bug-with-I-and-overlapping-hunks.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-diff-fix-bug-with-I-and-overlapping-hunks.patch" RnJvbSAxNWY3OGExOTcwYTZkMmM1Y2Q0MTEyMzg2NGM0NGNiNjk0YjQ2ZDE0IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBNb24sIDI0IEZlYiAyMDE0IDIxOjM4OjAyIC0wODAwClN1YmplY3Q6IFtQQVRD SCAxLzJdIGRpZmY6IGZpeCBidWcgd2l0aCAtSSBhbmQgb3ZlcmxhcHBpbmcgaHVua3MKClBy b2JsZW0gcmVwb3J0ZWQgYnkgVmluY2VudCBMZWZldnJlIGluIDxodHRwOi8vYnVncy5nbnUu b3JnLzE2ODY0Pi4KKiBzcmMvY29udGV4dC5jIChmaW5kX2h1bmspOiBUaHJlc2hvbGQgaXMg Q09OVEVYVCBvbmx5IGlmCnRoZSBzZWNvbmQgY2hhbmdlIGlzIGlnbm9yYWJsZS4KKiB0ZXN0 cy9pZ25vcmUtbWF0Y2hpbmctbGluZXM6IE5ldyB0ZXN0LgoqIHRlc3RzL01ha2VmaWxlLmFt IChURVNUUyk6IEFkZCBpdC4KLS0tCiBzcmMvY29udGV4dC5jICAgICAgICAgICAgICAgfCAg NyArKystLS0tCiB0ZXN0cy9NYWtlZmlsZS5hbSAgICAgICAgICAgfCAgMSArCiB0ZXN0cy9p Z25vcmUtbWF0Y2hpbmctbGluZXMgfCA0NyArKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysKIDMgZmlsZXMgY2hhbmdlZCwgNTEgaW5zZXJ0aW9ucygrKSwg NCBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDc1NSB0ZXN0cy9pZ25vcmUtbWF0Y2hp bmctbGluZXMKCmRpZmYgLS1naXQgYS9zcmMvY29udGV4dC5jIGIvc3JjL2NvbnRleHQuYwpp bmRleCBkZDc5Zjg5Li40MmYxZWVkIDEwMDY0NAotLS0gYS9zcmMvY29udGV4dC5jCisrKyBi L3NyYy9jb250ZXh0LmMKQEAgLTQwMiw5ICs0MDIsOCBAQCBmaW5kX2h1bmsgKHN0cnVjdCBj aGFuZ2UgKnN0YXJ0KQogICBsaW4gdG9wMCwgdG9wMTsKICAgbGluIHRocmVzaDsKIAotICAv KiBUaHJlc2hvbGQgZGlzdGFuY2UgaXMgMiAqIENPTlRFWFQgKyAxIGJldHdlZW4gdHdvIG5v bi1pZ25vcmFibGUKLSAgICAgY2hhbmdlcywgYnV0IG9ubHkgQ09OVEVYVCBpZiBvbmUgaXMg aWdub3JhYmxlLiAgV2F0Y2ggb3V0IGZvcgotICAgICBpbnRlZ2VyIG92ZXJmbG93LCB0aG91 Z2guICAqLworICAvKiBUaHJlc2hvbGQgZGlzdGFuY2UgaXMgQ09OVEVYVCBpZiB0aGUgc2Vj b25kIGNoYW5nZSBpcyBpZ25vcmFibGUsCisgICAgIDIgKiBDT05URVhUICsgMSBvdGhlcndp c2UuICBXYXRjaCBvdXQgZm9yIGludGVnZXIgb3ZlcmZsb3cuICAqLwogICBsaW4gbm9uX2ln bm9yYWJsZV90aHJlc2hvbGQgPQogICAgIChMSU5fTUFYIC0gMSkgLyAyIDwgY29udGV4dCA/ IExJTl9NQVggOiAyICogY29udGV4dCArIDE7CiAgIGxpbiBpZ25vcmFibGVfdGhyZXNob2xk ID0gY29udGV4dDsKQEAgLTQxNiw3ICs0MTUsNyBAQCBmaW5kX2h1bmsgKHN0cnVjdCBjaGFu Z2UgKnN0YXJ0KQogICAgICAgdG9wMSA9IHN0YXJ0LT5saW5lMSArIHN0YXJ0LT5pbnNlcnRl ZDsKICAgICAgIHByZXYgPSBzdGFydDsKICAgICAgIHN0YXJ0ID0gc3RhcnQtPmxpbms7Ci0g ICAgICB0aHJlc2ggPSAocHJldi0+aWdub3JlIHx8IChzdGFydCAmJiBzdGFydC0+aWdub3Jl KQorICAgICAgdGhyZXNoID0gKHN0YXJ0ICYmIHN0YXJ0LT5pZ25vcmUKIAkJPyBpZ25vcmFi bGVfdGhyZXNob2xkCiAJCTogbm9uX2lnbm9yYWJsZV90aHJlc2hvbGQpOwogICAgICAgLyog SXQgaXMgbm90IHN1cHBvc2VkIHRvIG1hdHRlciB3aGljaCBmaWxlIHdlIGNoZWNrIGluIHRo ZSBlbmQtdGVzdC4KZGlmZiAtLWdpdCBhL3Rlc3RzL01ha2VmaWxlLmFtIGIvdGVzdHMvTWFr ZWZpbGUuYW0KaW5kZXggZGQyZDUxNC4uMDA1ZDlmMCAxMDA2NDQKLS0tIGEvdGVzdHMvTWFr ZWZpbGUuYW0KKysrIGIvdGVzdHMvTWFrZWZpbGUuYW0KQEAgLTcsNiArNyw3IEBAIFRFU1RT ID0gXAogICBleGNlc3Mtc2xhc2ggXAogICBoZWxwLXZlcnNpb24JXAogICBmdW5jdGlvbi1s aW5lLXZzLWxlYWRpbmctc3BhY2UgXAorICBpZ25vcmUtbWF0Y2hpbmctbGluZXMgXAogICBs YWJlbC12cy1mdW5jCVwKICAgbmV3LWZpbGUgXAogICBuby1kZXJlZmVyZW5jZSBcCmRpZmYg LS1naXQgYS90ZXN0cy9pZ25vcmUtbWF0Y2hpbmctbGluZXMgYi90ZXN0cy9pZ25vcmUtbWF0 Y2hpbmctbGluZXMKbmV3IGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMC4uNWRiOWJh MwotLS0gL2Rldi9udWxsCisrKyBiL3Rlc3RzL2lnbm9yZS1tYXRjaGluZy1saW5lcwpAQCAt MCwwICsxLDQ3IEBACisjIS9iaW4vc2gKKyMgLS1pZ25vcmUtbWF0Y2hpbmctbGluZXMKKwor IyBCdWcgcmVwb3J0ZWQgYnkgVmluY2VudCBMZWZldnJlIGluIDxodHRwOi8vYnVncy5nbnUu b3JnLzE2ODY0Pi4KKworLiAiJHtzcmNkaXI9Ln0vaW5pdC5zaCI7IHBhdGhfcHJlcGVuZF8g Li4vc3JjCisKK2ZhaWw9MAorCitjYXQgPDwnRU9GJyA+YQorMWEKKzIKKzNhCis0Cis1Cis2 CitFT0YKKworY2F0IDw8J0VPRicgPmIKKzFiCisyCiszYgorNAorNQorNgorNworRU9GCisK K2NhdCA8PCdFT0YnID5leHAKK0BAIC0xLDYgKzEsNyBAQAorLTFhCisrMWIKKyAyCistM2EK KyszYgorIDQKKyA1CisgNgorKzcKK0VPRgorCitkaWZmIC11IC0taWdub3JlLW1hdGNoaW5n LWxpbmVzIDMgYSBiID5vdXQgMj5lcnIKK3Rlc3QgJD8gPSAxIHx8IGZhaWw9MQorc2VkIDEs MmQgb3V0ID5vdXR0YWlsIHx8IGZyYW1ld29ya19mYWlsdXJlKworY29tcGFyZSBleHAgb3V0 dGFpbCB8fCBmYWlsPTEKKworRXhpdCAkZmFpbAotLSAKMS44LjUuMwoK --------------040604040509070208020606 Content-Type: text/plain; charset=UTF-8; name="0002-diff-sdiff-minor-integer-overflow-fixes.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0002-diff-sdiff-minor-integer-overflow-fixes.patch" RnJvbSAzYjdiOTc2NjExOWI4ZDE5ZWVjMmQ3M2Q0MDk2OGZkNjYyYjYwYWE2IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBNb24sIDI0IEZlYiAyMDE0IDIxOjU2OjIxIC0wODAwClN1YmplY3Q6IFtQQVRD SCAyLzJdIGRpZmYsIHNkaWZmOiBtaW5vciBpbnRlZ2VyIG92ZXJmbG93IGZpeGVzCgoqIHNy Yy9jb250ZXh0LmMgKGZpbmRfaHVuayk6ClNpbXBsaWZ5LCBub3cgdGhhdCAyICogY29udGV4 dCArIDEgY2Fubm90IG92ZXJmbG93LgoqIHNyYy9kaWZmLmMgKG1haW4pOgoqIHNyYy9zZGlm Zi5jIChpbnRlcmFjdCk6CkRvbid0IHJlbHkgb24gdW5kZWZpbmVkIGJlaGF2aW9yIG9uIHNp Z25lZCBpbnRlZ2VyIG92ZXJmbG93LgoqIHNyYy9kaWZmLmMgKG1haW4pOiBEb24ndCBsZXQg Y29udGV4dHMgZXhjZWVkIENPTlRFWFRfTUFYLgoqIHNyYy9zeXN0ZW0uaCAoQ09OVEVYVF9N QVgpOiBOZXcgbWFjcm8uCi0tLQogc3JjL2NvbnRleHQuYyB8ICA2ICsrKy0tLQogc3JjL2Rp ZmYuYyAgICB8IDE1ICsrKysrKysrLS0tLS0tLQogc3JjL3NkaWZmLmMgICB8IDEwICsrKysr Ky0tLS0KIHNyYy9zeXN0ZW0uaCAgfCAgNSArKysrKwogNCBmaWxlcyBjaGFuZ2VkLCAyMiBp bnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvY29udGV4 dC5jIGIvc3JjL2NvbnRleHQuYwppbmRleCA0MmYxZWVkLi4zMjA1M2QxIDEwMDY0NAotLS0g YS9zcmMvY29udGV4dC5jCisrKyBiL3NyYy9jb250ZXh0LmMKQEAgLTQwMywxMCArNDAzLDEw IEBAIGZpbmRfaHVuayAoc3RydWN0IGNoYW5nZSAqc3RhcnQpCiAgIGxpbiB0aHJlc2g7CiAK ICAgLyogVGhyZXNob2xkIGRpc3RhbmNlIGlzIENPTlRFWFQgaWYgdGhlIHNlY29uZCBjaGFu Z2UgaXMgaWdub3JhYmxlLAotICAgICAyICogQ09OVEVYVCArIDEgb3RoZXJ3aXNlLiAgV2F0 Y2ggb3V0IGZvciBpbnRlZ2VyIG92ZXJmbG93LiAgKi8KLSAgbGluIG5vbl9pZ25vcmFibGVf dGhyZXNob2xkID0KLSAgICAoTElOX01BWCAtIDEpIC8gMiA8IGNvbnRleHQgPyBMSU5fTUFY IDogMiAqIGNvbnRleHQgKyAxOworICAgICAyICogQ09OVEVYVCArIDEgb3RoZXJ3aXNlLiAg SW50ZWdlciBvdmVyZmxvdyBjYW4ndCBoYXBwZW4sIGR1ZQorICAgICB0byBDT05URVhUX0xJ TS4gICovCiAgIGxpbiBpZ25vcmFibGVfdGhyZXNob2xkID0gY29udGV4dDsKKyAgbGluIG5v bl9pZ25vcmFibGVfdGhyZXNob2xkID0gMiAqIGNvbnRleHQgKyAxOwogCiAgIGRvCiAgICAg ewpkaWZmIC0tZ2l0IGEvc3JjL2RpZmYuYyBiL3NyYy9kaWZmLmMKaW5kZXggNTBkMDM2NS4u YzZiYTVmNiAxMDA2NDQKLS0tIGEvc3JjL2RpZmYuYworKysgYi9zcmMvZGlmZi5jCkBAIC0z MDQsMTEgKzMwNCwxMiBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAJY2FzZSAn Nyc6CiAJY2FzZSAnOCc6CiAJY2FzZSAnOSc6Ci0JICBpZiAoISBJU0RJR0lUIChwcmV2KSkK LQkgICAgb2NvbnRleHQgPSBjIC0gJzAnOwotCSAgZWxzZSBpZiAoTElOX01BWCAvIDEwIDwg b2NvbnRleHQKLQkJICAgfHwgKChvY29udGV4dCA9IDEwICogb2NvbnRleHQgKyBjIC0gJzAn KSA8IDApKQotCSAgICBvY29udGV4dCA9IExJTl9NQVg7CisJICBvY29udGV4dCA9ICghIElT RElHSVQgKHByZXYpCisJCSAgICAgID8gYyAtICcwJworCQkgICAgICA6IChvY29udGV4dCAt IChjIC0gJzAnIDw9IENPTlRFWFRfTUFYICUgMTApCisJCQkgPCBDT05URVhUX01BWCAvIDEw KQorCQkgICAgICA/IDEwICogb2NvbnRleHQgKyAoYyAtICcwJykKKwkJICAgICAgOiBDT05U RVhUX01BWCk7CiAJICBicmVhazsKIAogCWNhc2UgJ2EnOgpAQCAtMzM3LDggKzMzOCw4IEBA IG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKIAkJbnVtdmFsID0gc3RydG91bWF4IChv cHRhcmcsICZudW1lbmQsIDEwKTsKIAkJaWYgKCpudW1lbmQpCiAJCSAgdHJ5X2hlbHAgKCJp bnZhbGlkIGNvbnRleHQgbGVuZ3RoICclcyciLCBvcHRhcmcpOwotCQlpZiAoTElOX01BWCA8 IG51bXZhbCkKLQkJICBudW12YWwgPSBMSU5fTUFYOworCQlpZiAoQ09OVEVYVF9NQVggPCBu dW12YWwpCisJCSAgbnVtdmFsID0gQ09OVEVYVF9NQVg7CiAJICAgICAgfQogCSAgICBlbHNl CiAJICAgICAgbnVtdmFsID0gMzsKZGlmZiAtLWdpdCBhL3NyYy9zZGlmZi5jIGIvc3JjL3Nk aWZmLmMKaW5kZXggZTdiYzY1Ny4uMzI5ZmE1MiAxMDA2NDQKLS0tIGEvc3JjL3NkaWZmLmMK KysrIGIvc3JjL3NkaWZmLmMKQEAgLTEwOTksMTIgKzEwOTksMTQgQEAgaW50ZXJhY3QgKHN0 cnVjdCBsaW5lX2ZpbHRlciAqZGlmZiwKIAkgIHVpbnRtYXhfdCB2YWw7CiAJICBsaW4gbGxl biwgcmxlbiwgbGVubWF4OwogCSAgZXJybm8gPSAwOwotCSAgbGxlbiA9IHZhbCA9IHN0cnRv dW1heCAoZGlmZl9oZWxwICsgMSwgJm51bWVuZCwgMTApOwotCSAgaWYgKGxsZW4gPCAwIHx8 IGxsZW4gIT0gdmFsIHx8IGVycm5vIHx8ICpudW1lbmQgIT0gJywnKQorCSAgdmFsID0gc3Ry dG91bWF4IChkaWZmX2hlbHAgKyAxLCAmbnVtZW5kLCAxMCk7CisJICBpZiAoTElOX01BWCA8 IHZhbCB8fCBlcnJubyB8fCAqbnVtZW5kICE9ICcsJykKIAkgICAgZmF0YWwgKGRpZmZfaGVs cCk7Ci0JICBybGVuID0gdmFsID0gc3RydG91bWF4IChudW1lbmQgKyAxLCAmbnVtZW5kLCAx MCk7Ci0JICBpZiAocmxlbiA8IDAgfHwgcmxlbiAhPSB2YWwgfHwgZXJybm8gfHwgKm51bWVu ZCkKKwkgIGxsZW4gPSB2YWw7CisJICB2YWwgPSBzdHJ0b3VtYXggKG51bWVuZCArIDEsICZu dW1lbmQsIDEwKTsKKwkgIGlmIChMSU5fTUFYIDwgdmFsIHx8IGVycm5vIHx8ICpudW1lbmQp CiAJICAgIGZhdGFsIChkaWZmX2hlbHApOworCSAgcmxlbiA9IHZhbDsKIAogCSAgbGVubWF4 ID0gTUFYIChsbGVuLCBybGVuKTsKIApkaWZmIC0tZ2l0IGEvc3JjL3N5c3RlbS5oIGIvc3Jj L3N5c3RlbS5oCmluZGV4IGYzOWZmZjAuLjFmODFhNzIgMTAwNjQ0Ci0tLSBhL3NyYy9zeXN0 ZW0uaAorKysgYi9zcmMvc3lzdGVtLmgKQEAgLTEzNSw2ICsxMzUsMTEgQEAgdHlwZWRlZiBw dHJkaWZmX3QgbGluOwogdmVyaWZ5IChUWVBFX1NJR05FRCAobGluKSk7CiB2ZXJpZnkgKHNp emVvZiAocHRyZGlmZl90KSA8PSBzaXplb2YgKGxpbikpOwogdmVyaWZ5IChzaXplb2YgKGxp bikgPD0gc2l6ZW9mIChsb25nIGludCkpOworCisvKiBMaW1pdCBzbyB0aGF0IDIgKiBDT05U RVhUICsgMSBkb2VzIG5vdCBvdmVyZmxvdy4gICovCisKKyNkZWZpbmUgQ09OVEVYVF9NQVgg KChMSU5fTUFYIC0gMSkgLyAyKQorCiAMCiAvKiBUaGlzIHNlY3Rpb24gY29udGFpbnMgUE9T SVgtY29tcGxpYW50IGRlZmF1bHRzIGZvciBtYWNyb3MKICAgIHRoYXQgYXJlIG1lYW50IHRv IGJlIG92ZXJyaWRkZW4gYnkgaGFuZCBpbiBjb25maWcuaCBhcyBuZWVkZWQuICAqLwotLSAK MS44LjUuMwoK --------------040604040509070208020606-- ------------=_1393308123-27677-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 24 Feb 2014 14:32:11 +0000 Received: from localhost ([127.0.0.1]:37516 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WHwZm-0001im-7v for submit@debbugs.gnu.org; Mon, 24 Feb 2014 09:32:10 -0500 Received: from eggs.gnu.org ([208.118.235.92]:59212) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WHwZi-0001iF-A3 for submit@debbugs.gnu.org; Mon, 24 Feb 2014 09:32:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WHwZX-0004Qm-KO for submit@debbugs.gnu.org; Mon, 24 Feb 2014 09:32:01 -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]:60012) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WHwZX-0004Qi-HY for submit@debbugs.gnu.org; Mon, 24 Feb 2014 09:31:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60923) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WHwZS-0003eJ-LW for bug-diffutils@gnu.org; Mon, 24 Feb 2014 09:31:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WHwZN-0004OD-PN for bug-diffutils@gnu.org; Mon, 24 Feb 2014 09:31:50 -0500 Received: from ypig.lip.ens-lyon.fr ([140.77.13.48]:57423) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WHwZN-0004NG-Ip for bug-diffutils@gnu.org; Mon, 24 Feb 2014 09:31:45 -0500 Received: from vlefevre by ypig.lip.ens-lyon.fr with local (Exim 4.82) (envelope-from ) id 1WHwZF-0001CW-Mi; Mon, 24 Feb 2014 15:31:37 +0100 Date: Mon, 24 Feb 2014 15:31:37 +0100 From: Vincent Lefevre To: bug-diffutils@gnu.org Subject: overlapping chunks with the -I option Message-ID: <20140224143137.GC5928@ypig.lip.ens-lyon.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Mailer-Info: http://www.vinc17.net/mutt/ User-Agent: Mutt/1.5.21-6305-vl-r59709 (2013-04-16) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). 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 (-----) Consider two files: file1: 1a 2 3a 4 5 6 file2: 1b 2 3b 4 5 6 7 With diff (GNU diffutils) 3.3 under Debian/unstable, I get: $ diff -u -I3 file1 file2 --- file1 2014-02-24 12:58:12.485367096 +0100 +++ file2 2014-02-24 12:58:08.879933593 +0100 @@ -1,6 +1,6 @@ -1a +1b 2 -3a +3b 4 5 6 @@ -4,3 +4,4 @@ 4 5 6 +7 i.e. with overlapping chunks. Ditto with the latest patches. Here I would expect: --- file1 2014-02-24 12:58:12.485367096 +0100 +++ file2 2014-02-24 12:58:08.879933593 +0100 @@ -1,6 +1,7 @@ -1a +1b 2 -3a +3b 4 5 6 +7 Note that if the 3rd line is the same in both files, one gets only one chunk: @@ -1,6 +1,7 @@ -1a +1b 2 3 4 5 6 +7 so that getting 2 chunks with -I is definitely unexpected. -- Vincent Lefèvre - Web: 100% accessible validated (X)HTML - Blog: Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon) ------------=_1393308123-27677-1-- From unknown Sat Jun 21 10:39:32 2025 X-Loop: help-debbugs@gnu.org Subject: bug#16864: [bug-diffutils] bug#16864: bug#16864: overlapping chunks with the -I option Resent-From: Jim Meyering Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Tue, 25 Feb 2014 16:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16864 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: 16864@debbugs.gnu.org, Paul Eggert , Vincent Lefevre Cc: 16864-done@debbugs.gnu.org Received: via spool by 16864-submit@debbugs.gnu.org id=B16864.13933453466728 (code B ref 16864); Tue, 25 Feb 2014 16:23:01 +0000 Received: (at 16864) by debbugs.gnu.org; 25 Feb 2014 16:22:26 +0000 Received: from localhost ([127.0.0.1]:39595 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WIKm1-0001kM-Hz for submit@debbugs.gnu.org; Tue, 25 Feb 2014 11:22:25 -0500 Received: from mail-pb0-f43.google.com ([209.85.160.43]:42161) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WIKlx-0001k2-J8; Tue, 25 Feb 2014 11:22:22 -0500 Received: by mail-pb0-f43.google.com with SMTP id ma3so5644950pbc.16 for ; Tue, 25 Feb 2014 08:22:15 -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=8ELbyaJFy5MeMGQlYBAno0EXCKOjBDC65jPP7JT02VE=; b=Lrel1jSci/OkoSZIDg3jcuqBGStSL/VsJLbmVKQRraQXbmgVjHSlpiKlXiuuPH3N1i X2lZy73+sijEljlOAJtsMrNrSQQQOZU4r9t6xl5KIVaskV8xiyDChjX0+WZ2fcm/Tw1b xgmcGnFigxEUdrECW+Lcv3vesAK1TAER5xTGPWEgAZeqf05oylCoHNRFD2ZAc1V2UC39 5MjdyUYITDRctkOOUq8Msi7SjOr57UxSWpDkFsVwJ5DLRBRRzIHMQsJaHGLE16/cAmnh QIq8paM6MKQxdrlmZTFWxsUfOHCjuZw6bi/BkCgCABPEWyH9piJy/n5w82pHaCDmlWzC f/UA== X-Received: by 10.68.130.234 with SMTP id oh10mr663358pbb.136.1393345334791; Tue, 25 Feb 2014 08:22:14 -0800 (PST) MIME-Version: 1.0 Received: by 10.68.201.231 with HTTP; Tue, 25 Feb 2014 08:21:54 -0800 (PST) In-Reply-To: <530C31A1.4030104@cs.ucla.edu> References: <20140224143137.GC5928@ypig.lip.ens-lyon.fr> <530C31A1.4030104@cs.ucla.edu> From: Jim Meyering Date: Tue, 25 Feb 2014 08:21:54 -0800 X-Google-Sender-Auth: 1On8W-jw_fWhM5kaYzwwdEz0gl4 Message-ID: Content-Type: text/plain; charset=ISO-8859-1 X-Spam-Score: -0.7 (/) 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: -0.7 (/) On Mon, Feb 24, 2014 at 10:01 PM, Paul Eggert wrote: > Thanks for reporting that. I applied the attached patches. The first fixes > the bug and adds a test case, the second fixes some unlikely and > hard-to-test-for integer-overflow bugs I noticed while I was in the > neighborhood. Nice!