From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 08 05:56:06 2020 Received: (at submit) by debbugs.gnu.org; 8 Oct 2020 09:56:06 +0000 Received: from localhost ([127.0.0.1]:58752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kQSec-0006NB-D6 for submit@debbugs.gnu.org; Thu, 08 Oct 2020 05:56:06 -0400 Received: from lists.gnu.org ([209.51.188.17]:60876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kQSeY-0006N1-Lq for submit@debbugs.gnu.org; Thu, 08 Oct 2020 05:56:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQSeX-0002OC-G7 for bug-grep@gnu.org; Thu, 08 Oct 2020 05:56:01 -0400 Received: from mailgw07.kcn.ne.jp ([61.86.7.214]:59077) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQSeU-0000em-7l for bug-grep@gnu.org; Thu, 08 Oct 2020 05:56:01 -0400 Received: from mxs01-s (mailgw1.kcn.ne.jp [61.86.15.233]) by mailgw07.kcn.ne.jp (Postfix) with ESMTP id 4F27E41010 for ; Thu, 8 Oct 2020 18:55:53 +0900 (JST) X-matriXscan-loop-detect: 232c64a20622663dc07b16036fce9c7e91c056e2 Received: from mail13.kcn.ne.jp ([61.86.6.131]) by mxs01-s with ESMTP; Thu, 08 Oct 2020 18:55:52 +0900 (JST) Received: from [10.120.1.105] (i118-21-128-66.s30.a048.ap.plala.or.jp [118.21.128.66]) by mail13.kcn.ne.jp (Postfix) with ESMTPA id F119340A927B for ; Thu, 8 Oct 2020 18:55:51 +0900 (JST) Date: Thu, 08 Oct 2020 18:55:50 +0900 From: Norihiro Tanaka To: Subject: [PATCH] grep: remove unusable code Message-Id: <20201008185549.2F13.27F6AC2D@kcn.ne.jp> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------_5F7EE0CF000000002F10_MULTIPART_MIXED_" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.75.01 [ja] X-matriXscan-msec-AV: Clean X-matriXscan-Action: Approve X-matriXscan: Uncategorized Received-SPF: pass client-ip=61.86.7.214; envelope-from=noritnk@kcn.ne.jp; helo=mailgw07.kcn.ne.jp X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/08 05:55:53 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) 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: -2.3 (--) --------_5F7EE0CF000000002F10_MULTIPART_MIXED_ Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Codes described in attached patch in this mail is dead. These codes make sense when a maltibyte character is returned in case conversion for single byte character, but I believe that their cases are removed in commit 016e590a8198009bce0e1078f6d4c7e037e2df3c. --------_5F7EE0CF000000002F10_MULTIPART_MIXED_ Content-Type: text/plain; charset="US-ASCII"; name="0001-grep-remove-unusable-code.patch" Content-Disposition: attachment; filename="0001-grep-remove-unusable-code.patch" Content-Transfer-Encoding: base64 RnJvbSBlNjJlNzI3YWMyNzFiMWNlY2Y1NTQyZWViZDA3ZWI4NTAxMDUzZDA4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOb3JpaGlybyBUYW5ha2EgPG5vcml0bmtAa2NuLm5lLmpwPgpE YXRlOiBUaHUsIDggT2N0IDIwMjAgMTg6NDY6MzIgKzA5MDAKU3ViamVjdDogW1BBVENIXSBncmVw OiByZW1vdmUgdW51c2FibGUgY29kZQoKKiBzcmMva3dzZWFyY2guYyAoRmNvbXBpbGUsIEZleGVj dXRlKTogUmVtb3ZlIHVudXNhYmxlIGNvZGUuICBObyBsb25nZXIgdGhlc2UKYXJlIHVzZWQgYWZ0 ZXIgY29tbWl0IDAxNmU1OTBhODE5ODAwOWJjZTBlMTA3OGY2ZDRjN2UwMzdlMmRmM2MuCi0tLQog c3JjL2t3c2VhcmNoLmMgfCAgIDQ3IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiAxIGZpbGVzIGNoYW5nZWQsIDAgaW5zZXJ0aW9ucygrKSwgNDcgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2t3c2VhcmNoLmMgYi9zcmMva3dzZWFyY2guYwppbmRl eCAxMTc0ZGJjLi4xYjMxOTE3IDEwMDY0NAotLS0gYS9zcmMva3dzZWFyY2guYworKysgYi9zcmMv a3dzZWFyY2guYwpAQCAtODksMzggKzg5LDYgQEAgRmNvbXBpbGUgKGNoYXIgKnBhdHRlcm4sIHNp emVfdCBzaXplLCByZWdfc3ludGF4X3QgaWdub3JlZCwgYm9vbCBleGFjdCkKICAgZnJlZSAoYnVm KTsKICAgcHRyZGlmZl90IHdvcmRzID0ga3dzd29yZHMgKGt3c2V0KTsKIAotICBpZiAobWF0Y2hf aWNhc2UpCi0gICAgewotICAgICAgLyogRm9yIGVhY2ggcGF0dGVybiBjaGFyYWN0ZXIgQyB0aGF0 IGhhcyBhIGNhc2UgZm9sZGVkCi0gICAgICAgICBjb3VudGVycGFydCBGIHRoYXQgaXMgbXVsdGli eXRlIGFuZCBzbyBjYW5ub3QgZWFzaWx5IGJlCi0gICAgICAgICBpbXBsZW1lbnRlZCB2aWEgdHJh bnNsYXRpbmcgYSBzaW5nbGUgYnl0ZSwgYXBwZW5kIGEgcGF0dGVybgotICAgICAgICAgY29udGFp bmluZyBqdXN0IEYuICBUaGF0IHdheSwgaWYgdGhlIGRhdGEgY29udGFpbnMgRiwgdGhlCi0gICAg ICAgICBtYXRjaGVyIGNhbiBmYWxsIGJhY2sgb24gREZBLiAgRm9yIGV4YW1wbGUsIGlmIEMgaXMg J2knIGFuZAotICAgICAgICAgdGhlIGxvY2FsZSBpcyBlbl9VUy51dGY4LCBhcHBlbmQgYSBwYXR0 ZXJuIGNvbnRhaW5pbmcganVzdAotICAgICAgICAgdGhlIGNoYXJhY3RlciBVKzAxMzEgKExBVElO IFNNQUxMIExFVFRFUiBET1RMRVNTIEkpLCBzbyB0aGF0Ci0gICAgICAgICBGZXhlY3V0ZSB3aWxs IHVzZSBhIERGQSBpZiB0aGUgZGF0YSBjb250YWluIFUrMDEzMS4gICovCi0gICAgICBtYnN0YXRl X3QgbWJzID0geyAwIH07Ci0gICAgICBjaGFyIGNoZWNrZWRbTkNIQVJdID0gezAsfTsKLSAgICAg IGZvciAocCA9IHBhdHRlcm47IHAgPCBwYXR0ZXJuICsgc2l6ZTsgcCsrKQotICAgICAgICB7Ci0g ICAgICAgICAgdW5zaWduZWQgY2hhciBjID0gKnA7Ci0gICAgICAgICAgaWYgKGNoZWNrZWRbY10p Ci0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICBjaGVja2VkW2NdID0gdHJ1ZTsKLQot ICAgICAgICAgIHdpbnRfdCB3YyA9IGxvY2FsZWluZm8uc2JjdG93Y1tjXTsKLSAgICAgICAgICB3 Y2hhcl90IGZvbGRlZFtDQVNFX0ZPTERFRF9CVUZTSVpFXTsKLQotICAgICAgICAgIGZvciAoaW50 IGkgPSBjYXNlX2ZvbGRlZF9jb3VudGVycGFydHMgKHdjLCBmb2xkZWQpOyAwIDw9IC0taTsgKQot ICAgICAgICAgICAgewotICAgICAgICAgICAgICBjaGFyIHNbTUJfTEVOX01BWF07Ci0gICAgICAg ICAgICAgIGludCBuYnl0ZXMgPSB3Y3J0b21iIChzLCBmb2xkZWRbaV0sICZtYnMpOwotICAgICAg ICAgICAgICBpZiAoMSA8IG5ieXRlcykKLSAgICAgICAgICAgICAgICBrd3NpbmNyIChrd3NldCwg cywgbmJ5dGVzKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQotICAgIH0KLQogICBrd3NwcmVw IChrd3NldCk7CiAKICAgc3RydWN0IGt3c2VhcmNoICprd3NlYXJjaCA9IHhtYWxsb2MgKHNpemVv ZiAqa3dzZWFyY2gpOwpAQCAtMTY4LDIxICsxMzYsNiBAQCBGZXhlY3V0ZSAodm9pZCAqdmNwLCBj aGFyIGNvbnN0ICpidWYsIHNpemVfdCBzaXplLCBzaXplX3QgKm1hdGNoX3NpemUsCiAgICAgICAg IGJyZWFrOwogICAgICAgbGVuID0ga3dzbWF0Y2guc2l6ZVswXSAtIDIgKiBtYXRjaF9saW5lczsK IAotICAgICAgaWYgKGt3c2VhcmNoLT53b3JkcyA8PSBrd3NtYXRjaC5pbmRleCkKLSAgICAgICAg ewotICAgICAgICAgIC8qIFRoZSBkYXRhIGNvbnRhaW4gYSBtdWx0aWJ5dGUgY2hhcmFjdGVyIHRo YXQgbWF0Y2hlcwotICAgICAgICAgICAgIHNvbWUgcGF0dGVybiBjaGFyYWN0ZXIgdGhhdCBpcyBh IGNhc2UgZm9sZGVkIGNvdW50ZXJwYXJ0LgotICAgICAgICAgICAgIFNpbmNlIHRoZSBrd3NldCBj b2RlIGNhbm5vdCBoYW5kbGUgdGhpcyBjYXNlLCBmYWxsIGJhY2sKLSAgICAgICAgICAgICBvbiB0 aGUgREZBIGNvZGUsIHdoaWNoIGNhbi4gICovCi0gICAgICAgICAgaWYgKCEga3dzZWFyY2gtPnJl KQotICAgICAgICAgICAgewotICAgICAgICAgICAgICBmZ3JlcF90b19ncmVwX3BhdHRlcm4gKCZr d3NlYXJjaC0+cGF0dGVybiwgJmt3c2VhcmNoLT5zaXplKTsKLSAgICAgICAgICAgICAga3dzZWFy Y2gtPnJlID0gR0VBY29tcGlsZSAoa3dzZWFyY2gtPnBhdHRlcm4sIGt3c2VhcmNoLT5zaXplLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBSRV9TWU5UQVhfR1JFUCwg ISFzdGFydF9wdHIpOwotICAgICAgICAgICAgfQotICAgICAgICAgIHJldHVybiBFR2V4ZWN1dGUg KGt3c2VhcmNoLT5yZSwgYnVmLCBzaXplLCBtYXRjaF9zaXplLCBzdGFydF9wdHIpOwotICAgICAg ICB9Ci0KICAgICAgIG1iY2xlbiA9IDA7CiAgICAgICBpZiAobWJfY2hlY2sKICAgICAgICAgICAm JiBtYl9nb2JhY2sgKCZtYl9zdGFydCwgJm1iY2xlbiwgYmVnICsgb2Zmc2V0LCBidWYgKyBzaXpl KSAhPSAwKQotLSAKMS43LjEKCg== --------_5F7EE0CF000000002F10_MULTIPART_MIXED_-- From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 09 05:54:01 2020 Received: (at 43863) by debbugs.gnu.org; 9 Oct 2020 09:54:01 +0000 Received: from localhost ([127.0.0.1]:34200 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kQp64-00056e-85 for submit@debbugs.gnu.org; Fri, 09 Oct 2020 05:54:01 -0400 Received: from gateway24.websitewelcome.com ([192.185.51.56]:26666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kQp5z-00056U-Ln for 43863@debbugs.gnu.org; Fri, 09 Oct 2020 05:53:55 -0400 Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway24.websitewelcome.com (Postfix) with ESMTP id 0A2502A6F for <43863@debbugs.gnu.org>; Fri, 9 Oct 2020 04:53:51 -0500 (CDT) Received: from gator4065.hostgator.com ([192.185.4.76]) by cmsmtp with SMTP id Qp5ykGJ9yLFNkQp5ykIDLS; Fri, 09 Oct 2020 04:53:51 -0500 X-Authority-Reason: nr=8 Received: from igld-84-229-96-152.inter.net.il ([84.229.96.152]:54626 helo=telaviv1.shlomifish.org) by gator4065.hostgator.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kQp5y-000kIP-JN; Fri, 09 Oct 2020 04:53:50 -0500 Received: from telaviv1.shlomifish.org (telaviv1.shlomifish.org [127.0.0.1]) by telaviv1.shlomifish.org (Postfix) with ESMTP id BFECF261076; Fri, 9 Oct 2020 12:53:47 +0300 (IDT) Date: Fri, 9 Oct 2020 12:53:47 +0300 From: Shlomi Fish To: Norihiro Tanaka Subject: Re: bug#43863: [PATCH] grep: remove unusable code Message-ID: <20201009125347.0a2b0245@telaviv1.shlomifish.org> In-Reply-To: <20201008185549.2F13.27F6AC2D@kcn.ne.jp> References: <20201008185549.2F13.27F6AC2D@kcn.ne.jp> X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-mageia-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4065.hostgator.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - shlomifish.org X-BWhitelist: no X-Source-IP: 84.229.96.152 X-Source-L: No X-Exim-ID: 1kQp5y-000kIP-JN X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: igld-84-229-96-152.inter.net.il (telaviv1.shlomifish.org) [84.229.96.152]:54626 X-Source-Auth: shlomif@shlomifish.org X-Email-Count: 6 X-Source-Cap: c2hsb21pZjtzaGxvbWlmO2dhdG9yNDA2NS5ob3N0Z2F0b3IuY29t X-Local-Domain: yes X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: 43863 Cc: 43863@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.3 (/) Hi Norihiro Tanaka! On Thu, 08 Oct 2020 18:55:50 +0900 Norihiro Tanaka wrote: > Codes described in attached patch in this mail is dead. >=20 > These codes make sense when a maltibyte character is returned in case > conversion for single byte character, but I believe that their cases are > removed in commit 016e590a8198009bce0e1078f6d4c7e037e2df3c. Do you mean the code is "unusable" (=3D=C2=A0"cannot be used"; https://en.wiktionary.org/wiki/unusable ) or is it "unused" (=3D "not being used": https://en.wiktionary.org/wiki/unused )? --=20 Shlomi Fish https://www.shlomifish.org/ Beginners Site for the Vim text editor - https://vim.begin-site.org/ Chuck Norris is the reason why OpenBSD is called OpenBSD. They wanted to call it LockedDownBSD but couldn't find a way to keep Chuck Norris out! (By Andrew Brehm) =E2=80=94 https://www.shlomifish.org/humour/bits/facts/Ch= uck-Norris/ Please reply to list if it's a mailing list post - https://shlom.in/reply . From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 10 03:03:06 2020 Received: (at 43863) by debbugs.gnu.org; 10 Oct 2020 07:03:06 +0000 Received: from localhost ([127.0.0.1]:36811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kR8uI-0000m5-4v for submit@debbugs.gnu.org; Sat, 10 Oct 2020 03:03:06 -0400 Received: from mailgw02.kcn.ne.jp ([61.86.7.209]:35947) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kR8uG-0000lB-KV for 43863@debbugs.gnu.org; Sat, 10 Oct 2020 03:03:05 -0400 Received: from mxs01-s (mailgw1.kcn.ne.jp [61.86.15.233]) by mailgw02.kcn.ne.jp (Postfix) with ESMTP id 6E930BFA26 for <43863@debbugs.gnu.org>; Sat, 10 Oct 2020 16:02:57 +0900 (JST) X-matriXscan-loop-detect: b085a1b6df3d5a23a1d34d053f983aee00b48f3c Received: from mail10.kcn.ne.jp ([61.86.6.128]) by mxs01-s with ESMTP; Sat, 10 Oct 2020 16:02:54 +0900 (JST) Received: from [10.120.1.105] (i118-21-128-66.s30.a048.ap.plala.or.jp [118.21.128.66]) by mail10.kcn.ne.jp (Postfix) with ESMTPA id 4199F40E374A; Sat, 10 Oct 2020 16:02:54 +0900 (JST) Date: Sat, 10 Oct 2020 16:02:53 +0900 From: Norihiro Tanaka To: Shlomi Fish Subject: Re: bug#43863: [PATCH] grep: remove unusable code In-Reply-To: <20201009125347.0a2b0245@telaviv1.shlomifish.org> References: <20201008185549.2F13.27F6AC2D@kcn.ne.jp> <20201009125347.0a2b0245@telaviv1.shlomifish.org> Message-Id: <20201010160233.2F17.27F6AC2D@kcn.ne.jp> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------_5F815C4D000000002F20_MULTIPART_MIXED_" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.75.01 [ja] X-matriXscan-msec-AV: Clean X-matriXscan-Action: Approve X-matriXscan: Uncategorized X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 43863 Cc: 43863@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: -1.0 (-) --------_5F815C4D000000002F20_MULTIPART_MIXED_ Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit On Fri, 9 Oct 2020 12:53:47 +0300 Shlomi Fish wrote: > Hi Norihiro Tanaka! > > On Thu, 08 Oct 2020 18:55:50 +0900 > Norihiro Tanaka wrote: Thanks, not 'unusable' but 'unused' is right. --------_5F815C4D000000002F20_MULTIPART_MIXED_ Content-Type: text/plain; charset="US-ASCII"; name="0001-grep-remove-unused-code.patch" Content-Disposition: attachment; filename="0001-grep-remove-unused-code.patch" Content-Transfer-Encoding: base64 RnJvbSA0ZDkxNDk0OTYzYWIxNjQ1NDE3NjgyYWY1NDhkMTYyMDIxNjA3ZjQwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOb3JpaGlybyBUYW5ha2EgPG5vcml0bmtAa2NuLm5lLmpwPgpE YXRlOiBUaHUsIDggT2N0IDIwMjAgMTg6NDY6MzIgKzA5MDAKU3ViamVjdDogW1BBVENIXSBncmVw OiByZW1vdmUgdW51c2VkIGNvZGUKCiogc3JjL2t3c2VhcmNoLmMgKEZjb21waWxlLCBGZXhlY3V0 ZSk6IFJlbW92ZSB1bnVzZWQgY29kZS4gIE5vIGxvbmdlciB0aGVzZQphcmUgdXNlZCBhZnRlciBj b21taXQgMDE2ZTU5MGE4MTk4MDA5YmNlMGUxMDc4ZjZkNGM3ZTAzN2UyZGYzYy4KLS0tCiBzcmMv a3dzZWFyY2guYyB8ICAgNDcgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KIDEgZmlsZXMgY2hhbmdlZCwgMCBpbnNlcnRpb25zKCspLCA0NyBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9zcmMva3dzZWFyY2guYyBiL3NyYy9rd3NlYXJjaC5jCmluZGV4IDEx NzRkYmMuLjFiMzE5MTcgMTAwNjQ0Ci0tLSBhL3NyYy9rd3NlYXJjaC5jCisrKyBiL3NyYy9rd3Nl YXJjaC5jCkBAIC04OSwzOCArODksNiBAQCBGY29tcGlsZSAoY2hhciAqcGF0dGVybiwgc2l6ZV90 IHNpemUsIHJlZ19zeW50YXhfdCBpZ25vcmVkLCBib29sIGV4YWN0KQogICBmcmVlIChidWYpOwog ICBwdHJkaWZmX3Qgd29yZHMgPSBrd3N3b3JkcyAoa3dzZXQpOwogCi0gIGlmIChtYXRjaF9pY2Fz ZSkKLSAgICB7Ci0gICAgICAvKiBGb3IgZWFjaCBwYXR0ZXJuIGNoYXJhY3RlciBDIHRoYXQgaGFz IGEgY2FzZSBmb2xkZWQKLSAgICAgICAgIGNvdW50ZXJwYXJ0IEYgdGhhdCBpcyBtdWx0aWJ5dGUg YW5kIHNvIGNhbm5vdCBlYXNpbHkgYmUKLSAgICAgICAgIGltcGxlbWVudGVkIHZpYSB0cmFuc2xh dGluZyBhIHNpbmdsZSBieXRlLCBhcHBlbmQgYSBwYXR0ZXJuCi0gICAgICAgICBjb250YWluaW5n IGp1c3QgRi4gIFRoYXQgd2F5LCBpZiB0aGUgZGF0YSBjb250YWlucyBGLCB0aGUKLSAgICAgICAg IG1hdGNoZXIgY2FuIGZhbGwgYmFjayBvbiBERkEuICBGb3IgZXhhbXBsZSwgaWYgQyBpcyAnaScg YW5kCi0gICAgICAgICB0aGUgbG9jYWxlIGlzIGVuX1VTLnV0ZjgsIGFwcGVuZCBhIHBhdHRlcm4g Y29udGFpbmluZyBqdXN0Ci0gICAgICAgICB0aGUgY2hhcmFjdGVyIFUrMDEzMSAoTEFUSU4gU01B TEwgTEVUVEVSIERPVExFU1MgSSksIHNvIHRoYXQKLSAgICAgICAgIEZleGVjdXRlIHdpbGwgdXNl IGEgREZBIGlmIHRoZSBkYXRhIGNvbnRhaW4gVSswMTMxLiAgKi8KLSAgICAgIG1ic3RhdGVfdCBt YnMgPSB7IDAgfTsKLSAgICAgIGNoYXIgY2hlY2tlZFtOQ0hBUl0gPSB7MCx9OwotICAgICAgZm9y IChwID0gcGF0dGVybjsgcCA8IHBhdHRlcm4gKyBzaXplOyBwKyspCi0gICAgICAgIHsKLSAgICAg ICAgICB1bnNpZ25lZCBjaGFyIGMgPSAqcDsKLSAgICAgICAgICBpZiAoY2hlY2tlZFtjXSkKLSAg ICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgIGNoZWNrZWRbY10gPSB0cnVlOwotCi0gICAg ICAgICAgd2ludF90IHdjID0gbG9jYWxlaW5mby5zYmN0b3djW2NdOwotICAgICAgICAgIHdjaGFy X3QgZm9sZGVkW0NBU0VfRk9MREVEX0JVRlNJWkVdOwotCi0gICAgICAgICAgZm9yIChpbnQgaSA9 IGNhc2VfZm9sZGVkX2NvdW50ZXJwYXJ0cyAod2MsIGZvbGRlZCk7IDAgPD0gLS1pOyApCi0gICAg ICAgICAgICB7Ci0gICAgICAgICAgICAgIGNoYXIgc1tNQl9MRU5fTUFYXTsKLSAgICAgICAgICAg ICAgaW50IG5ieXRlcyA9IHdjcnRvbWIgKHMsIGZvbGRlZFtpXSwgJm1icyk7Ci0gICAgICAgICAg ICAgIGlmICgxIDwgbmJ5dGVzKQotICAgICAgICAgICAgICAgIGt3c2luY3IgKGt3c2V0LCBzLCBu Ynl0ZXMpOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgfQotCiAgIGt3c3ByZXAgKGt3 c2V0KTsKIAogICBzdHJ1Y3Qga3dzZWFyY2ggKmt3c2VhcmNoID0geG1hbGxvYyAoc2l6ZW9mICpr d3NlYXJjaCk7CkBAIC0xNjgsMjEgKzEzNiw2IEBAIEZleGVjdXRlICh2b2lkICp2Y3AsIGNoYXIg Y29uc3QgKmJ1Ziwgc2l6ZV90IHNpemUsIHNpemVfdCAqbWF0Y2hfc2l6ZSwKICAgICAgICAgYnJl YWs7CiAgICAgICBsZW4gPSBrd3NtYXRjaC5zaXplWzBdIC0gMiAqIG1hdGNoX2xpbmVzOwogCi0g ICAgICBpZiAoa3dzZWFyY2gtPndvcmRzIDw9IGt3c21hdGNoLmluZGV4KQotICAgICAgICB7Ci0g ICAgICAgICAgLyogVGhlIGRhdGEgY29udGFpbiBhIG11bHRpYnl0ZSBjaGFyYWN0ZXIgdGhhdCBt YXRjaGVzCi0gICAgICAgICAgICAgc29tZSBwYXR0ZXJuIGNoYXJhY3RlciB0aGF0IGlzIGEgY2Fz ZSBmb2xkZWQgY291bnRlcnBhcnQuCi0gICAgICAgICAgICAgU2luY2UgdGhlIGt3c2V0IGNvZGUg Y2Fubm90IGhhbmRsZSB0aGlzIGNhc2UsIGZhbGwgYmFjawotICAgICAgICAgICAgIG9uIHRoZSBE RkEgY29kZSwgd2hpY2ggY2FuLiAgKi8KLSAgICAgICAgICBpZiAoISBrd3NlYXJjaC0+cmUpCi0g ICAgICAgICAgICB7Ci0gICAgICAgICAgICAgIGZncmVwX3RvX2dyZXBfcGF0dGVybiAoJmt3c2Vh cmNoLT5wYXR0ZXJuLCAma3dzZWFyY2gtPnNpemUpOwotICAgICAgICAgICAgICBrd3NlYXJjaC0+ cmUgPSBHRUFjb21waWxlIChrd3NlYXJjaC0+cGF0dGVybiwga3dzZWFyY2gtPnNpemUsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFJFX1NZTlRBWF9HUkVQLCAhIXN0 YXJ0X3B0cik7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgcmV0dXJuIEVHZXhlY3V0ZSAoa3dz ZWFyY2gtPnJlLCBidWYsIHNpemUsIG1hdGNoX3NpemUsIHN0YXJ0X3B0cik7Ci0gICAgICAgIH0K LQogICAgICAgbWJjbGVuID0gMDsKICAgICAgIGlmIChtYl9jaGVjawogICAgICAgICAgICYmIG1i X2dvYmFjayAoJm1iX3N0YXJ0LCAmbWJjbGVuLCBiZWcgKyBvZmZzZXQsIGJ1ZiArIHNpemUpICE9 IDApCi0tIAoxLjcuMQoK --------_5F815C4D000000002F20_MULTIPART_MIXED_-- From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 10 04:45:54 2020 Received: (at 43863) by debbugs.gnu.org; 10 Oct 2020 08:45:54 +0000 Received: from localhost ([127.0.0.1]:36871 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRAVm-0003FZ-2P for submit@debbugs.gnu.org; Sat, 10 Oct 2020 04:45:54 -0400 Received: from gateway32.websitewelcome.com ([192.185.145.189]:42567) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRAVk-0003FR-8J for 43863@debbugs.gnu.org; Sat, 10 Oct 2020 04:45:53 -0400 Received: from cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway32.websitewelcome.com (Postfix) with ESMTP id 8CDC01347BF3 for <43863@debbugs.gnu.org>; Sat, 10 Oct 2020 03:45:51 -0500 (CDT) Received: from gator4065.hostgator.com ([192.185.4.76]) by cmsmtp with SMTP id RAVjkGAuUBD8bRAVjkHJr7; Sat, 10 Oct 2020 03:45:51 -0500 X-Authority-Reason: nr=8 Received: from igld-84-229-96-152.inter.net.il ([84.229.96.152]:40924 helo=telaviv1.shlomifish.org) by gator4065.hostgator.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kRAVj-0003fr-30; Sat, 10 Oct 2020 03:45:51 -0500 Received: from telaviv1.shlomifish.org (telaviv1.shlomifish.org [127.0.0.1]) by telaviv1.shlomifish.org (Postfix) with ESMTP id B22AD261076; Sat, 10 Oct 2020 11:45:48 +0300 (IDT) Date: Sat, 10 Oct 2020 11:45:48 +0300 From: Shlomi Fish To: Norihiro Tanaka Subject: Re: bug#43863: [PATCH] grep: remove unusable code Message-ID: <20201010114548.6a320607@telaviv1.shlomifish.org> In-Reply-To: <20201010160233.2F17.27F6AC2D@kcn.ne.jp> References: <20201008185549.2F13.27F6AC2D@kcn.ne.jp> <20201009125347.0a2b0245@telaviv1.shlomifish.org> <20201010160233.2F17.27F6AC2D@kcn.ne.jp> X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-mageia-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4065.hostgator.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - shlomifish.org X-BWhitelist: no X-Source-IP: 84.229.96.152 X-Source-L: No X-Exim-ID: 1kRAVj-0003fr-30 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: igld-84-229-96-152.inter.net.il (telaviv1.shlomifish.org) [84.229.96.152]:40924 X-Source-Auth: shlomif@shlomifish.org X-Email-Count: 2 X-Source-Cap: c2hsb21pZjtzaGxvbWlmO2dhdG9yNDA2NS5ob3N0Z2F0b3IuY29t X-Local-Domain: yes X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: 43863 Cc: 43863@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.3 (/) Hi! On Sat, 10 Oct 2020 16:02:53 +0900 Norihiro Tanaka wrote: > On Fri, 9 Oct 2020 12:53:47 +0300 > Shlomi Fish wrote: >=20 > > Hi Norihiro Tanaka! > >=20 > > On Thu, 08 Oct 2020 18:55:50 +0900 > > Norihiro Tanaka wrote: =20 >=20 > Thanks, not 'unusable' but 'unused' is right. Thanks for correcting it. GNU grep's git master passes all tests here (mage= ia linux x86-64 v8) with or without your patch applied, and seems to run fine after "make install" with it applied. --=20 Shlomi Fish https://www.shlomifish.org/ https://shlomifishswiki.branchable.com/Encourage_criticism_and_try_to_get_o= ffended/ Bill Gates, CEO of Microsoft decides to use Richard Stallman=E2=80=99s Emac= s as the basis of his company=E2=80=99s state=E2=80=90of=E2=80=90the=E2=80=90art pro= duct Microsoft Editing Macros=E2=84=A2 Enterprise Edition XP .NET Professional. Please reply to list if it's a mailing list post - https://shlom.in/reply . From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 11 12:56:46 2020 Received: (at 43863-done) by debbugs.gnu.org; 11 Oct 2020 16:56:46 +0000 Received: from localhost ([127.0.0.1]:40933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kReeM-000568-H0 for submit@debbugs.gnu.org; Sun, 11 Oct 2020 12:56:46 -0400 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:45610) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kReeK-00055v-5x for 43863-done@debbugs.gnu.org; Sun, 11 Oct 2020 12:56:45 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 2613316009A; Sun, 11 Oct 2020 09:56:38 -0700 (PDT) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id cm0OracLRJDs; Sun, 11 Oct 2020 09:56:37 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 134281600E9; Sun, 11 Oct 2020 09:56:37 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id rCb5ytQhlVEk; Sun, 11 Oct 2020 09:56:36 -0700 (PDT) Received: from [192.168.1.9] (cpe-23-243-218-95.socal.res.rr.com [23.243.218.95]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id D7F6F16009A; Sun, 11 Oct 2020 09:56:36 -0700 (PDT) Subject: Re: bug#43863: [PATCH] grep: remove unusable code To: Norihiro Tanaka , Shlomi Fish References: <20201008185549.2F13.27F6AC2D@kcn.ne.jp> <20201009125347.0a2b0245@telaviv1.shlomifish.org> <20201010160233.2F17.27F6AC2D@kcn.ne.jp> From: Paul Eggert Autocrypt: addr=eggert@cs.ucla.edu; prefer-encrypt=mutual; keydata= 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 Organization: UCLA Computer Science Department Message-ID: <0cea271c-4372-997b-5048-a867e6fae1fc@cs.ucla.edu> Date: Sun, 11 Oct 2020 09:56:36 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20201010160233.2F17.27F6AC2D@kcn.ne.jp> Content-Type: multipart/mixed; boundary="------------FE050EE9E94DA1553FC2A680" Content-Language: en-US X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 43863-done Cc: 43863-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: -3.3 (---) This is a multi-part message in MIME format. --------------FE050EE9E94DA1553FC2A680 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Thanks for the patch. I installed it, and also installed the attached minor cleanups of related code that I discovered while reviewing it. --------------FE050EE9E94DA1553FC2A680 Content-Type: text/x-patch; charset=UTF-8; name="0001-grep-minor-kwset-cleanups.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-grep-minor-kwset-cleanups.patch" >From f31abf786f61f4bdd7134559a5f155fc9c8c2513 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 11 Oct 2020 09:53:22 -0700 Subject: [PATCH] grep: minor kwset cleanups * src/kwsearch.c (Fexecute): Assume C99 to put declarations nearer uses. * src/kwset.c (bmexec): Omit unnecessary test. * src/kwset.h (struct kwsmatch): Make OFFSET and SIZE individual elements, not arrays of size 1 (a revenant of an earlier API). All uses changed. --- src/kwsearch.c | 36 ++++++++++++------------------------ src/kwset.c | 14 +++++--------- src/kwset.h | 6 +++--- 3 files changed, 20 insertions(+), 36 deletions(-) diff --git a/src/kwsearch.c b/src/kwsearch.c index 1b31917..685502d 100644 --- a/src/kwsearch.c +++ b/src/kwsearch.c @@ -87,8 +87,8 @@ Fcompile (char *pattern, size_t size, reg_syntax_t ignored, bool exact) while (p <= pattern + size); free (buf); - ptrdiff_t words = kwswords (kwset); + ptrdiff_t words = kwswords (kwset); kwsprep (kwset); struct kwsearch *kwsearch = xmalloc (sizeof *kwsearch); @@ -111,32 +111,22 @@ Fexecute (void *vcp, char const *buf, size_t size, size_t *match_size, char const *beg, *end, *mb_start; ptrdiff_t len; char eol = eolbyte; - struct kwsmatch kwsmatch; - size_t ret_val; - bool mb_check; - bool longest; struct kwsearch *kwsearch = vcp; kwset_t kwset = kwsearch->kwset; - size_t mbclen; - - if (match_lines) - mb_check = longest = false; - else - { - mb_check = localeinfo.multibyte & !localeinfo.using_utf8; - longest = mb_check | !!start_ptr | match_words; - } + bool mb_check = localeinfo.multibyte & !localeinfo.using_utf8 & !match_lines; + bool longest = (mb_check | !!start_ptr | match_words) & !match_lines; for (mb_start = beg = start_ptr ? start_ptr : buf; beg <= buf + size; beg++) { + struct kwsmatch kwsmatch; ptrdiff_t offset = kwsexec (kwset, beg - match_lines, buf + size - beg + match_lines, &kwsmatch, longest); if (offset < 0) break; - len = kwsmatch.size[0] - 2 * match_lines; + len = kwsmatch.size - 2 * match_lines; - mbclen = 0; + size_t mbclen = 0; if (mb_check && mb_goback (&mb_start, &mbclen, beg + offset, buf + size) != 0) { @@ -216,10 +206,11 @@ Fexecute (void *vcp, char const *buf, size_t size, size_t *match_size, } if (!len) break; - offset = kwsexec (kwset, beg, --len, &kwsmatch, true); - if (offset != 0) + + struct kwsmatch shorter_match; + if (kwsexec (kwset, beg, --len, &shorter_match, true) != 0) break; - len = kwsmatch.size[0]; + len = shorter_match.size; } /* No word match was found at BEG. Skip past word constituents, @@ -227,7 +218,7 @@ Fexecute (void *vcp, char const *buf, size_t size, size_t *match_size, them could make things much slower. */ beg += wordchars_size (beg, buf + size); mb_start = beg; - } /* for (beg in buf) */ + } return -1; @@ -244,9 +235,6 @@ Fexecute (void *vcp, char const *buf, size_t size, size_t *match_size, beg = beg ? beg + 1 : buf; len = end - beg; success_in_beg_and_len:; - size_t off = beg - buf; - *match_size = len; - ret_val = off; - return ret_val; + return beg - buf; } diff --git a/src/kwset.c b/src/kwset.c index 403af7e..b271e39 100644 --- a/src/kwset.c +++ b/src/kwset.c @@ -760,13 +760,9 @@ bmexec (kwset_t kwset, char const *text, ptrdiff_t size, (kwset->trans ? bmexec_trans (kwset, text, size) : bmexec_trans (kwset, text, size))); - if (0 <= ret) - { - kwsmatch->index = 0; - kwsmatch->offset[0] = ret; - kwsmatch->size[0] = kwset->mind; - } - + kwsmatch->index = 0; + kwsmatch->offset = ret; + kwsmatch->size = kwset->mind; return ret; } @@ -891,8 +887,8 @@ acexec_trans (kwset_t kwset, char const *text, ptrdiff_t len, } kwsmatch->index = accept->accepting / 2; - kwsmatch->offset[0] = left - text; - kwsmatch->size[0] = accept->depth; + kwsmatch->offset = left - text; + kwsmatch->size = accept->depth; return left - text; } diff --git a/src/kwset.h b/src/kwset.h index 793e210..eee3d73 100644 --- a/src/kwset.h +++ b/src/kwset.h @@ -24,9 +24,9 @@ struct kwsmatch { - ptrdiff_t index; /* Index number of matching keyword. */ - ptrdiff_t offset[1]; /* Offset of match. */ - ptrdiff_t size[1]; /* Length of match. */ + ptrdiff_t index; /* Index number of matching keyword. */ + ptrdiff_t offset; /* Offset of match. */ + ptrdiff_t size; /* Length of match. */ }; #include "arg-nonnull.h" -- 2.25.1 --------------FE050EE9E94DA1553FC2A680-- From unknown Wed Aug 20 03:37:53 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 09 Nov 2020 12:24:05 +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