From unknown Sat Jun 14 19:06:11 2025 X-Loop: help-debbugs@gnu.org Subject: bug#17306: grep: skip checking of multibyte character boundary, reaching at eolbyte Resent-From: Norihiro Tanaka Original-Sender: "Debbugs-submit" Resent-CC: bug-grep@gnu.org Resent-Date: Mon, 21 Apr 2014 12:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 17306 X-GNU-PR-Package: grep X-GNU-PR-Keywords: To: 17306@debbugs.gnu.org X-Debbugs-Original-To: bug-grep@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.13980832892877 (code B ref -1); Mon, 21 Apr 2014 12:29:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Apr 2014 12:28:09 +0000 Received: from localhost ([127.0.0.1]:53861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WcDKR-0000kI-Ul for submit@debbugs.gnu.org; Mon, 21 Apr 2014 08:28:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33248) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WcDKN-0000k2-Ou for submit@debbugs.gnu.org; Mon, 21 Apr 2014 08:28:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcDKE-00040l-LD for submit@debbugs.gnu.org; Mon, 21 Apr 2014 08:28:03 -0400 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]:44177) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcDKE-00040f-HY for submit@debbugs.gnu.org; Mon, 21 Apr 2014 08:27:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcDK6-0001od-QW for bug-grep@gnu.org; Mon, 21 Apr 2014 08:27:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcDJz-0003zr-5u for bug-grep@gnu.org; Mon, 21 Apr 2014 08:27:46 -0400 Received: from mailgw01.kcn.ne.jp ([61.86.7.208]:54546) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcDJy-0003zm-TL for bug-grep@gnu.org; Mon, 21 Apr 2014 08:27:39 -0400 Received: from imp03 (mailgw7.kcn.ne.jp [61.86.15.238]) by mailgw01.kcn.ne.jp (Postfix) with ESMTP id A785B80249 for ; Mon, 21 Apr 2014 21:27:34 +0900 (JST) Received: from mail07.kcn.ne.jp ([61.86.6.186]) by imp03 with bizsmtp id scTa1n00940oyB901cTauA; Mon, 21 Apr 2014 21:27:34 +0900 X-OrgRCPT: bug-grep@gnu.org Received: from [10.120.1.56] (i118-21-128-66.s30.a048.ap.plala.or.jp [118.21.128.66]) by mail07.kcn.ne.jp (Postfix) with ESMTPA id 3FAFED5009B for ; Mon, 21 Apr 2014 21:27:34 +0900 (JST) Date: Mon, 21 Apr 2014 21:27:34 +0900 From: Norihiro Tanaka Message-Id: <20140421212723.9632.27F6AC2D@kcn.ne.jp> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------_5348D690000000002C12_MULTIPART_MIXED_" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.65.07 [ja] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x 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: -4.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: -4.0 (----) --------_5348D690000000002C12_MULTIPART_MIXED_ Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit In dfaexec(), if reaches at eolbyte, we can skip checking of multibyte character boundary. So then process mbp until here. Norihiro --------_5348D690000000002C12_MULTIPART_MIXED_ Content-Type: text/plain; charset="UTF-8"; name="patch.txt" Content-Disposition: attachment; filename="patch.txt" Content-Transfer-Encoding: base64 RnJvbSBlMjNmNTVkODVlYWYwOGE3ZTE4Zjg0ZjEzZjZjNjlmYTIzOWM5ZGM2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOb3JpaGlybyBUYW5ha2EgPG5vcml0bmtAa2NuLm5lLmpwPgpE YXRlOiBNb24sIDE0IEFwciAyMDE0IDA5OjA4OjA5ICswOTAwClN1YmplY3Q6IFtQQVRDSF0gZ3Jl cDogc2tpcCBjaGVja2luZyBvZiBtdWx0aWJ5dGUgY2hhcmFjdGVyIGJvdW5kYXJ5LCByZWFjaGlu ZwogYXQgZW9sYnl0ZQoKKiBzcmMvZGZhLmMgKGRmYWV4ZWMpOiBTa2lwIGNoZWNraW5nIG9mIG11 bHRpYnl0ZSBjaGFyYWN0ZXIgYm91bmRhcnksCnJlYWNoaW5nIGF0IGVvbGJ5dGUuCi0tLQogc3Jj L2RmYS5jIHwgMTQgKysrKysrKysrKy0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMCBpbnNlcnRpb25z KCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9kZmEuYyBiL3NyYy9kZmEuYwpp bmRleCBjOTNmNDUxLi45OGVkOGU3IDEwMDY0NAotLS0gYS9zcmMvZGZhLmMKKysrIGIvc3JjL2Rm YS5jCkBAIC0zMzUyLDEwICszMzUyLDYgQEAgZGZhZXhlYyAoc3RydWN0IGRmYSAqZCwgY2hhciBj b25zdCAqYmVnaW4sIGNoYXIgKmVuZCwKICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQog Ci0gICAgICAvKiBJZiB0aGUgcHJldmlvdXMgY2hhcmFjdGVyIHdhcyBhIG5ld2xpbmUsIGNvdW50 IGl0LiAgKi8KLSAgICAgIGlmICgoY2hhciAqKSBwIDw9IGVuZCAmJiBwWy0xXSA9PSBlb2wgJiYg Y291bnQpCi0gICAgICAgICsrKmNvdW50OwotCiAgICAgICAvKiBDaGVjayBpZiB3ZSd2ZSBydW4g b2ZmIHRoZSBlbmQgb2YgdGhlIGJ1ZmZlci4gICovCiAgICAgICBpZiAoKGNoYXIgKikgcCA+IGVu ZCkKICAgICAgICAgewpAQCAtMzM2Myw2ICszMzU5LDE2IEBAIGRmYWV4ZWMgKHN0cnVjdCBkZmEg KmQsIGNoYXIgY29uc3QgKmJlZ2luLCBjaGFyICplbmQsCiAgICAgICAgICAgcmV0dXJuIE5VTEw7 CiAgICAgICAgIH0KIAorICAgICAgLyogSWYgdGhlIHByZXZpb3VzIGNoYXJhY3RlciB3YXMgYSBu ZXdsaW5lLCBjb3VudCBpdCwgYW5kIHNraXAKKyAgICAgICAgIGNoZWNraW5nIG9mIG11bHRpYnl0 ZSBjaGFyYWN0ZXIgYm91bmRhcnkgdW50aWwgaGVyZS4gICovCisgICAgICBpZiAocFstMV0gPT0g ZW9sKQorICAgICAgICB7CisgICAgICAgICAgaWYgKGNvdW50KQorICAgICAgICAgICAgKysqY291 bnQ7CisgICAgICAgICAgaWYgKGQtPm1iX2N1cl9tYXggPiAxKQorICAgICAgICAgICAgbWJwID0g cDsKKyAgICAgICAgfQorCiAgICAgICBpZiAocyA+PSAwKQogICAgICAgICB7CiAgICAgICAgICAg aWYgKCFkLT50cmFuc1tzXSkKLS0gCjEuOS4yCgo= --------_5348D690000000002C12_MULTIPART_MIXED_-- From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 21 11:00:41 2014 Received: (at control) by debbugs.gnu.org; 21 Apr 2014 15:00:41 +0000 Received: from localhost ([127.0.0.1]:54251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WcFi4-0006kT-A0 for submit@debbugs.gnu.org; Mon, 21 Apr 2014 11:00:40 -0400 Received: from smtp.cs.ucla.edu ([131.179.128.62]:59308) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WcFi0-0006kH-St for control@debbugs.gnu.org; Mon, 21 Apr 2014 11:00:37 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 4376839E8011 for ; Mon, 21 Apr 2014 08:00:36 -0700 (PDT) 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 V4jos8soXJO9 for ; Mon, 21 Apr 2014 08:00:27 -0700 (PDT) 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 BA780A60002 for ; Mon, 21 Apr 2014 08:00:27 -0700 (PDT) Message-ID: <5355328A.7050206@cs.ucla.edu> Date: Mon, 21 Apr 2014 08:00:26 -0700 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: control@debbugs.gnu.org Subject: 17306 has a patch Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -3.0 (---) X-Debbugs-Envelope-To: control 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: -3.0 (---) tags 17306 + patch From unknown Sat Jun 14 19:06:11 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: Norihiro Tanaka Subject: bug#17306: closed (Re: bug#17306: grep: skip checking of multibyte character boundary, reaching at eolbyte) Message-ID: References: <5359B334.7050202@cs.ucla.edu> <20140421212723.9632.27F6AC2D@kcn.ne.jp> X-Gnu-PR-Message: they-closed 17306 X-Gnu-PR-Package: grep X-Gnu-PR-Keywords: patch Reply-To: 17306@debbugs.gnu.org Date: Fri, 25 Apr 2014 00:59:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1398387543-11476-1" This is a multi-part message in MIME format... ------------=_1398387543-11476-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #17306: grep: skip checking of multibyte character boundary, reaching at eo= lbyte which was filed against the grep package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 17306@debbugs.gnu.org. --=20 17306: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D17306 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1398387543-11476-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 17306-done) by debbugs.gnu.org; 25 Apr 2014 00:58:38 +0000 Received: from localhost ([127.0.0.1]:57567 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WdUTN-0002y8-D5 for submit@debbugs.gnu.org; Thu, 24 Apr 2014 20:58:38 -0400 Received: from smtp.cs.ucla.edu ([131.179.128.62]:48811) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WdUTI-0002xv-DB for 17306-done@debbugs.gnu.org; Thu, 24 Apr 2014 20:58:33 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 806E039E8016; Thu, 24 Apr 2014 17:58:31 -0700 (PDT) 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 WkZTu8FIpRec; Thu, 24 Apr 2014 17:58:28 -0700 (PDT) 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 C965639E8018; Thu, 24 Apr 2014 17:58:28 -0700 (PDT) Message-ID: <5359B334.7050202@cs.ucla.edu> Date: Thu, 24 Apr 2014 17:58:28 -0700 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Norihiro Tanaka , 17306-done@debbugs.gnu.org Subject: Re: bug#17306: grep: skip checking of multibyte character boundary, reaching at eolbyte References: <20140421212723.9632.27F6AC2D@kcn.ne.jp> In-Reply-To: <20140421212723.9632.27F6AC2D@kcn.ne.jp> Content-Type: multipart/mixed; boundary="------------010706010801030805040907" X-Spam-Score: -3.0 (---) X-Debbugs-Envelope-To: 17306-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: -3.0 (---) This is a multi-part message in MIME format. --------------010706010801030805040907 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Norihiro Tanaka wrote: > In dfaexec(), if reaches at eolbyte, we can skip checking of multibyte > character boundary. So then process mbp until here. Thanks, I installed that. The "mbp = p" assignment can be done unconditionally. Some of the other code in the neighborhood can stand some minor cleanups too, so I did that as per the attached patches. --------------010706010801030805040907 Content-Type: text/plain; charset=UTF-8; name="0001-dfa-simplify-and-be-more-consistent-about-MB_CUR_MAX.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-dfa-simplify-and-be-more-consistent-about-MB_CUR_MAX.pa"; filename*1="tch" RnJvbSA3NTJlMmRlNjc5MmI5MjgwODRhZjhkMDIyYTJlMzQxODMzNDQ3ZTFmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBUaHUsIDI0IEFwciAyMDE0IDE2OjI3OjA5IC0wNzAwClN1YmplY3Q6IFtQQVRD SCAxLzJdIGRmYTogc2ltcGxpZnkgYW5kIGJlIG1vcmUgY29uc2lzdGVudCBhYm91dCBNQl9D VVJfTUFYCgoqIHNyYy9kZmEuYyAoc3RydWN0IGRmYSk6IE5ldyBtZW1iZXIgJ211bHRpYnl0 ZScsCnJlcGxhY2luZyAnbWJfY3VyX21heCcuICBBbGwgdXNlcyBjaGFuZ2VkLiAgVXNlIHRo aXMgbmV3IG1lbWJlcgpjb25zaXN0ZW50bHksIGluc3RlYWQgb2Ygc29tZXRpbWVzIHJlZmVy cmluZyB0byBNQl9DVVJfTUFYIGRpcmVjdGx5LgoKZGZhOiBmaXggY29tbWVudAoqIHNyYy9k ZmEuYyAobWF5YmVfcmVhbGxvYyk6IEZpeCBjb21tZW50IHRvIG1hdGNoIGJlaGF2aW9yIGJl dHRlci4KLS0tCiBzcmMvZGZhLmMgfCA2NiArKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAz MyBpbnNlcnRpb25zKCspLCAzMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvZGZh LmMgYi9zcmMvZGZhLmMKaW5kZXggOWZmN2U2NS4uN2E5OWQzZiAxMDA2NDQKLS0tIGEvc3Jj L2RmYS5jCisrKyBiL3NyYy9kZmEuYwpAQCAtMzM3LDExICszMzcsMTEgQEAgc3RydWN0IGRm YQogICBzaXplX3QgbmxlYXZlczsgICAgICAgICAgICAgICAvKiBOdW1iZXIgb2YgbGVhdmVz IG9uIHRoZSBwYXJzZSB0cmVlLiAgKi8KICAgc2l6ZV90IG5yZWdleHBzOyAgICAgICAgICAg ICAgLyogQ291bnQgb2YgcGFyYWxsZWwgcmVnZXhwcyBiZWluZyBidWlsdAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB3aXRoIGRmYXBhcnNlLiAgKi8KLSAgdW5zaWdu ZWQgaW50IG1iX2N1cl9tYXg7ICAgICAgLyogQ2FjaGVkIHZhbHVlIG9mIE1CX0NVUl9NQVgu ICAqLworICBib29sIG11bHRpYnl0ZTsJCS8qIFRydWUgaWZmIE1CX0NVUl9NQVggPiAxLiAg Ki8KICAgdG9rZW4gdXRmOF9hbnljaGFyX2NsYXNzZXNbNV07IC8qIFRvIGxvd2VyIEFOWUNI QVIgaW4gVVRGLTggbG9jYWxlcy4gICovCiAgIG1ic3RhdGVfdCBtYnM7CQkvKiBNdWx0aWJ5 dGUgY29udmVyc2lvbiBzdGF0ZS4gICovCiAKLSAgLyogVGhlIGZvbGxvd2luZyBhcmUgdmFs aWQgb25seSBpZiBtYl9jdXJfbWF4ID4gMS4gICovCisgIC8qIFRoZSBmb2xsb3dpbmcgYXJl IHZhbGlkIG9ubHkgaWYgTUJfQ1VSX01BWCA+IDEuICAqLwogCiAgIC8qIFRoZSB2YWx1ZSBv ZiBtdWx0aWJ5dGVfcHJvcFtpXSBpcyBkZWZpbmVkIGJ5IGZvbGxvd2luZyBydWxlLgogICAg ICBpZiB0b2tlbnNbaV0gPCBOT1RDSEFSCkBAIC04MTMsNyArODEzLDcgQEAgdXNpbmdfc2lt cGxlX2xvY2FsZSAodm9pZCkKICAgICAgJiYgJ30nID09IDEyNSAmJiAnficgPT0gMTI2KQog ICB9OwogCi0gIGlmICghIG5hdGl2ZV9jX2NoYXJzZXQgfHwgTUJfQ1VSX01BWCA+IDEpCisg IGlmICghIG5hdGl2ZV9jX2NoYXJzZXQgfHwgZGZhLT5tdWx0aWJ5dGUpCiAgICAgcmV0dXJu IGZhbHNlOwogICBlbHNlCiAgICAgewpAQCAtOTkxLDcgKzk5MSw3IEBAIHBhcnNlX2JyYWNr ZXRfZXhwICh2b2lkKQogICBzaXplX3QgY2hhcnNfYWwsIHJhbmdlc19hbCwgY2hfY2xhc3Nl c19hbCwgZXF1aXZzX2FsLCBjb2xsX2VsZW1zX2FsOwogCiAgIGNoYXJzX2FsID0gcmFuZ2Vz X2FsID0gY2hfY2xhc3Nlc19hbCA9IGVxdWl2c19hbCA9IGNvbGxfZWxlbXNfYWwgPSAwOwot ICBpZiAoTUJfQ1VSX01BWCA+IDEpCisgIGlmIChkZmEtPm11bHRpYnl0ZSkKICAgICB7CiAg ICAgICBkZmEtPm1iY3NldHMgPSBtYXliZV9yZWFsbG9jIChkZmEtPm1iY3NldHMsIGRmYS0+ bm1iY3NldHMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmZGZhLT5t YmNzZXRzX2FsbG9jLApAQCAtMTA2Nyw3ICsxMDY3LDcgQEAgcGFyc2VfYnJhY2tldF9leHAg KHZvaWQpCiAgICAgICAgICAgICAgICAgICBpZiAoIXByZWQpCiAgICAgICAgICAgICAgICAg ICAgIGRmYWVycm9yIChfKCJpbnZhbGlkIGNoYXJhY3RlciBjbGFzcyIpKTsKIAotICAgICAg ICAgICAgICAgICAgaWYgKE1CX0NVUl9NQVggPiAxICYmICFwcmVkLT5zaW5nbGVfYnl0ZV9v bmx5KQorICAgICAgICAgICAgICAgICAgaWYgKGRmYS0+bXVsdGlieXRlICYmICFwcmVkLT5z aW5nbGVfYnl0ZV9vbmx5KQogICAgICAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAg ICAgICAgICAgLyogU3RvcmUgdGhlIGNoYXJhY3RlciBjbGFzcyBhcyB3Y3R5cGVfdC4gICov CiAgICAgICAgICAgICAgICAgICAgICAgd2N0eXBlX3Qgd3QgPSB3Y3R5cGUgKGNsYXNzKTsK QEAgLTExMjIsNyArMTEyMiw3IEBAIHBhcnNlX2JyYWNrZXRfZXhwICh2b2lkKQogICAgICAg ICAgICAgICBpZiAoYzIgPT0gJ1xcJyAmJiAoc3ludGF4X2JpdHMgJiBSRV9CQUNLU0xBU0hf RVNDQVBFX0lOX0xJU1RTKSkKICAgICAgICAgICAgICAgICBGRVRDSF9XQyAoYzIsIHdjMiwg XygidW5iYWxhbmNlZCBbIikpOwogCi0gICAgICAgICAgICAgIGlmIChNQl9DVVJfTUFYID4g MSkKKyAgICAgICAgICAgICAgaWYgKGRmYS0+bXVsdGlieXRlKQogICAgICAgICAgICAgICAg IHsKICAgICAgICAgICAgICAgICAgIC8qIFdoZW4gY2FzZSBmb2xkaW5nIG1hcCBhIHJhbmdl LCBzYXkgW20tel0gKG9yIGV2ZW4gW00tel0pCiAgICAgICAgICAgICAgICAgICAgICB0byB0 aGUgcGFpciBvZiByYW5nZXMsIFttLXpdIFtNLVpdLiAgQWx0aG91Z2ggdGhpcyBjb2RlCkBA IC0xMTc1LDcgKzExNzUsNyBAQCBwYXJzZV9icmFja2V0X2V4cCAodm9pZCkKIAogICAgICAg Y29sb25fd2FybmluZ19zdGF0ZSB8PSAoYyA9PSAnOicpID8gMiA6IDQ7CiAKLSAgICAgIGlm IChNQl9DVVJfTUFYID09IDEpCisgICAgICBpZiAoIWRmYS0+bXVsdGlieXRlKQogICAgICAg ICB7CiAgICAgICAgICAgaWYgKGNhc2VfZm9sZCkKICAgICAgICAgICAgIHNldGJpdF9jYXNl X2ZvbGRfYyAoYywgY2NsKTsKQEAgLTEyMTAsNyArMTIxMCw3IEBAIHBhcnNlX2JyYWNrZXRf ZXhwICh2b2lkKQogICBpZiAoISBrbm93bl9icmFja2V0X2V4cCkKICAgICByZXR1cm4gQkFD S1JFRjsKIAotICBpZiAoTUJfQ1VSX01BWCA+IDEpCisgIGlmIChkZmEtPm11bHRpYnl0ZSkK ICAgICB7CiAgICAgICBzdGF0aWMgY2hhcmNsYXNzIHplcm9jbGFzczsKICAgICAgIHdvcmtf bWJjLT5pbnZlcnQgPSBpbnZlcnQ7CkBAIC0xMjIwLDcgKzEyMjAsNyBAQCBwYXJzZV9icmFj a2V0X2V4cCAodm9pZCkKIAogICBpZiAoaW52ZXJ0KQogICAgIHsKLSAgICAgIGFzc2VydCAo TUJfQ1VSX01BWCA9PSAxKTsKKyAgICAgIGFzc2VydCAoIWRmYS0+bXVsdGlieXRlKTsKICAg ICAgIG5vdHNldCAoY2NsKTsKICAgICAgIGlmIChzeW50YXhfYml0cyAmIFJFX0hBVF9MSVNU U19OT1RfTkVXTElORSkKICAgICAgICAgY2xyYml0IChlb2xieXRlLCBjY2wpOwpAQCAtMTQ0 Niw3ICsxNDQ2LDcgQEAgbGV4ICh2b2lkKQogICAgICAgICBjYXNlICcuJzoKICAgICAgICAg ICBpZiAoYmFja3NsYXNoKQogICAgICAgICAgICAgZ290byBub3JtYWxfY2hhcjsKLSAgICAg ICAgICBpZiAoTUJfQ1VSX01BWCA+IDEpCisgICAgICAgICAgaWYgKGRmYS0+bXVsdGlieXRl KQogICAgICAgICAgICAgewogICAgICAgICAgICAgICAvKiBJbiBtdWx0aWJ5dGUgZW52aXJv bm1lbnQgcGVyaW9kIG11c3QgbWF0Y2ggd2l0aCBhIHNpbmdsZQogICAgICAgICAgICAgICAg ICBjaGFyYWN0ZXIgbm90IGEgYnl0ZS4gIFNvIHdlIHVzZSBBTllDSEFSLiAgKi8KQEAgLTE0 NjYsNyArMTQ2Niw3IEBAIGxleCAodm9pZCkKICAgICAgICAgY2FzZSAnUyc6CiAgICAgICAg ICAgaWYgKCFiYWNrc2xhc2ggfHwgKHN5bnRheF9iaXRzICYgUkVfTk9fR05VX09QUykpCiAg ICAgICAgICAgICBnb3RvIG5vcm1hbF9jaGFyOwotICAgICAgICAgIGlmIChNQl9DVVJfTUFY ID09IDEpCisgICAgICAgICAgaWYgKCFkZmEtPm11bHRpYnl0ZSkKICAgICAgICAgICAgIHsK ICAgICAgICAgICAgICAgemVyb3NldCAoY2NsKTsKICAgICAgICAgICAgICAgZm9yIChjMiA9 IDA7IGMyIDwgTk9UQ0hBUjsgKytjMikKQEAgLTE1MzEsNyArMTUzMSw3IEBAIGxleCAodm9p ZCkKICAgICAgICAgICBsYXN0c3RhcnQgPSBmYWxzZTsKICAgICAgICAgICAvKiBGb3IgbXVs dGlieXRlIGNoYXJhY3RlciBzZXRzLCBmb2xkaW5nIGlzIGRvbmUgaW4gYXRvbS4gIEFsd2F5 cwogICAgICAgICAgICAgIHJldHVybiBXQ0hBUi4gICovCi0gICAgICAgICAgaWYgKE1CX0NV Ul9NQVggPiAxKQorICAgICAgICAgIGlmIChkZmEtPm11bHRpYnl0ZSkKICAgICAgICAgICAg IHJldHVybiBsYXN0dG9rID0gV0NIQVI7CiAKICAgICAgICAgICBpZiAoY2FzZV9mb2xkICYm IGlzYWxwaGEgKGMpKQpAQCAtMTU2NywxMSArMTU2NywxMSBAQCBhZGR0b2tfbWIgKHRva2Vu IHQsIGludCBtYnByb3ApCiAgICAgewogICAgICAgZGZhLT50b2tlbnMgPSB4Mm5yZWFsbG9j IChkZmEtPnRva2VucywgJmRmYS0+dGFsbG9jLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBzaXplb2YgKmRmYS0+dG9rZW5zKTsKLSAgICAgIGlmIChNQl9DVVJfTUFYID4g MSkKKyAgICAgIGlmIChkZmEtPm11bHRpYnl0ZSkKICAgICAgICAgZGZhLT5tdWx0aWJ5dGVf cHJvcCA9IHhucmVhbGxvYyAoZGZhLT5tdWx0aWJ5dGVfcHJvcCwgZGZhLT50YWxsb2MsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNpemVvZiAqZGZhLT5t dWx0aWJ5dGVfcHJvcCk7CiAgICAgfQotICBpZiAoTUJfQ1VSX01BWCA+IDEpCisgIGlmIChk ZmEtPm11bHRpYnl0ZSkKICAgICBkZmEtPm11bHRpYnl0ZV9wcm9wW2RmYS0+dGluZGV4XSA9 IG1icHJvcDsKICAgZGZhLT50b2tlbnNbZGZhLT50aW5kZXgrK10gPSB0OwogCkBAIC0xNjA0 LDcgKzE2MDQsNyBAQCBzdGF0aWMgdm9pZCBhZGR0b2tfd2MgKHdpbnRfdCB3Yyk7CiBzdGF0 aWMgdm9pZAogYWRkdG9rICh0b2tlbiB0KQogewotICBpZiAoTUJfQ1VSX01BWCA+IDEgJiYg dCA9PSBNQkNTRVQpCisgIGlmIChkZmEtPm11bHRpYnl0ZSAmJiB0ID09IE1CQ1NFVCkKICAg ICB7CiAgICAgICBib29sIG5lZWRfb3IgPSBmYWxzZTsKICAgICAgIHN0cnVjdCBtYl9jaGFy X2NsYXNzZXMgKndvcmtfbWJjID0gJmRmYS0+bWJjc2V0c1tkZmEtPm5tYmNzZXRzIC0gMV07 CkBAIC0xODUwLDcgKzE4NTAsNyBAQCBjb3B5dG9rcyAoc2l6ZV90IHRpbmRleCwgc2l6ZV90 IG50b2tlbnMpCiB7CiAgIHNpemVfdCBpOwogCi0gIGlmIChNQl9DVVJfTUFYID4gMSkKKyAg aWYgKGRmYS0+bXVsdGlieXRlKQogICAgIGZvciAoaSA9IDA7IGkgPCBudG9rZW5zOyArK2kp CiAgICAgICBhZGR0b2tfbWIgKGRmYS0+dG9rZW5zW3RpbmRleCArIGldLCBkZmEtPm11bHRp Ynl0ZV9wcm9wW3RpbmRleCArIGldKTsKICAgZWxzZQpAQCAtMTkzNSw3ICsxOTM1LDcgQEAg ZGZhcGFyc2UgKGNoYXIgY29uc3QgKnMsIHNpemVfdCBsZW4sIHN0cnVjdCBkZmEgKmQpCiAg IGxhc3R0b2sgPSBFTkQ7CiAgIGxhc3RzdGFydCA9IHRydWU7CiAgIHBhcmVucyA9IDA7Ci0g IGlmIChNQl9DVVJfTUFYID4gMSkKKyAgaWYgKGRmYS0+bXVsdGlieXRlKQogICAgIHsKICAg ICAgIGN1cl9tYl9sZW4gPSAwOwogICAgICAgbWVtc2V0ICgmZC0+bWJzLCAwLCBzaXplb2Yg ZC0+bWJzKTsKQEAgLTI3MDAsNyArMjcwMCw3IEBAIGRmYXN0YXRlIChzdGF0ZV9udW0gcywg c3RydWN0IGRmYSAqZCwgc3RhdGVfbnVtIHRyYW5zW10pCiAgICAgICAgIGZvciAoayA9IDA7 IGsgPCBkLT5mb2xsb3dzW2dycHNbaV0uZWxlbXNbal1dLm5lbGVtOyArK2spCiAgICAgICAg ICAgaW5zZXJ0IChkLT5mb2xsb3dzW2dycHNbaV0uZWxlbXNbal1dLmVsZW1zW2tdLCAmZm9s bG93cyk7CiAKLSAgICAgIGlmIChkLT5tYl9jdXJfbWF4ID4gMSkKKyAgICAgIGlmIChkLT5t dWx0aWJ5dGUpCiAgICAgICAgIHsKICAgICAgICAgICAvKiBJZiBhIHRva2VuIGluIGZvbGxv d3MuZWxlbXMgaXMgbm90IDFzdCBieXRlIG9mIGEgbXVsdGlieXRlCiAgICAgICAgICAgICAg Y2hhcmFjdGVyLCBvciB0aGUgc3RhdGVzIG9mIGZvbGxvd3MgbXVzdCBhY2NlcHQgdGhlIGJ5 dGVzCkBAIC0yNzM0LDcgKzI3MzQsNyBAQCBkZmFzdGF0ZSAoc3RhdGVfbnVtIHMsIHN0cnVj dCBkZmEgKmQsIHN0YXRlX251bSB0cmFuc1tdKQogICAgICAgLyogSWYgd2UgYXJlIGJ1aWxk aW5nIGEgc2VhcmNoaW5nIG1hdGNoZXIsIHRocm93IGluIHRoZSBwb3NpdGlvbnMKICAgICAg ICAgIG9mIHN0YXRlIDAgYXMgd2VsbC4gICovCiAgICAgICBpZiAoZC0+c2VhcmNoZmxhZwot ICAgICAgICAgICYmIChkLT5tYl9jdXJfbWF4ID09IDEgfHwgIW5leHRfaXNudF8xc3RfYnl0 ZSkpCisgICAgICAgICAgJiYgKCFkLT5tdWx0aWJ5dGUgfHwgIW5leHRfaXNudF8xc3RfYnl0 ZSkpCiAgICAgICAgIGZvciAoaiA9IDA7IGogPCBkLT5zdGF0ZXNbMF0uZWxlbXMubmVsZW07 ICsraikKICAgICAgICAgICBpbnNlcnQgKGQtPnN0YXRlc1swXS5lbGVtcy5lbGVtc1tqXSwg JmZvbGxvd3MpOwogCkBAIC0zMjQ3LDcgKzMyNDcsNyBAQCBkZmFleGVjIChzdHJ1Y3QgZGZh ICpkLCBjaGFyIGNvbnN0ICpiZWdpbiwgY2hhciAqZW5kLAogICBzYXZlZF9lbmQgPSAqKHVu c2lnbmVkIGNoYXIgKikgZW5kOwogICAqZW5kID0gZW9sOwogCi0gIGlmIChkLT5tYl9jdXJf bWF4ID4gMSkKKyAgaWYgKGQtPm11bHRpYnl0ZSkKICAgICB7CiAgICAgICBtZW1zZXQgKCZk LT5tYnMsIDAsIHNpemVvZiBkLT5tYnMpOwogICAgICAgaWYgKCEgZC0+bWJfbWF0Y2hfbGVu cykKQEAgLTMyNTksNyArMzI1OSw3IEBAIGRmYWV4ZWMgKHN0cnVjdCBkZmEgKmQsIGNoYXIg Y29uc3QgKmJlZ2luLCBjaGFyICplbmQsCiAKICAgZm9yICg7OykKICAgICB7Ci0gICAgICBp ZiAoZC0+bWJfY3VyX21heCA+IDEpCisgICAgICBpZiAoZC0+bXVsdGlieXRlKQogICAgICAg ICB7CiAgICAgICAgICAgd2hpbGUgKCh0ID0gdHJhbnNbc10pICE9IE5VTEwpCiAgICAgICAg ICAgICB7CkBAIC0zMzQxLDcgKzMzNDEsNyBAQCBkZmFleGVjIChzdHJ1Y3QgZGZhICpkLCBj aGFyIGNvbnN0ICpiZWdpbiwgY2hhciAqZW5kLAogICAgICAgICAgICAgfQogCiAgICAgICAg ICAgczEgPSBzOwotICAgICAgICAgIGlmIChkLT5tYl9jdXJfbWF4ID4gMSkKKyAgICAgICAg ICBpZiAoZC0+bXVsdGlieXRlKQogICAgICAgICAgICAgewogICAgICAgICAgICAgICAvKiBD YW4gbWF0Y2ggd2l0aCBhIG11bHRpYnl0ZSBjaGFyYWN0ZXIgKGFuZCBtdWx0aWNoYXJhY3Rl cgogICAgICAgICAgICAgICAgICBjb2xsYXRpbmcgZWxlbWVudCkuICBUcmFuc2l0aW9uIHRh YmxlIG1pZ2h0IGJlIHVwZGF0ZWQuICAqLwpAQCAtMzM2Nyw3ICszMzY3LDcgQEAgZGZhZXhl YyAoc3RydWN0IGRmYSAqZCwgY2hhciBjb25zdCAqYmVnaW4sIGNoYXIgKmVuZCwKICAgICAg ICAgewogICAgICAgICAgIGlmIChjb3VudCkKICAgICAgICAgICAgICsrKmNvdW50OwotICAg ICAgICAgIGlmIChkLT5tYl9jdXJfbWF4ID4gMSkKKyAgICAgICAgICBpZiAoZC0+bXVsdGli eXRlKQogICAgICAgICAgICAgbWJwID0gcDsKICAgICAgICAgfQogCkBAIC0zNDQ1LDcgKzM0 NDUsNyBAQCB2b2lkCiBkZmFpbml0IChzdHJ1Y3QgZGZhICpkKQogewogICBtZW1zZXQgKGQs IDAsIHNpemVvZiAqZCk7Ci0gIGQtPm1iX2N1cl9tYXggPSBNQl9DVVJfTUFYOworICBkLT5t dWx0aWJ5dGUgPSBNQl9DVVJfTUFYID4gMTsKIH0KIAogc3RhdGljIHZvaWQKQEAgLTM0NzIs NyArMzQ3Miw3IEBAIGRmYW9wdGltaXplIChzdHJ1Y3QgZGZhICpkKQogICAgIH0KIAogICBm cmVlX21iZGF0YSAoZCk7Ci0gIGQtPm1iX2N1cl9tYXggPSAxOworICBkLT5tdWx0aWJ5dGUg PSBmYWxzZTsKIH0KIAogc3RhdGljIHZvaWQKQEAgLTM0ODUsNyArMzQ4NSw3IEBAIGRmYXN1 cGVyc2V0IChzdHJ1Y3QgZGZhICpkKQogICBzdHJ1Y3QgZGZhICpzdXAgPSBkZmFhbGxvYyAo KTsKIAogICAqc3VwID0gKmQ7Ci0gIHN1cC0+bWJfY3VyX21heCA9IDE7CisgIHN1cC0+bXVs dGlieXRlID0gZmFsc2U7CiAgIHN1cC0+bXVsdGlieXRlX3Byb3AgPSBOVUxMOwogICBzdXAt Pm1iY3NldHMgPSBOVUxMOwogICBzdXAtPnN1cGVyc2V0ID0gTlVMTDsKQEAgLTM1MjYsNyAr MzUyNiw3IEBAIGRmYXN1cGVyc2V0IChzdHJ1Y3QgZGZhICpkKQogICAgICAgICBjYXNlIEVO RFdPUkQ6CiAgICAgICAgIGNhc2UgTElNV09SRDoKICAgICAgICAgY2FzZSBOT1RMSU1XT1JE OgotICAgICAgICAgIGlmIChNQl9DVVJfTUFYID4gMSkKKyAgICAgICAgICBpZiAoZC0+bXVs dGlieXRlKQogICAgICAgICAgICAgewogICAgICAgICAgICAgICAvKiBJZ25vcmUgdGhlc2Ug Y29uc3RyYWludHMuICAqLwogICAgICAgICAgICAgICBzdXAtPnRva2Vuc1tqKytdID0gRU1Q VFk7CkBAIC0zNTQyLDEwICszNTQyLDEwIEBAIGRmYXN1cGVyc2V0IChzdHJ1Y3QgZGZhICpk KQogICAgIH0KICAgc3VwLT50aW5kZXggPSBqOwogCi0gIGlmICgoZC0+bWJfY3VyX21heCA9 PSAxICYmICFoYXZlX2FjaGFyKSB8fCAhaGF2ZV9uY2hhcikKLSAgICBkZmFmcmVlIChzdXAp OwotICBlbHNlCisgIGlmIChoYXZlX25jaGFyICYmIChoYXZlX2FjaGFyIHx8IGQtPm11bHRp Ynl0ZSkpCiAgICAgZC0+c3VwZXJzZXQgPSBzdXA7CisgIGVsc2UKKyAgICBkZmFmcmVlIChz dXApOwogfQogCiAvKiBQYXJzZSBhbmQgYW5hbHl6ZSBhIHNpbmdsZSBzdHJpbmcgb2YgdGhl IGdpdmVuIGxlbmd0aC4gICovCkBAIC0zNTczLDcgKzM1NzMsNyBAQCBkZmFmcmVlIChzdHJ1 Y3QgZGZhICpkKQogICBmcmVlIChkLT5jaGFyY2xhc3Nlcyk7CiAgIGZyZWUgKGQtPnRva2Vu cyk7CiAKLSAgaWYgKGQtPm1iX2N1cl9tYXggPiAxKQorICBpZiAoZC0+bXVsdGlieXRlKQog ICAgIGZyZWVfbWJkYXRhIChkKTsKIAogICBmb3IgKGkgPSAwOyBpIDwgZC0+c2luZGV4OyAr K2kpCkBAIC00MDM0LDE0ICs0MDM0LDE0IEBAIGRmYW11c3QgKHN0cnVjdCBkZmEgKmQpCiAg ICAgICAgICAgICAgIHQgPSBqOwogICAgICAgICAgICAgICB3aGlsZSAoKytqIDwgTk9UQ0hB UikKICAgICAgICAgICAgICAgICBpZiAodHN0Yml0IChqLCAqY2NsKQotICAgICAgICAgICAg ICAgICAgICAmJiAhIChjYXNlX2ZvbGQgJiYgTUJfQ1VSX01BWCA9PSAxCisgICAgICAgICAg ICAgICAgICAgICYmICEgKGNhc2VfZm9sZCAmJiAhZC0+bXVsdGlieXRlCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICYmIHRvdXBwZXIgKGopID09IHRvdXBwZXIgKHQpKSkKICAgICAg ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICBpZiAoaiA8IE5PVENIQVIpCiAg ICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgbXAtPmlz WzBdID0gbXAtPmxlZnRbMF0gPSBtcC0+cmlnaHRbMF0KLSAgICAgICAgICAgID0gY2FzZV9m b2xkICYmIE1CX0NVUl9NQVggPT0gMSA/IHRvdXBwZXIgKHQpIDogdDsKKyAgICAgICAgICAg ID0gY2FzZV9mb2xkICYmICFkLT5tdWx0aWJ5dGUgPyB0b3VwcGVyICh0KSA6IHQ7CiAgICAg ICAgICAgbXAtPmlzWzFdID0gbXAtPmxlZnRbMV0gPSBtcC0+cmlnaHRbMV0gPSAnXDAnOwog ICAgICAgICAgIG1wLT5pbiA9IGVubGlzdCAobXAtPmluLCBtcC0+aXMsIDEpOwogICAgICAg ICAgIGJyZWFrOwotLSAKMS45LjAKCg== --------------010706010801030805040907 Content-Type: text/plain; charset=UTF-8; name="0002-dfa-minor-simplification-of-dfaexec.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0002-dfa-minor-simplification-of-dfaexec.patch" RnJvbSAwMzIyMTkxNDk1NjQ0NjQyNGQyNWY4ZTM5YzFhNmY4NzVkM2Y0MzRjIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBUaHUsIDI0IEFwciAyMDE0IDE3OjUyOjEwIC0wNzAwClN1YmplY3Q6IFtQQVRD SCAyLzJdIGRmYTogbWlub3Igc2ltcGxpZmljYXRpb24gb2YgZGZhZXhlYwoKKiBzcmMvZGZh LmMgKGRmYWV4ZWMpOiBTdHJlYW1saW5lIHVwZGF0aW5nIG9mIHJldHVybmVkIHZhbHVlcy4K RG9uJ3QgYm90aGVyIHRvIGNoZWNrIGQtPm11bHRpYnl0ZSBiZWZvcmUgdXBkYXRpbmcgbWJw LgpBdm9pZCBkdXBsaWNhdGUgcCA+IGVuZCB0ZXN0LgotLS0KIHNyYy9kZmEuYyB8IDM4ICsr KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg MjAgaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2Rm YS5jIGIvc3JjL2RmYS5jCmluZGV4IDdhOTlkM2YuLjUwMjY0YjIgMTAwNjQ0Ci0tLSBhL3Ny Yy9kZmEuYworKysgYi9zcmMvZGZhLmMKQEAgLTMyMzcsNiArMzIzNyw3IEBAIGRmYWV4ZWMg KHN0cnVjdCBkZmEgKmQsIGNoYXIgY29uc3QgKmJlZ2luLCBjaGFyICplbmQsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludG8gYSByZWdpc3Rlci4gICovCiAgIHVu c2lnbmVkIGNoYXIgZW9sID0gZW9sYnl0ZTsgIC8qIExpa2V3aXNlIGZvciBlb2xieXRlLiAg Ki8KICAgdW5zaWduZWQgY2hhciBzYXZlZF9lbmQ7CisgIHNpemVfdCBubGNvdW50ID0gMDsK IAogICBpZiAoIWQtPnRyYWxsb2MpCiAgICAgYnVpbGRfc3RhdGVfemVybyAoZCk7CkBAIC0z Mjg1LDggKzMyODYsOCBAQCBkZmFleGVjIChzdHJ1Y3QgZGZhICpkLCBjaGFyIGNvbnN0ICpi ZWdpbiwgY2hhciAqZW5kLAogCiAgICAgICAgICAgICAgICAgICBpZiAoKGNoYXIgKikgcCA+ PSBlbmQpCiAgICAgICAgICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgICAq ZW5kID0gc2F2ZWRfZW5kOwotICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBOVUxMOwor ICAgICAgICAgICAgICAgICAgICAgIHAgPSBOVUxMOworICAgICAgICAgICAgICAgICAgICAg IGdvdG8gZG9uZTsKICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0K IApAQCAtMzMwMyw4ICszMzA0LDcgQEAgZGZhZXhlYyAoc3RydWN0IGRmYSAqZCwgY2hhciBj b25zdCAqYmVnaW4sIGNoYXIgKmVuZCwKICAgICAgICAgICAgICAgaWYgKGQtPnN0YXRlc1tz XS5oYXNfbWJjc2V0ICYmIGJhY2tyZWYpCiAgICAgICAgICAgICAgICAgewogICAgICAgICAg ICAgICAgICAgKmJhY2tyZWYgPSAxOwotICAgICAgICAgICAgICAgICAgKmVuZCA9IHNhdmVk X2VuZDsKLSAgICAgICAgICAgICAgICAgIHJldHVybiAoY2hhciAqKSBwOworICAgICAgICAg ICAgICAgICAgZ290byBkb25lOwogICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAg ICAvKiBDYW4gbWF0Y2ggd2l0aCBhIG11bHRpYnl0ZSBjaGFyYWN0ZXIgKGFuZCBtdWx0aSBj aGFyYWN0ZXIKQEAgLTMzMzAsMTQgKzMzMzAsMTkgQEAgZGZhZXhlYyAoc3RydWN0IGRmYSAq ZCwgY2hhciBjb25zdCAqYmVnaW4sIGNoYXIgKmVuZCwKICAgICAgICAgICAgIH0KICAgICAg ICAgfQogCi0gICAgICBpZiAocyA+PSAwICYmIChjaGFyICopIHAgPD0gZW5kICYmIGQtPmZh aWxzW3NdKQorICAgICAgaWYgKChjaGFyICopIHAgPiBlbmQpCisgICAgICAgIHsKKyAgICAg ICAgICBwID0gTlVMTDsKKyAgICAgICAgICBnb3RvIGRvbmU7CisgICAgICAgIH0KKworICAg ICAgaWYgKHMgPj0gMCAmJiBkLT5mYWlsc1tzXSkKICAgICAgICAgewogICAgICAgICAgIGlm IChkLT5zdWNjZXNzW3NdICYgc2JpdFsqcF0pCiAgICAgICAgICAgICB7CiAgICAgICAgICAg ICAgIGlmIChiYWNrcmVmKQogICAgICAgICAgICAgICAgICpiYWNrcmVmID0gZC0+c3RhdGVz W3NdLmhhc19iYWNrcmVmOwotICAgICAgICAgICAgICAqZW5kID0gc2F2ZWRfZW5kOwotICAg ICAgICAgICAgICByZXR1cm4gKGNoYXIgKikgcDsKKyAgICAgICAgICAgICAgZ290byBkb25l OwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgczEgPSBzOwpAQCAtMzM1NCwyMSArMzM1 OSwxMiBAQCBkZmFleGVjIChzdHJ1Y3QgZGZhICpkLCBjaGFyIGNvbnN0ICpiZWdpbiwgY2hh ciAqZW5kLAogICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAKLSAgICAgIC8qIENo ZWNrIGlmIHdlJ3ZlIHJ1biBvZmYgdGhlIGVuZCBvZiB0aGUgYnVmZmVyLiAgKi8KLSAgICAg IGlmICgoY2hhciAqKSBwID4gZW5kKQotICAgICAgICB7Ci0gICAgICAgICAgKmVuZCA9IHNh dmVkX2VuZDsKLSAgICAgICAgICByZXR1cm4gTlVMTDsKLSAgICAgICAgfQotCiAgICAgICAv KiBJZiB0aGUgcHJldmlvdXMgY2hhcmFjdGVyIHdhcyBhIG5ld2xpbmUsIGNvdW50IGl0LCBh bmQgc2tpcAogICAgICAgICAgY2hlY2tpbmcgb2YgbXVsdGlieXRlIGNoYXJhY3RlciBib3Vu ZGFyeSB1bnRpbCBoZXJlLiAgKi8KICAgICAgIGlmIChwWy0xXSA9PSBlb2wpCiAgICAgICAg IHsKLSAgICAgICAgICBpZiAoY291bnQpCi0gICAgICAgICAgICArKypjb3VudDsKLSAgICAg ICAgICBpZiAoZC0+bXVsdGlieXRlKQotICAgICAgICAgICAgbWJwID0gcDsKKyAgICAgICAg ICBubGNvdW50Kys7CisgICAgICAgICAgbWJwID0gcDsKICAgICAgICAgfQogCiAgICAgICBp ZiAocyA+PSAwKQpAQCAtMzM4Nyw2ICszMzgzLDEyIEBAIGRmYWV4ZWMgKHN0cnVjdCBkZmEg KmQsIGNoYXIgY29uc3QgKmJlZ2luLCBjaGFyICplbmQsCiAKICAgICAgIHMgPSAwOwogICAg IH0KKworIGRvbmU6CisgIGlmIChjb3VudCkKKyAgICAqY291bnQgKz0gbmxjb3VudDsKKyAg KmVuZCA9IHNhdmVkX2VuZDsKKyAgcmV0dXJuIChjaGFyICopIHA7CiB9CiAKIC8qIFNlYXJj aCB0aHJvdWdoIGEgYnVmZmVyIGxvb2tpbmcgZm9yIGEgcG90ZW50aWFsIG1hdGNoIGZvciBE LgotLSAKMS45LjAKCg== --------------010706010801030805040907-- ------------=_1398387543-11476-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 21 Apr 2014 12:28:09 +0000 Received: from localhost ([127.0.0.1]:53861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WcDKR-0000kI-Ul for submit@debbugs.gnu.org; Mon, 21 Apr 2014 08:28:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33248) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WcDKN-0000k2-Ou for submit@debbugs.gnu.org; Mon, 21 Apr 2014 08:28:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcDKE-00040l-LD for submit@debbugs.gnu.org; Mon, 21 Apr 2014 08:28:03 -0400 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]:44177) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcDKE-00040f-HY for submit@debbugs.gnu.org; Mon, 21 Apr 2014 08:27:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcDK6-0001od-QW for bug-grep@gnu.org; Mon, 21 Apr 2014 08:27:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcDJz-0003zr-5u for bug-grep@gnu.org; Mon, 21 Apr 2014 08:27:46 -0400 Received: from mailgw01.kcn.ne.jp ([61.86.7.208]:54546) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcDJy-0003zm-TL for bug-grep@gnu.org; Mon, 21 Apr 2014 08:27:39 -0400 Received: from imp03 (mailgw7.kcn.ne.jp [61.86.15.238]) by mailgw01.kcn.ne.jp (Postfix) with ESMTP id A785B80249 for ; Mon, 21 Apr 2014 21:27:34 +0900 (JST) Received: from mail07.kcn.ne.jp ([61.86.6.186]) by imp03 with bizsmtp id scTa1n00940oyB901cTauA; Mon, 21 Apr 2014 21:27:34 +0900 X-OrgRCPT: bug-grep@gnu.org Received: from [10.120.1.56] (i118-21-128-66.s30.a048.ap.plala.or.jp [118.21.128.66]) by mail07.kcn.ne.jp (Postfix) with ESMTPA id 3FAFED5009B for ; Mon, 21 Apr 2014 21:27:34 +0900 (JST) Date: Mon, 21 Apr 2014 21:27:34 +0900 From: Norihiro Tanaka To: bug-grep@gnu.org Subject: grep: skip checking of multibyte character boundary, reaching at eolbyte Message-Id: <20140421212723.9632.27F6AC2D@kcn.ne.jp> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------_5348D690000000002C12_MULTIPART_MIXED_" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.65.07 [ja] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x 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: -4.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: -4.0 (----) --------_5348D690000000002C12_MULTIPART_MIXED_ Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit In dfaexec(), if reaches at eolbyte, we can skip checking of multibyte character boundary. So then process mbp until here. Norihiro --------_5348D690000000002C12_MULTIPART_MIXED_ Content-Type: text/plain; charset="UTF-8"; name="patch.txt" Content-Disposition: attachment; filename="patch.txt" Content-Transfer-Encoding: base64 RnJvbSBlMjNmNTVkODVlYWYwOGE3ZTE4Zjg0ZjEzZjZjNjlmYTIzOWM5ZGM2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOb3JpaGlybyBUYW5ha2EgPG5vcml0bmtAa2NuLm5lLmpwPgpE YXRlOiBNb24sIDE0IEFwciAyMDE0IDA5OjA4OjA5ICswOTAwClN1YmplY3Q6IFtQQVRDSF0gZ3Jl cDogc2tpcCBjaGVja2luZyBvZiBtdWx0aWJ5dGUgY2hhcmFjdGVyIGJvdW5kYXJ5LCByZWFjaGlu ZwogYXQgZW9sYnl0ZQoKKiBzcmMvZGZhLmMgKGRmYWV4ZWMpOiBTa2lwIGNoZWNraW5nIG9mIG11 bHRpYnl0ZSBjaGFyYWN0ZXIgYm91bmRhcnksCnJlYWNoaW5nIGF0IGVvbGJ5dGUuCi0tLQogc3Jj L2RmYS5jIHwgMTQgKysrKysrKysrKy0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMCBpbnNlcnRpb25z KCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9kZmEuYyBiL3NyYy9kZmEuYwpp bmRleCBjOTNmNDUxLi45OGVkOGU3IDEwMDY0NAotLS0gYS9zcmMvZGZhLmMKKysrIGIvc3JjL2Rm YS5jCkBAIC0zMzUyLDEwICszMzUyLDYgQEAgZGZhZXhlYyAoc3RydWN0IGRmYSAqZCwgY2hhciBj b25zdCAqYmVnaW4sIGNoYXIgKmVuZCwKICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQog Ci0gICAgICAvKiBJZiB0aGUgcHJldmlvdXMgY2hhcmFjdGVyIHdhcyBhIG5ld2xpbmUsIGNvdW50 IGl0LiAgKi8KLSAgICAgIGlmICgoY2hhciAqKSBwIDw9IGVuZCAmJiBwWy0xXSA9PSBlb2wgJiYg Y291bnQpCi0gICAgICAgICsrKmNvdW50OwotCiAgICAgICAvKiBDaGVjayBpZiB3ZSd2ZSBydW4g b2ZmIHRoZSBlbmQgb2YgdGhlIGJ1ZmZlci4gICovCiAgICAgICBpZiAoKGNoYXIgKikgcCA+IGVu ZCkKICAgICAgICAgewpAQCAtMzM2Myw2ICszMzU5LDE2IEBAIGRmYWV4ZWMgKHN0cnVjdCBkZmEg KmQsIGNoYXIgY29uc3QgKmJlZ2luLCBjaGFyICplbmQsCiAgICAgICAgICAgcmV0dXJuIE5VTEw7 CiAgICAgICAgIH0KIAorICAgICAgLyogSWYgdGhlIHByZXZpb3VzIGNoYXJhY3RlciB3YXMgYSBu ZXdsaW5lLCBjb3VudCBpdCwgYW5kIHNraXAKKyAgICAgICAgIGNoZWNraW5nIG9mIG11bHRpYnl0 ZSBjaGFyYWN0ZXIgYm91bmRhcnkgdW50aWwgaGVyZS4gICovCisgICAgICBpZiAocFstMV0gPT0g ZW9sKQorICAgICAgICB7CisgICAgICAgICAgaWYgKGNvdW50KQorICAgICAgICAgICAgKysqY291 bnQ7CisgICAgICAgICAgaWYgKGQtPm1iX2N1cl9tYXggPiAxKQorICAgICAgICAgICAgbWJwID0g cDsKKyAgICAgICAgfQorCiAgICAgICBpZiAocyA+PSAwKQogICAgICAgICB7CiAgICAgICAgICAg aWYgKCFkLT50cmFuc1tzXSkKLS0gCjEuOS4yCgo= --------_5348D690000000002C12_MULTIPART_MIXED_-- ------------=_1398387543-11476-1--