From unknown Sun Jun 15 10:57:16 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60708: pcre: improve support for linking with a library without unicode Resent-From: Carlo Arenas Original-Sender: "Debbugs-submit" Resent-CC: bug-grep@gnu.org Resent-Date: Tue, 10 Jan 2023 11:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60708 X-GNU-PR-Package: grep X-GNU-PR-Keywords: To: 60708@debbugs.gnu.org X-Debbugs-Original-To: bug-grep@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167334922830355 (code B ref -1); Tue, 10 Jan 2023 11:14:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Jan 2023 11:13:48 +0000 Received: from localhost ([127.0.0.1]:38964 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFCZf-0007tX-PD for submit@debbugs.gnu.org; Tue, 10 Jan 2023 06:13:47 -0500 Received: from lists.gnu.org ([209.51.188.17]:56932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFCZd-0007tJ-Q8 for submit@debbugs.gnu.org; Tue, 10 Jan 2023 06:13:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFCZR-00062F-J6 for bug-grep@gnu.org; Tue, 10 Jan 2023 06:13:33 -0500 Received: from mail-oi1-x234.google.com ([2607:f8b0:4864:20::234]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFCZQ-0003lC-4m for bug-grep@gnu.org; Tue, 10 Jan 2023 06:13:33 -0500 Received: by mail-oi1-x234.google.com with SMTP id h185so9722993oif.5 for ; Tue, 10 Jan 2023 03:13:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=vNs5/W6ebtoIilX2D2j++8C0r8vzUctcimbm6g8FR6Q=; b=YUqECBN+293EwOpXvFLw4Kb7CySkqucBe/bz93ZKsIdBAHq3wFejd27lTZC+JJDZ+A lNuA+lBxits+dPdCPZsYZfnsCqbagKdwRLpciJLWxCMJxgWMS5dEBxTSj+ryOMq10CJl lc7dpjIfQjTWrJrW71+PH7CZ/sLGFvfZq0Uj19XWhmkwKwaXI80+TGe7c7L7EJ/rJcHl I0rZ/bShi5Zo3M1sC/4bE7s3al4cVN+OhfRHJMpJfvDFujja8cNu6VXWm+mgeUpIUk9O 7v5ViGRFgMbGOtwGGAEIKpBRDXvh8E2DIY9+36Nt0BpsfQGXmFCkq+DJYb1l84AZvLXG pDpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=vNs5/W6ebtoIilX2D2j++8C0r8vzUctcimbm6g8FR6Q=; b=F05qImg/abtPPeIdesxoX8YLySPpbgBt9HtJtkz3/kk/cLUs5O66jeiJWmpMcCAMg4 f2Obc2S/m8mqkkGxREeKB89xR9VlWWRuo8KOqnRBr8JWRpqEabWj53vNeGtGR6J6hFql EqRqhOAvtn9CQPfpSg1Vkx+M4LLKm19T0JUfCAC3xOCqKc8gcOAuC3U9faO9tCYJw5AR R31u7Hj31tUu+X/7Y9aarz0EWX52wr0M5GUIbU4f4+8pfASg1qR9SwmQinSwqdZPLHdI uvERRpjJgr6H1lmHrhPNEcW/LsMYFKvbNMWPZRdm8/fOTS3FdrWxmyCV+Ubxnid/nbLL k81A== X-Gm-Message-State: AFqh2kqXoMKi9ttjuxQcKzHlJSCXnKGy7rEf/orwR70qeBi8boOCdWpQ Gu3nkHrAHGYtB+zoGFY9Ef27LQdCwPeCWRSZuLXf7RHh X-Google-Smtp-Source: AMrXdXu88fNNL+Fz6zmaCtBFJvXdWUj/UHeovBytIcfBQmMaKVS7F8n6uLCDAZZZiPZsl+Ily44Dvk6juTt7z0CV4Js= X-Received: by 2002:a05:6808:1d9:b0:359:f10b:5477 with SMTP id x25-20020a05680801d900b00359f10b5477mr3809766oic.277.1673349208908; Tue, 10 Jan 2023 03:13:28 -0800 (PST) MIME-Version: 1.0 From: Carlo Arenas Date: Tue, 10 Jan 2023 03:13:17 -0800 Message-ID: Content-Type: multipart/mixed; boundary="0000000000002eea9f05f1e6f9d0" Received-SPF: pass client-ip=2607:f8b0:4864:20::234; envelope-from=carenas@gmail.com; helo=mail-oi1-x234.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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-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 (--) --0000000000002eea9f05f1e6f9d0 Content-Type: text/plain; charset="UTF-8" Noticed while testing the previous patch, and which resulted in tests being skipped for the wrong reason. Carlo --0000000000002eea9f05f1e6f9d0 Content-Type: application/octet-stream; name="0001-pcre-only-use-UTF-when-available-in-the-library.patch" Content-Disposition: attachment; filename="0001-pcre-only-use-UTF-when-available-in-the-library.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lcq4txrr0 RnJvbSAzYzY1ZWE1MzJmNzQ1YTJiYzYxOWVkMWFhMzJiOWMyNjE1NTMyOWMzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/Q2FybG89MjBNYXJjZWxvPTIwQXJlbmFzPTIw QmVsPUMzPUIzbj89IDxjYXJlbmFzQGdtYWlsLmNvbT4KRGF0ZTogRnJpLCA2IEphbiAyMDIzIDIw OjQwOjA3IC0wODAwClN1YmplY3Q6IFtQQVRDSF0gcGNyZTogb25seSB1c2UgVVRGIHdoZW4gYXZh aWxhYmxlIGluIHRoZSBsaWJyYXJ5CgpCZWZvcmUgdGhpcyBjaGFuZ2UsIGlmIGxpbmtlZCB3aXRo IGEgUENSRSBsaWJyYXJ5IHdpdGhvdXQgdW5pY29kZQphbnkgaW52b2NhdGlvbnMgb2YgZ3JlcCB3 aGVuIHVzaW5nIGFuIFVURiBsb2NhbGUgd2lsbCBlcnJvciB3aXRoOgoKICBncmVwOiB0aGlzIHZl cnNpb24gb2YgUENSRTIgZG9lcyBub3QgaGF2ZSBVbmljb2RlIHN1cHBvcnQKCiogc3JjL3BjcmVz ZWFyY2guYzogQ2hlY2sgaWYgVW5pY29kZSB3YXMgY29tcGlsZWQgaW4uCiogdGVzdHMvcGNyZS11 dGY4LXc6IEFkZCBjaGVjayB0byBza2lwIHRlc3QuCiogdGVzdHMvcGNyZS11dGY4OiBVcGRhdGUg Y2hlY2suCi0tLQogc3JjL3BjcmVzZWFyY2guYyAgfCA0ICsrKy0KIHRlc3RzL3BjcmUtdXRmOCAg IHwgMiArLQogdGVzdHMvcGNyZS11dGY4LXcgfCA1ICsrKystCiAzIGZpbGVzIGNoYW5nZWQsIDgg aW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvcGNyZXNlYXJj aC5jIGIvc3JjL3BjcmVzZWFyY2guYwppbmRleCA0NWI2N2VlLi5hYzcwYTIwIDEwMDY0NAotLS0g YS9zcmMvcGNyZXNlYXJjaC5jCisrKyBiL3NyYy9wY3Jlc2VhcmNoLmMKQEAgLTE0MCwxMiArMTQw LDE0IEBAIFBjb21waWxlIChjaGFyICpwYXR0ZXJuLCBpZHhfdCBzaXplLCByZWdfc3ludGF4X3Qg aWdub3JlZCwgYm9vbCBleGFjdCkKICAgaW50IGVjOwogICBpbnQgZmxhZ3MgPSBQQ1JFMl9ET0xM QVJfRU5ET05MWSB8IChtYXRjaF9pY2FzZSA/IFBDUkUyX0NBU0VMRVNTIDogMCk7CiAgIGNoYXIg KnBhdGxpbSA9IHBhdHRlcm4gKyBzaXplOworICBpbnQgdW5pY29kZSA9IDE7CiAgIHN0cnVjdCBw Y3JlX2NvbXAgKnBjID0geGltYWxsb2MgKHNpemVvZiAqcGMpOwogICBwY3JlMl9nZW5lcmFsX2Nv bnRleHQgKmdjb250ZXh0ID0gcGMtPmdjb250ZXh0CiAgICAgPSBwY3JlMl9nZW5lcmFsX2NvbnRl eHRfY3JlYXRlIChwcml2YXRlX21hbGxvYywgcHJpdmF0ZV9mcmVlLCBOVUxMKTsKICAgcGNyZTJf Y29tcGlsZV9jb250ZXh0ICpjY29udGV4dCA9IHBjcmUyX2NvbXBpbGVfY29udGV4dF9jcmVhdGUg KGdjb250ZXh0KTsKIAotICBpZiAobG9jYWxlaW5mby5tdWx0aWJ5dGUpCisgIHBjcmUyX2NvbmZp ZyAoUENSRTJfQ09ORklHX1VOSUNPREUsICZ1bmljb2RlKTsKKyAgaWYgKHVuaWNvZGUgJiYgbG9j YWxlaW5mby5tdWx0aWJ5dGUpCiAgICAgewogICAgICAgaWYgKCEgbG9jYWxlaW5mby51c2luZ191 dGY4KQogICAgICAgICBkaWUgKEVYSVRfVFJPVUJMRSwgMCwgXygiLVAgc3VwcG9ydHMgb25seSB1 bmlieXRlIGFuZCBVVEYtOCBsb2NhbGVzIikpOwpkaWZmIC0tZ2l0IGEvdGVzdHMvcGNyZS11dGY4 IGIvdGVzdHMvcGNyZS11dGY4CmluZGV4IDFiM2IyZDMuLjRkOTdlNjkgMTAwNzU1Ci0tLSBhL3Rl c3RzL3BjcmUtdXRmOAorKysgYi90ZXN0cy9wY3JlLXV0ZjgKQEAgLTE0LDcgKzE0LDcgQEAgTENf QUxMPWVuX1VTLlVURi04IHJlcXVpcmVfcGNyZV8KIGZhaWw9MAogCiBlY2hvICckJyB8IExDX0FM TD1lbl9VUy5VVEYtOCBncmVwIC1xUCAnXHB7U30nIFwKLSAgfHwgc2tpcF8gJ1BDUkUgc3VwcG9y dCBpcyBjb21waWxlZCBvdXQsIG9yIGl0IGRvZXMgbm90IHN1cHBvcnQgcHJvcGVydGllcycKKyAg fHwgc2tpcF8gJ1BDUkUgdW5pY29kZSBzdXBwb3J0IGlzIGNvbXBpbGVkIG91dCcKIAogZXVybz0n XDM0MlwyMDJcMjU0IGV1cm8nCiBwcmludGYgIiRldXJvXFxuIiA+IGluIHx8IGZyYW1ld29ya19m YWlsdXJlXwpkaWZmIC0tZ2l0IGEvdGVzdHMvcGNyZS11dGY4LXcgYi90ZXN0cy9wY3JlLXV0Zjgt dwppbmRleCA0Y2Q3ZGI2Li44MWFjOWZmIDEwMDc1NQotLS0gYS90ZXN0cy9wY3JlLXV0Zjgtdwor KysgYi90ZXN0cy9wY3JlLXV0ZjgtdwpAQCAtMTMsOSArMTMsMTIgQEAgTENfQUxMPWVuX1VTLlVU Ri04CiBleHBvcnQgTENfQUxMCiByZXF1aXJlX3BjcmVfCiAKK2VjaG8gLiB8IGdyZXAgLXFQICco KlVURikuJyAyPi9kZXYvbnVsbCBcCisgIHx8IHNraXBfICdQQ1JFIHVuaWNvZGUgc3VwcG9ydCBp cyBjb21waWxlZCBvdXQnCisKIGZhaWw9MAogCi1lY2hvICdQZXLDuic+IGluIHx8IGZyYW1ld29y a19mYWlsdXJlXworZWNobyAnUGVyw7onID4gaW4gfHwgZnJhbWV3b3JrX2ZhaWx1cmVfCiAKIGVj aG8gJ8O6JyA+IGV4cCB8fCBmcmFtZXdvcmtfZmFpbHVyZV8KIGdyZXAgLVBvICcuXGInIGluID4g b3V0IHx8IGZhaWw9MQotLSAKMi4zNy4xIChBcHBsZSBHaXQtMTM3LjEpCgo= --0000000000002eea9f05f1e6f9d0-- From unknown Sun Jun 15 10:57:16 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60708: pcre: improve support for linking with a library without unicode Resent-From: Jim Meyering Original-Sender: "Debbugs-submit" Resent-CC: bug-grep@gnu.org Resent-Date: Wed, 11 Jan 2023 05:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60708 X-GNU-PR-Package: grep X-GNU-PR-Keywords: To: Carlo Arenas Cc: 60708@debbugs.gnu.org Received: via spool by 60708-submit@debbugs.gnu.org id=B60708.167341549232242 (code B ref 60708); Wed, 11 Jan 2023 05:39:02 +0000 Received: (at 60708) by debbugs.gnu.org; 11 Jan 2023 05:38:12 +0000 Received: from localhost ([127.0.0.1]:41524 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFToS-0008Ny-BT for submit@debbugs.gnu.org; Wed, 11 Jan 2023 00:38:12 -0500 Received: from mail-lj1-f171.google.com ([209.85.208.171]:47033) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFToQ-0008Nl-Ad for 60708@debbugs.gnu.org; Wed, 11 Jan 2023 00:38:10 -0500 Received: by mail-lj1-f171.google.com with SMTP id bn6so14903188ljb.13 for <60708@debbugs.gnu.org>; Tue, 10 Jan 2023 21:38:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7KAZ0hKb/xQKnkGtja/Vowka0xmC52dwD9QQIzuMPB0=; b=bt2uWPWhRp1PR4+osNTx4s2n5WBGQAzRnFiIcJA7CeAFv5xTeSUtoWYwMHJYr/INBA E04tQ2U1+NDbbqnJLZ9UJg1WAaDaklefak55UDNBIxsIbM5m9VrDDC5an2DCp9OIgBZA Eiqzm+qlXAcbW7lei2I0otGaaMqvpCvYrmZQa886cspbN3nKFaLiTxBH5/lnQkY+FGKu B44EzNb7CF1aX7HwAa77Pcacb5o2yLJBpMhWK1igcAnP34239ugdMBfOOC4StnJTMMQz 6V1uiXgd7KjTRHzO86+4wjhpZXlbrBBqpv+aB4o3HzXkU9ucaf9EbVBVUqF0vHDk0PZV 9lbA== X-Gm-Message-State: AFqh2kqreEVrz9AFZkMohT+J7nx94FZ36qNuxz8Sm9/u1Rs2B+av8Y7K jqbvOKa3IQxk9q4AotRhNCU3PymfO340CaDdIkQ= X-Google-Smtp-Source: AMrXdXtHwhYnEf9D4/JRPicnnqT+R+OfNFudxYgvUAICp1wAjU19heETwJTGFxUC+JDLHEaYDzHxZXOfn+NEFM3DwrE= X-Received: by 2002:a2e:a723:0:b0:288:ea8c:80ea with SMTP id s35-20020a2ea723000000b00288ea8c80eamr2964lje.306.1673415484335; Tue, 10 Jan 2023 21:38:04 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Jim Meyering Date: Tue, 10 Jan 2023 21:37:51 -0800 Message-ID: Content-Type: multipart/mixed; boundary="00000000000082549a05f1f66705" X-Spam-Score: 0.2 (/) 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.8 (/) --00000000000082549a05f1f66705 Content-Type: text/plain; charset="UTF-8" On Tue, Jan 10, 2023 at 3:19 AM Carlo Arenas wrote: > Noticed while testing the previous patch, and which resulted in tests > being skipped for the wrong reason. Thanks for catching that. I'll push the following tomorrow. It has a tiny change that moves the declaration of "unicode" down to just before where it's set and changes its type to uint32_t. --00000000000082549a05f1f66705 Content-Type: application/octet-stream; name="pcre-no-unicode.diff" Content-Disposition: attachment; filename="pcre-no-unicode.diff" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lcr8c1vs0 RnJvbSBkMzA2YjkyZWRjYmNhM2FmZWMyNDM3MGIzYjI1ZDQxZGJmNTU2Y2ZmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/Q2FybG89MjBNYXJjZWxvPTIwQXJlbmFzPTIw QmVsPUMzPUIzbj89IDxjYXJlbmFzQGdtYWlsLmNvbT4KRGF0ZTogRnJpLCA2IEphbiAyMDIzIDIw OjQwOjA3IC0wODAwClN1YmplY3Q6IFtQQVRDSF0gcGNyZTogdXNlIFVURiBvbmx5IHdoZW4gYXZh aWxhYmxlIGluIHRoZSBsaWJyYXJ5CgpCZWZvcmUgdGhpcyBjaGFuZ2UsIGlmIGxpbmtlZCB3aXRo IGEgUENSRSBsaWJyYXJ5IHdpdGhvdXQgdW5pY29kZQphbnkgaW52b2NhdGlvbnMgb2YgZ3JlcCB3 aGVuIHVzaW5nIGEgVVRGIGxvY2FsZSB3aWxsIGVycm9yIHdpdGg6CgogIGdyZXA6IHRoaXMgdmVy c2lvbiBvZiBQQ1JFMiBkb2VzIG5vdCBoYXZlIFVuaWNvZGUgc3VwcG9ydAoKKiBzcmMvcGNyZXNl YXJjaC5jOiBDaGVjayB3aGV0aGVyIFVuaWNvZGUgd2FzIGNvbXBpbGVkIGluLgoqIHRlc3RzL3Bj cmUtdXRmOC13OiBBZGQgY2hlY2sgdG8gc2tpcCB0ZXN0LgoqIHRlc3RzL3BjcmUtdXRmODogVXBk YXRlIGNoZWNrLgotLS0KIHNyYy9wY3Jlc2VhcmNoLmMgIHwgNCArKystCiB0ZXN0cy9wY3JlLXV0 ZjggICB8IDIgKy0KIHRlc3RzL3BjcmUtdXRmOC13IHwgNSArKysrLQogMyBmaWxlcyBjaGFuZ2Vk LCA4IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL3BjcmVz ZWFyY2guYyBiL3NyYy9wY3Jlc2VhcmNoLmMKaW5kZXggNDViNjdlZS4uYTgwMzRmYiAxMDA2NDQK LS0tIGEvc3JjL3BjcmVzZWFyY2guYworKysgYi9zcmMvcGNyZXNlYXJjaC5jCkBAIC0xNDUsNyAr MTQ1LDkgQEAgUGNvbXBpbGUgKGNoYXIgKnBhdHRlcm4sIGlkeF90IHNpemUsIHJlZ19zeW50YXhf dCBpZ25vcmVkLCBib29sIGV4YWN0KQogICAgID0gcGNyZTJfZ2VuZXJhbF9jb250ZXh0X2NyZWF0 ZSAocHJpdmF0ZV9tYWxsb2MsIHByaXZhdGVfZnJlZSwgTlVMTCk7CiAgIHBjcmUyX2NvbXBpbGVf Y29udGV4dCAqY2NvbnRleHQgPSBwY3JlMl9jb21waWxlX2NvbnRleHRfY3JlYXRlIChnY29udGV4 dCk7CgotICBpZiAobG9jYWxlaW5mby5tdWx0aWJ5dGUpCisgIHVpbnQzMl90IHVuaWNvZGUgPSAx OworICBwY3JlMl9jb25maWcgKFBDUkUyX0NPTkZJR19VTklDT0RFLCAmdW5pY29kZSk7CisgIGlm ICh1bmljb2RlICYmIGxvY2FsZWluZm8ubXVsdGlieXRlKQogICAgIHsKICAgICAgIGlmICghIGxv Y2FsZWluZm8udXNpbmdfdXRmOCkKICAgICAgICAgZGllIChFWElUX1RST1VCTEUsIDAsIF8oIi1Q IHN1cHBvcnRzIG9ubHkgdW5pYnl0ZSBhbmQgVVRGLTggbG9jYWxlcyIpKTsKZGlmZiAtLWdpdCBh L3Rlc3RzL3BjcmUtdXRmOCBiL3Rlc3RzL3BjcmUtdXRmOAppbmRleCAxYjNiMmQzLi40ZDk3ZTY5 IDEwMDc1NQotLS0gYS90ZXN0cy9wY3JlLXV0ZjgKKysrIGIvdGVzdHMvcGNyZS11dGY4CkBAIC0x NCw3ICsxNCw3IEBAIExDX0FMTD1lbl9VUy5VVEYtOCByZXF1aXJlX3BjcmVfCiBmYWlsPTAKCiBl Y2hvICckJyB8IExDX0FMTD1lbl9VUy5VVEYtOCBncmVwIC1xUCAnXHB7U30nIFwKLSAgfHwgc2tp cF8gJ1BDUkUgc3VwcG9ydCBpcyBjb21waWxlZCBvdXQsIG9yIGl0IGRvZXMgbm90IHN1cHBvcnQg cHJvcGVydGllcycKKyAgfHwgc2tpcF8gJ1BDUkUgdW5pY29kZSBzdXBwb3J0IGlzIGNvbXBpbGVk IG91dCcKCiBldXJvPSdcMzQyXDIwMlwyNTQgZXVybycKIHByaW50ZiAiJGV1cm9cXG4iID4gaW4g fHwgZnJhbWV3b3JrX2ZhaWx1cmVfCmRpZmYgLS1naXQgYS90ZXN0cy9wY3JlLXV0ZjgtdyBiL3Rl c3RzL3BjcmUtdXRmOC13CmluZGV4IDRjZDdkYjYuLjgxYWM5ZmYgMTAwNzU1Ci0tLSBhL3Rlc3Rz L3BjcmUtdXRmOC13CisrKyBiL3Rlc3RzL3BjcmUtdXRmOC13CkBAIC0xMyw5ICsxMywxMiBAQCBM Q19BTEw9ZW5fVVMuVVRGLTgKIGV4cG9ydCBMQ19BTEwKIHJlcXVpcmVfcGNyZV8KCitlY2hvIC4g fCBncmVwIC1xUCAnKCpVVEYpLicgMj4vZGV2L251bGwgXAorICB8fCBza2lwXyAnUENSRSB1bmlj b2RlIHN1cHBvcnQgaXMgY29tcGlsZWQgb3V0JworCiBmYWlsPTAKCi1lY2hvICdQZXLDuic+IGlu IHx8IGZyYW1ld29ya19mYWlsdXJlXworZWNobyAnUGVyw7onID4gaW4gfHwgZnJhbWV3b3JrX2Zh aWx1cmVfCgogZWNobyAnw7onID4gZXhwIHx8IGZyYW1ld29ya19mYWlsdXJlXwogZ3JlcCAtUG8g Jy5cYicgaW4gPiBvdXQgfHwgZmFpbD0xCi0tIAoyLjM5LjAuMTMyLmc4YTRlOGY2YTY3Cgo= --00000000000082549a05f1f66705-- From unknown Sun Jun 15 10:57:16 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60708: pcre: improve support for linking with a library without unicode Resent-From: Paul Eggert Original-Sender: "Debbugs-submit" Resent-CC: bug-grep@gnu.org Resent-Date: Wed, 11 Jan 2023 21:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60708 X-GNU-PR-Package: grep X-GNU-PR-Keywords: To: Jim Meyering , Carlo Arenas Cc: 60708@debbugs.gnu.org Received: via spool by 60708-submit@debbugs.gnu.org id=B60708.167347160931408 (code B ref 60708); Wed, 11 Jan 2023 21:14:02 +0000 Received: (at 60708) by debbugs.gnu.org; 11 Jan 2023 21:13:29 +0000 Received: from localhost ([127.0.0.1]:44086 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFiPZ-0008AV-Eu for submit@debbugs.gnu.org; Wed, 11 Jan 2023 16:13:29 -0500 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:53672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFiPW-0008AD-Jz for 60708@debbugs.gnu.org; Wed, 11 Jan 2023 16:13:27 -0500 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 35B14160066; Wed, 11 Jan 2023 13:13:20 -0800 (PST) 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 W1af6woyBAN8; Wed, 11 Jan 2023 13:13:19 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 7D8A6160069; Wed, 11 Jan 2023 13:13:19 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.9.2 zimbra.cs.ucla.edu 7D8A6160069 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu; s=78364E5A-2AF3-11ED-87FA-8298ECA2D365; t=1673471599; bh=iWioG6tSacPK4YWp0aqMPPcd3HiZU5PHDuSn0iHdiT0=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type: Content-Transfer-Encoding; b=h9nRBl3EXz02sjs6U7O6aO9Ch4noywL4h4GLewvTyEGbUP1aOyOArBGOHnKeG0h75 XjDZ9pcDzt4fuS6rKoJ6jbVSkZJhj1S75EmiyoeQBM4hsrtk1byLGkvTTarRkikLI8 EDOtBnBFvRdmjMHiNb4+gIdoht9WJiwn+GyQIo5A= 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 DgrrscBNr2Am; Wed, 11 Jan 2023 13:13:19 -0800 (PST) Received: from [192.168.1.9] (cpe-172-91-119-151.socal.res.rr.com [172.91.119.151]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 4C322160066; Wed, 11 Jan 2023 13:13:19 -0800 (PST) Message-ID: <877b0bfb-52ec-3d3e-01cf-6e9760ca82d9@cs.ucla.edu> Date: Wed, 11 Jan 2023 13:13:19 -0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Content-Language: en-US References: From: Paul Eggert Organization: UCLA Computer Science Department In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -3.4 (---) 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.4 (----) On 2023-01-10 21:37, Jim Meyering wrote: > + uint32_t unicode = 1; > + pcre2_config (PCRE2_CONFIG_UNICODE, &unicode); > + if (unicode && localeinfo.multibyte) Shouldn't that be: uint32_t unicode; if (localeinfo.multibyte && 0 <= pcre2_config (PCRE2_CONFIG_UNICODE, &unicode) && unicode) That is, don't bother to call pcre2_config in a unibyte locale, and don't initialize 'unicode' (so that valgrind-like tools can detect an error if pcre2_config is buggy), and check the return value of pcre2_config. From unknown Sun Jun 15 10:57:16 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60708: pcre: improve support for linking with a library without unicode Resent-From: Carlo Arenas Original-Sender: "Debbugs-submit" Resent-CC: bug-grep@gnu.org Resent-Date: Wed, 11 Jan 2023 22:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60708 X-GNU-PR-Package: grep X-GNU-PR-Keywords: To: Paul Eggert Cc: Jim Meyering , 60708@debbugs.gnu.org Received: via spool by 60708-submit@debbugs.gnu.org id=B60708.167347516013801 (code B ref 60708); Wed, 11 Jan 2023 22:13:01 +0000 Received: (at 60708) by debbugs.gnu.org; 11 Jan 2023 22:12:40 +0000 Received: from localhost ([127.0.0.1]:44126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFjKq-0003aW-2h for submit@debbugs.gnu.org; Wed, 11 Jan 2023 17:12:40 -0500 Received: from mail-oi1-f170.google.com ([209.85.167.170]:41820) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFjKm-0003aG-Hz for 60708@debbugs.gnu.org; Wed, 11 Jan 2023 17:12:39 -0500 Received: by mail-oi1-f170.google.com with SMTP id i127so13900274oif.8 for <60708@debbugs.gnu.org>; Wed, 11 Jan 2023 14:12:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Sk/eUozwOIjn5Vzg6rIDTiF7ciFovTAskKMIgj/IZ6E=; b=bwBAHRb572CbaFo/3lE+AQrpS8OIGwQMyAmlIpVcXr+Pd1tc6CKxAnLoF0NWlJS7q5 8mrC/l5bxAfhwb7X6hmJk2SRlVFwsxiIQaq0HiGM+N/U/WhDzr7QGLB/m6EKe27oqzHM wK62NxFY0Y9WABGF0BLTYwkOA8NoTglE5mEqdMuaioGYUc9VUbnW8qtsdHUBxs1mQRuN uu+BvemhWUZ6vRqgqUm+AxlQi1utBe651XowNpQidDM8SC0FKtfIwIYm7h48QDiPLW2f 5DqMhbs7w+VJGuNWX8MX5Jqezxr1oRmVmC/iDDweHkvjCDtah1g0fFqm2md/9BpySbqx wrbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Sk/eUozwOIjn5Vzg6rIDTiF7ciFovTAskKMIgj/IZ6E=; b=F5CjqiCulU91lwnXF93PyxhKFigwNfqKj+VcugF23J+jmVEDghw/zmpI5MXWhMwd2l dhSDcZgNRkjWdg7jO3zI4Kn4y/m11JVDLZOuDE8YfKJM3qXTatKnkM6wKmi9mkDPS+iW aOd/gPj0CFLwdLmLC5D3+WDYx3nI3cwsBNP2Fna2pyVvOkckieb32g2yyJ18kwdRD+M2 p6OQMvNXyt+EqP2MHHys9HQ7li5fi2nEz/QKhVvlURQJHpNE27dRt6uTfFDk9cYqj7WW n+HLTmwT6EiANwQAsdSoDOD1m74Y64TtVsiWe+1osnuKsbJE2qlr3hD4mJUXJLdN0QM5 6B8A== X-Gm-Message-State: AFqh2kojlKQiAYn49ne1o+FwQ2+WjKw0fdMfCF4Ha7nwmqgZOdqwZG12 thgXaElWXqe9IslGDA6d8GjyvJ0ZsPDoGSs9GO8= X-Google-Smtp-Source: AMrXdXsMMAFOgv3TV0fnE/QjS99EbPuaa62xn7kLeXjGJwA4JFsI8e6GeJj2VEJmqPkjGwv1lXhDuikvAcfzgzwCb8w= X-Received: by 2002:aca:1b1a:0:b0:364:8ed9:a037 with SMTP id b26-20020aca1b1a000000b003648ed9a037mr9886oib.59.1673475150620; Wed, 11 Jan 2023 14:12:30 -0800 (PST) MIME-Version: 1.0 References: <877b0bfb-52ec-3d3e-01cf-6e9760ca82d9@cs.ucla.edu> In-Reply-To: <877b0bfb-52ec-3d3e-01cf-6e9760ca82d9@cs.ucla.edu> From: Carlo Arenas Date: Wed, 11 Jan 2023 14:12:19 -0800 Message-ID: Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) 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 (-) pcre2_config does a static check (defined at compile time) and therefore is unlikely to fail and might be even under the right circumstances optimized out. you are correct that setting the original value was meant to protect from that function failing and will ensure the original path was still being taken (which I thought was safer), while your suggested change will take the opposite one (not setting UTF in a multibyte locale, which will fail in different ways). either way, IMHO, considering that most PCRE libraries have utf enabled (the default) the original code was the less likely to introduce any changing behaviour or even code changes (because of the expected optimization), but agree might have been too clever without a corresponding explanation. Carlo From unknown Sun Jun 15 10:57:16 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60708: pcre: improve support for linking with a library without unicode Resent-From: Paul Eggert Original-Sender: "Debbugs-submit" Resent-CC: bug-grep@gnu.org Resent-Date: Thu, 12 Jan 2023 02:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60708 X-GNU-PR-Package: grep X-GNU-PR-Keywords: To: Carlo Arenas Cc: Jim Meyering , 60708@debbugs.gnu.org Received: via spool by 60708-submit@debbugs.gnu.org id=B60708.167349058015123 (code B ref 60708); Thu, 12 Jan 2023 02:30:02 +0000 Received: (at 60708) by debbugs.gnu.org; 12 Jan 2023 02:29:40 +0000 Received: from localhost ([127.0.0.1]:44289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFnLY-0003vq-4i for submit@debbugs.gnu.org; Wed, 11 Jan 2023 21:29:40 -0500 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:34248) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFnLT-0003vX-48 for 60708@debbugs.gnu.org; Wed, 11 Jan 2023 21:29:38 -0500 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 06B0C160060; Wed, 11 Jan 2023 18:29:28 -0800 (PST) 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 CwBUj6v6DcYI; Wed, 11 Jan 2023 18:29:27 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 2FD26160069; Wed, 11 Jan 2023 18:29:27 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.9.2 zimbra.cs.ucla.edu 2FD26160069 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu; s=78364E5A-2AF3-11ED-87FA-8298ECA2D365; t=1673490567; bh=9dd+xKsmCzXd4JWnMVpw07WZy7kePYr83Rlaj4g+Cs4=; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type: Content-Transfer-Encoding; b=ce1+8G59NlSAftucCZ6dyVmcka4DKKBe1FOqokoAlh6y6d5fqjocXfDn4elPr1uCw l9mChZe5EzLn5H/RWp6vYOjwNaznO6fZe+g837h6XPhhlPcvhDuOaZEKnvUP8HN5MD vHSI4KYd0pfenUvDiNA5bBJtrYW7U6d7glSYa60U= 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 TqGNaTBOUqF8; Wed, 11 Jan 2023 18:29:27 -0800 (PST) Received: from [131.179.64.200] (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 0D9EF160060; Wed, 11 Jan 2023 18:29:27 -0800 (PST) Message-ID: <69bf34c4-4448-f5cb-5ab0-9deaa97e8d5b@cs.ucla.edu> Date: Wed, 11 Jan 2023 18:29:26 -0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Content-Language: en-US References: <877b0bfb-52ec-3d3e-01cf-6e9760ca82d9@cs.ucla.edu> From: Paul Eggert Organization: UCLA Computer Science Department In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -3.4 (---) 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.4 (----) On 1/11/23 14:12, Carlo Arenas wrote: > pcre2_config does a static check (defined at compile time) and > therefore is unlikely to fail and might be even under the right > circumstances optimized out. Not sure what is meant by "static check" here. The call won't be optimized out unless you compile with -flto or equivalent, and have the source code to pcre2 as well as the source code to grep. And in that case the two forms should generate equivalent code (no insns needed). > you are correct that setting the original value was meant to protect > from that function failing and will ensure the original path was still > being taken (which I thought was safer), while your suggested change > will take the opposite one (not setting UTF in a multibyte locale, > which will fail in different ways). Oh, I think see your point, but doesn't this mean that even my code was too trusting? It should be something like this: if (localeinfo.multibyte) { uint32_t unicode; if (! (localeinfo.using_utf8 && 0 <= pcre2_config (PCRE2_CONFIG_UNICODE, &unicode) && unicode)) die (EXIT_TROUBLE, 0, _("-P supports only unibyte and UTF-8 locales")); ... That is, we're better off diagnosing the problem and not attempting to use pcre2 if the result will be wrong (or even result in undefined behavior). The problem is unlikely to occur so it's good to be conservative here. From unknown Sun Jun 15 10:57:16 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60708: pcre: improve support for linking with a library without unicode Resent-From: Carlo Arenas Original-Sender: "Debbugs-submit" Resent-CC: bug-grep@gnu.org Resent-Date: Thu, 12 Jan 2023 04:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60708 X-GNU-PR-Package: grep X-GNU-PR-Keywords: To: Paul Eggert Cc: Jim Meyering , 60708@debbugs.gnu.org Received: via spool by 60708-submit@debbugs.gnu.org id=B60708.167349624424564 (code B ref 60708); Thu, 12 Jan 2023 04:05:01 +0000 Received: (at 60708) by debbugs.gnu.org; 12 Jan 2023 04:04:04 +0000 Received: from localhost ([127.0.0.1]:44382 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFoot-0006O8-Vp for submit@debbugs.gnu.org; Wed, 11 Jan 2023 23:04:04 -0500 Received: from mail-oi1-f176.google.com ([209.85.167.176]:44714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFoor-0006Ne-1P for 60708@debbugs.gnu.org; Wed, 11 Jan 2023 23:04:02 -0500 Received: by mail-oi1-f176.google.com with SMTP id e205so14385466oif.11 for <60708@debbugs.gnu.org>; Wed, 11 Jan 2023 20:04:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=zRULEIuq8OX6bPBZ3x/AEU1iffJqOgKzo3BTU7Nrs2M=; b=BX5qOZUDx5v1DwCqe36MZYsTridkG0E949rlv8BKVhWvev+6sPnCJElk/+jfot3Vsk XukjW09gRzp/Jb9krWs6ONJoL3x/mMITJL+00L5hkivXll35zhvawpohuPee2/tdUgVu 8pALsdln14xcLWzqWvgsBRSUfZbCrpKUJjXgsK+e1dIF5uuBxcs/qp7/3LKbEX0wJeDK a7vhUkJvnwGRPztEXbblvSchkx8AWZYtaGQoePgay2De1dAokoK/RynIZdL4lR36sZcQ GUo4xv+LfPC+rVVFkQrxE/j1q5T4uS4zqGjuRXUR5SLiEVCHWMf9vx4JTZqPAJzBTDo/ XUAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zRULEIuq8OX6bPBZ3x/AEU1iffJqOgKzo3BTU7Nrs2M=; b=U3XmiE3TU8cYg4D/MshAlyzgU19iipAnydXY8e4TsjGF3kyLkU0vfzVnQ64Ztmu62R GRsTHHVCW01QP8JYT5V7sEgNO0mhRNc5HoBxkNnlhIFaoiq3qRLgjc/LrolFFEpNzvTM hsMUhc9vV6fEpP9wN4qaTxbDSpYe0re2lisl5d1ae0JMlA5qojh0/OlPY+P8au8NrPbU wVMIq0CqeBrDul/R1zOymD5909C+zRuuswsAc36Jrge1eBf+0Avovvh4boVUjnoWvH/+ zUeLh1zTlAzGs/sqJINyijmSAayHYUxCOmtEqeH/4vao6ubAg2l3UsErAe8l4F2ir8Fq lrCg== X-Gm-Message-State: AFqh2koMaYyGbdjw9sbBrhMxluzjVatFNi/u/cjBqXYZ2zcipv8FLgpf cbY5UmcufI50gi4cOugeT0wfKKqH32o7PVpfSO0= X-Google-Smtp-Source: AMrXdXsfXwg4mvKElvzG6ByrcJOfYBYhBxYXwRXGXiAbnhV1iEoqUR5Hglp7epNni5Wf4fppQCBwpuRDnx9unOZLvBM= X-Received: by 2002:aca:1b1a:0:b0:364:8ed9:a037 with SMTP id b26-20020aca1b1a000000b003648ed9a037mr46947oib.59.1673496235195; Wed, 11 Jan 2023 20:03:55 -0800 (PST) MIME-Version: 1.0 References: <877b0bfb-52ec-3d3e-01cf-6e9760ca82d9@cs.ucla.edu> <69bf34c4-4448-f5cb-5ab0-9deaa97e8d5b@cs.ucla.edu> In-Reply-To: <69bf34c4-4448-f5cb-5ab0-9deaa97e8d5b@cs.ucla.edu> From: Carlo Arenas Date: Wed, 11 Jan 2023 20:03:43 -0800 Message-ID: Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) 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 (-) On Wed, Jan 11, 2023 at 6:29 PM Paul Eggert wrote: > > Oh, I think see your point, but doesn't this mean that even my code was > too trusting? It should be something like this: > > if (localeinfo.multibyte) > { > uint32_t unicode; > if (! (localeinfo.using_utf8 > && 0 <= pcre2_config (PCRE2_CONFIG_UNICODE, &unicode) > && unicode)) > die (EXIT_TROUBLE, 0, _("-P supports only unibyte and UTF-8 > locales")); > ... > > That is, we're better off diagnosing the problem and not attempting to > use pcre2 if the result will be wrong (or even result in undefined > behavior). The problem is unlikely to occur so it's good to be > conservative here. Maybe we are not clear on what the "problem" is. The issue the original code was trying to avoid was to set PCRE_UTF if the library doesn't have Unicode support, as that would block grep with a PCRE error (as shown in the commit message), and which also disabled some tests as it couldn't be differentiated with a failure in grep because -P wasn't supported. Your suggested code doesn't address that, it merely changes the error message with one that would be IMHO even less clear and worsens the problem. Using a non Unicode PCRE library is perfectly fine, and there is no "undefined behavior" risk, and indeed `grep -P` without the UTF flag is exactly what the alternate path uses and what is recommended for speed, so? Carlo From unknown Sun Jun 15 10:57:16 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60708: pcre: improve support for linking with a library without unicode Resent-From: Paul Eggert Original-Sender: "Debbugs-submit" Resent-CC: bug-grep@gnu.org Resent-Date: Fri, 13 Jan 2023 03:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60708 X-GNU-PR-Package: grep X-GNU-PR-Keywords: To: Carlo Arenas Cc: Jim Meyering , 60708@debbugs.gnu.org Received: via spool by 60708-submit@debbugs.gnu.org id=B60708.16735811423168 (code B ref 60708); Fri, 13 Jan 2023 03:40:01 +0000 Received: (at 60708) by debbugs.gnu.org; 13 Jan 2023 03:39:02 +0000 Received: from localhost ([127.0.0.1]:49057 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGAuE-0000p2-0O for submit@debbugs.gnu.org; Thu, 12 Jan 2023 22:39:02 -0500 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:52132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGAuC-0000oW-15 for 60708@debbugs.gnu.org; Thu, 12 Jan 2023 22:39:01 -0500 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id AAE61160069; Thu, 12 Jan 2023 19:38:53 -0800 (PST) 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 O6sZdHFSw6qT; Thu, 12 Jan 2023 19:38:52 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id B6D0616006A; Thu, 12 Jan 2023 19:38:52 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.9.2 zimbra.cs.ucla.edu B6D0616006A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu; s=78364E5A-2AF3-11ED-87FA-8298ECA2D365; t=1673581132; bh=6GowIaLdhXCRPgekYP8qmiSTLjc37dfITIL1iW2qsVM=; h=Content-Type:Message-ID:Date:MIME-Version:Subject:To:From; b=GbMuViFby4uZpVNt0yGA6n9vrkHVV7kev/qL9ZOEwU0SciFshu2SNJXTbtBI8Cabl mqPItXGkLJ/n4z/XHNx03AaPMPd2jFEjjTy2qDYp3HY5rjUuAxfsSwEo9MgMRM55oS lMcqtZ18TixCm/AthNHoulm49k1E/2i+13q3Rm5E= 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 v1wihFFuTqTS; Thu, 12 Jan 2023 19:38:52 -0800 (PST) Received: from [131.179.64.200] (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 965C6160069; Thu, 12 Jan 2023 19:38:52 -0800 (PST) Content-Type: multipart/mixed; boundary="------------62KqryS51rIBxNYwOE2j4PqS" Message-ID: <0869fabd-af25-d295-5d67-b704f5fc8c87@cs.ucla.edu> Date: Thu, 12 Jan 2023 19:38:52 -0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Content-Language: en-US References: <877b0bfb-52ec-3d3e-01cf-6e9760ca82d9@cs.ucla.edu> <69bf34c4-4448-f5cb-5ab0-9deaa97e8d5b@cs.ucla.edu> From: Paul Eggert Organization: UCLA Computer Science Department In-Reply-To: X-Spam-Score: -3.4 (---) 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.4 (----) This is a multi-part message in MIME format. --------------62KqryS51rIBxNYwOE2j4PqS Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 1/11/23 20:03, Carlo Arenas wrote: > Your suggested code doesn't address > that, it merely changes the error message with one that would be IMHO > even less clear and worsens the problem. In that case let's improve the error message wording; something like the attached patch, say. > Using a non Unicode PCRE library is perfectly fine, and there is no > "undefined behavior" risk, and indeed `grep -P` without the UTF flag > is exactly what the alternate path uses and what is recommended for > speed, so? It's not a question of undefined behavior. It's a question of whether grep does what the user requested. Without the attached patch, in a UTF-8 locale "grep -P '[[:alpha:]]'" won't report matching alphabetic characters, if they're multibyte. Silent misbehavior is quite bad, and it's better for grep to issue a diagnostic and exit than to silently do the wrong thing. --------------62KqryS51rIBxNYwOE2j4PqS Content-Type: text/x-patch; charset=UTF-8; name="0001-grep-diagnose-no-UTF-8-support-Bug-60708.patch" Content-Disposition: attachment; filename="0001-grep-diagnose-no-UTF-8-support-Bug-60708.patch" Content-Transfer-Encoding: base64 RnJvbSBhZDk4NmFjMmE1MGY5OGE4NzMxYTE0MWEyZDU1YzQ5YjYxM2U0OGU1IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBUaHUsIDEyIEphbiAyMDIzIDE5OjM1OjA4IC0wODAwClN1YmplY3Q6IFtQQVRD SF0gZ3JlcDogZGlhZ25vc2Ugbm8gVVRGLTggc3VwcG9ydCAoQnVnIzYwNzA4KQoKKiBzcmMv cGNyZXNlYXJjaC5jIChQY29tcGlsZSk6IElzc3VlIGEgZGlhZ25vc3RpYyBhbmQgZXhpdCBp bnN0ZWFkCm9mIG1pc2JlaGF2aW5nIGlmIGxpYnBjcmUyIGRvZXMgbm90IHN1cHBvcnQgdGhl IHJlcXVlc3RlZCBsb2NhbGUuCi0tLQogc3JjL3BjcmVzZWFyY2guYyB8IDggKysrKystLS0K IDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvc3JjL3BjcmVzZWFyY2guYyBiL3NyYy9wY3Jlc2VhcmNoLmMKaW5kZXggYTgw MzRmYi4uNWIxMTFiZSAxMDA2NDQKLS0tIGEvc3JjL3BjcmVzZWFyY2guYworKysgYi9zcmMv cGNyZXNlYXJjaC5jCkBAIC0xNDUsMTAgKzE0NSwxMiBAQCBQY29tcGlsZSAoY2hhciAqcGF0 dGVybiwgaWR4X3Qgc2l6ZSwgcmVnX3N5bnRheF90IGlnbm9yZWQsIGJvb2wgZXhhY3QpCiAg ICAgPSBwY3JlMl9nZW5lcmFsX2NvbnRleHRfY3JlYXRlIChwcml2YXRlX21hbGxvYywgcHJp dmF0ZV9mcmVlLCBOVUxMKTsKICAgcGNyZTJfY29tcGlsZV9jb250ZXh0ICpjY29udGV4dCA9 IHBjcmUyX2NvbXBpbGVfY29udGV4dF9jcmVhdGUgKGdjb250ZXh0KTsKIAotICB1aW50MzJf dCB1bmljb2RlID0gMTsKLSAgcGNyZTJfY29uZmlnIChQQ1JFMl9DT05GSUdfVU5JQ09ERSwg JnVuaWNvZGUpOwotICBpZiAodW5pY29kZSAmJiBsb2NhbGVpbmZvLm11bHRpYnl0ZSkKKyAg aWYgKGxvY2FsZWluZm8ubXVsdGlieXRlKQogICAgIHsKKyAgICAgIHVpbnQzMl90IHVuaWNv ZGU7CisgICAgICBpZiAocGNyZTJfY29uZmlnIChQQ1JFMl9DT05GSUdfVU5JQ09ERSwgJnVu aWNvZGUpIDwgMCB8fCAhdW5pY29kZSkKKyAgICAgICAgZGllIChFWElUX1RST1VCTEUsIDAs CisgICAgICAgICAgICAgXygiLVAgc3VwcG9ydHMgb25seSB1bmlieXRlIGxvY2FsZXMgb24g dGhpcyBwbGF0Zm9ybSIpKTsKICAgICAgIGlmICghIGxvY2FsZWluZm8udXNpbmdfdXRmOCkK ICAgICAgICAgZGllIChFWElUX1RST1VCTEUsIDAsIF8oIi1QIHN1cHBvcnRzIG9ubHkgdW5p Ynl0ZSBhbmQgVVRGLTggbG9jYWxlcyIpKTsKICAgICAgIGZsYWdzIHw9IChQQ1JFMl9VVEYg fCBQQ1JFMl9VQ1ApOwotLSAKMi4zOS4wCgo= --------------62KqryS51rIBxNYwOE2j4PqS-- From unknown Sun Jun 15 10:57:16 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60708: pcre: improve support for linking with a library without unicode Resent-From: Carlo Arenas Original-Sender: "Debbugs-submit" Resent-CC: bug-grep@gnu.org Resent-Date: Fri, 13 Jan 2023 05:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60708 X-GNU-PR-Package: grep X-GNU-PR-Keywords: To: Paul Eggert Cc: Jim Meyering , 60708@debbugs.gnu.org Received: via spool by 60708-submit@debbugs.gnu.org id=B60708.16735892942386 (code B ref 60708); Fri, 13 Jan 2023 05:55:02 +0000 Received: (at 60708) by debbugs.gnu.org; 13 Jan 2023 05:54:54 +0000 Received: from localhost ([127.0.0.1]:49203 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGD1i-0000cP-I7 for submit@debbugs.gnu.org; Fri, 13 Jan 2023 00:54:54 -0500 Received: from mail-ot1-f44.google.com ([209.85.210.44]:39461) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGD1h-0000cD-H0 for 60708@debbugs.gnu.org; Fri, 13 Jan 2023 00:54:54 -0500 Received: by mail-ot1-f44.google.com with SMTP id i26-20020a9d68da000000b00672301a1664so11781489oto.6 for <60708@debbugs.gnu.org>; Thu, 12 Jan 2023 21:54:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=VKeNwv+fbK1BPlNmm8ng11EY89qlsEvvGhVuB/fD97M=; b=hbXoO1xSEkDCT5z8GIKVNWM1yiIkUqBMsewGYrZODddx4KCm/N4R/+NGYCbAO3PrmY 5VfKKsiVDVCFLBHeTVvpAKzwJHQJx9tWz5ksZXTLqW1fizysW/7HyBe+b79OwIEhxKhc QBNX40ZnSIvT7vvkGQTB03k0RuVFRupe1bEbp9tYGKd33o+nyyygNJy0uKyRn6VotU5F UnK1rV4jHVCXdyV0kBHcchOpTF1+91Isz76yv0FzC3hsXd0xDtHQRsl5oslUQyC8R+s4 fmJF2jL0HkZbjaqsxDuAE7VlCl4FhrkUqMpAmF46kyFNvOIo2/AV5L6I1YQ3LkDR5Pyc DhJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=VKeNwv+fbK1BPlNmm8ng11EY89qlsEvvGhVuB/fD97M=; b=FwUQ/+H5eMu7koTSwNgOhxEvceeJE8bnlBSmDF5OvP/iFWVI70JdicIyT0N90hl/69 SK+OXdMzSwMxWy3dh7QuvvTGzsabNQzI3SUfJK5j0b9ZMtZ94JwvXwfdH5a7gkCtycYx VzP9AZNs6Om1uUk2hF69ZHlC+92/RO/zAeQ24mIG7VbM2/zgebKnBoorV8cG2OlFMDPt R0WSENp/M8cVEueGhlTQ/lt17nZtR/VGp9fHaQw2uRmpj1MMCDUb2uP5LQBcOmWYM28K ku7K3Qw9s5530/lqwWnJI5N3gGG+8mJ4qZZ7kwZuuE94xoH1Y+2+/e+CQ+BZxCFEKC2K FFEA== X-Gm-Message-State: AFqh2ko7bTo28zO8aYkvRCmaCG5pmJ6YNTV5w5U/Icie6DhYigRQoqu+ 9oLaFIEVXr5qLUbPTVZKn6LMXys1BYm5qMKlv80= X-Google-Smtp-Source: AMrXdXu433iVwb/7dlM9MQTlZSfsdiDb/0iI2NpI2wh8DBBPkEFZnbiomRQ6q4J5epgwvTLYY68ah0zs7jNfilwVnKM= X-Received: by 2002:a9d:6e2:0:b0:675:4bf4:dba0 with SMTP id 89-20020a9d06e2000000b006754bf4dba0mr5025845otx.162.1673589287730; Thu, 12 Jan 2023 21:54:47 -0800 (PST) MIME-Version: 1.0 References: <877b0bfb-52ec-3d3e-01cf-6e9760ca82d9@cs.ucla.edu> <69bf34c4-4448-f5cb-5ab0-9deaa97e8d5b@cs.ucla.edu> <0869fabd-af25-d295-5d67-b704f5fc8c87@cs.ucla.edu> In-Reply-To: <0869fabd-af25-d295-5d67-b704f5fc8c87@cs.ucla.edu> From: Carlo Arenas Date: Thu, 12 Jan 2023 21:54:36 -0800 Message-ID: Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) 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 (-) On Thu, Jan 12, 2023 at 7:38 PM Paul Eggert wrote: > > Without the attached patch, in a > UTF-8 locale "grep -P '[[:alpha:]]'" won't report matching alphabetic > characters, if they're multibyte. Silent misbehavior is quite bad, and > it's better for grep to issue a diagnostic and exit than to silently do > the wrong thing. Fair enough, this will likely need a new test though, and of course changes to the current ones as well. Right now they will report that grep doesn't have '-P' support instead of reporting that unicode is missing, and take into consideration those tests that set multibyte locale were successful after my change, so they will also need changes as they would misbehave silently otherwise. Carlo From unknown Sun Jun 15 10:57:16 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60708: pcre: improve support for linking with a library without unicode Resent-From: Paul Eggert Original-Sender: "Debbugs-submit" Resent-CC: bug-grep@gnu.org Resent-Date: Fri, 13 Jan 2023 07:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60708 X-GNU-PR-Package: grep X-GNU-PR-Keywords: To: Carlo Arenas Cc: Jim Meyering , 60708@debbugs.gnu.org Received: via spool by 60708-submit@debbugs.gnu.org id=B60708.167359547932519 (code B ref 60708); Fri, 13 Jan 2023 07:38:01 +0000 Received: (at 60708) by debbugs.gnu.org; 13 Jan 2023 07:37:59 +0000 Received: from localhost ([127.0.0.1]:49427 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGEdT-0008SQ-BW for submit@debbugs.gnu.org; Fri, 13 Jan 2023 02:37:59 -0500 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:40848) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGEdR-0008S9-3q for 60708@debbugs.gnu.org; Fri, 13 Jan 2023 02:37:58 -0500 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 33D3216006A; Thu, 12 Jan 2023 23:37:51 -0800 (PST) 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 N0XkrGhg8RbO; Thu, 12 Jan 2023 23:37:50 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 4DBDE16006D; Thu, 12 Jan 2023 23:37:50 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.9.2 zimbra.cs.ucla.edu 4DBDE16006D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu; s=78364E5A-2AF3-11ED-87FA-8298ECA2D365; t=1673595470; bh=A1RpRaLgC3z91bedYnhUdrknLS8M8x6/+ZpTCVdArQc=; h=Content-Type:Message-ID:Date:MIME-Version:To:From:Subject; b=AgoIoqxeGOwpkml6osbIKYM//+q410i05QtbdmVji4SW3jZMBtmKLaM2sEAArB4eY nTDX3rWM0vLIxAmT089AkdBEiP1ro4RJV1gnrmJII8iBtCC1pqLRAK3AHM8Uwams8Q KpXe6c4OGRukmGTf6Gfi7s7o5NfeBhq808bbU33w= 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 cwvrdv9_78Eq; Thu, 12 Jan 2023 23:37:50 -0800 (PST) Received: from [192.168.1.9] (cpe-172-91-119-151.socal.res.rr.com [172.91.119.151]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 2131616006A; Thu, 12 Jan 2023 23:37:50 -0800 (PST) Content-Type: multipart/mixed; boundary="------------qn79NsLN7mqkTDX5jLhNe3r4" Message-ID: <655a6db1-4e56-01a3-0f9c-38c7501279cd@cs.ucla.edu> Date: Thu, 12 Jan 2023 23:37:47 -0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 References: <877b0bfb-52ec-3d3e-01cf-6e9760ca82d9@cs.ucla.edu> <69bf34c4-4448-f5cb-5ab0-9deaa97e8d5b@cs.ucla.edu> <0869fabd-af25-d295-5d67-b704f5fc8c87@cs.ucla.edu> Content-Language: en-US From: Paul Eggert Organization: UCLA Computer Science Department In-Reply-To: X-Spam-Score: -3.4 (---) 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.4 (----) This is a multi-part message in MIME format. --------------qn79NsLN7mqkTDX5jLhNe3r4 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2023-01-12 21:54, Carlo Arenas wrote: > On Thu, Jan 12, 2023 at 7:38 PM Paul Eggert wrote: > Fair enough, this will likely need a new test though, and of course > changes to the current ones as well. > > Right now they will report that grep doesn't have '-P' support instead > of reporting that unicode is missing, and take into consideration > those tests that set multibyte locale were successful after my change, > so they will also need changes as they would misbehave silently > otherwise. OK, I installed it with the attached additional patch, which attempts to address these issues. The new test is done by init.cfg each time you run require_pcre_ in a UTF-8 locale. The current tests are changed by altering require_pcre_ to do the right thing in the en_US.UTF-8 locale (I also tightened up the other locales' testing slightly). The new require_pcre_ uses a different diagnostic when checking en_US.UTF-8 locale. Since all the PCRE tests are done in either the C or the en_US.UTF-8 locale, this should be good enough. --------------qn79NsLN7mqkTDX5jLhNe3r4 Content-Type: text/x-patch; charset=UTF-8; name="0001-tests-better-diagnostic-for-P-sans-Unicode.patch" Content-Disposition: attachment; filename="0001-tests-better-diagnostic-for-P-sans-Unicode.patch" Content-Transfer-Encoding: base64 RnJvbSAyMzFhM2VhNjZkNTU2YzcwOWI1M2VjYzkzYmRjMDcyYmUzZThmN2NlIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBUaHUsIDEyIEphbiAyMDIzIDIzOjExOjU5IC0wODAwClN1YmplY3Q6IFtQQVRD SF0gdGVzdHM6IGJldHRlciBkaWFnbm9zdGljIGZvciAtUCBzYW5zIFVuaWNvZGUKCiogdGVz dHMvaW5pdC5jZmcgKHJlcXVpcmVfcGNyZV8pOiBXaGVuIGluIGEgVVRGLTggbG9jYWxlLCB0 ZXN0CmFsc28gZm9yIFVuaWNvZGUgc3VwcG9ydCBzbyB0aGF0IGl0IGNhbiBiZSBkaWFnbm9z ZWQgZGlmZmVyZW50bHkKKEJ1ZyM2MDcwOCkuCi0tLQogdGVzdHMvaW5pdC5jZmcgfCAxNiAr KysrKysrKysrKystLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgNCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9pbml0LmNmZyBiL3Rlc3RzL2luaXQu Y2ZnCmluZGV4IDUxNTQ4MmMuLjRhYTU2ZWEgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2luaXQuY2Zn CisrKyBiL3Rlc3RzL2luaXQuY2ZnCkBAIC00OCwxMCArNDgsMTggQEAgcmVxdWlyZV90aW1l b3V0XygpCiAKIHJlcXVpcmVfcGNyZV8oKQogewotICBlY2hvIC4gfCBncmVwIC1QIC4gMj5l cnIgfHwgewotICAgIHRlc3QgJD8gLWVxIDEgJiYgZmFpbF8gUENSRSBhdmFpbGFibGUsIGJ1 dCBkb2VzIG5vdCB3b3JrLgotICAgIHNraXBfIG5vIFBDUkUgc3VwcG9ydAotICB9CisgIGNh c2UgJExDX0FMTCBpbgorICAgICouVVRGLTgpCisgICAgICBwcmludGYgJ1wzMDNcMjQxXG4n IHwgZ3JlcCAtUCAnXi4kJyAyPmVyciB8fCB7CisgICAgICAgIHRlc3QgJD8gLWVxIDEgJiYg ZmFpbF8gUENSRSBhdmFpbGFibGUsIGJ1dCBkb2VzIG5vdCB3b3JrCisgICAgICAgIHNraXBf IG5vIFBDUkUgVW5pY29kZSBzdXBwb3J0CisgICAgICB9OzsKKyAgICAqKQorICAgICAgZWNo byAuIHwgZ3JlcCAtUCAnXi4kJyAyPmVyciB8fCB7CisgICAgICAgIHRlc3QgJD8gLWVxIDEg JiYgZmFpbF8gUENSRSBhdmFpbGFibGUsIGJ1dCBkb2VzIG5vdCB3b3JrLgorICAgICAgICBz a2lwXyBubyBQQ1JFIHN1cHBvcnQKKyAgICAgIH07OworICBlc2FjCiAgIGNvbXBhcmUgL2Rl di9udWxsIGVyciB8fCBmYWlsXyBQQ1JFIGF2YWlsYWJsZSwgYnV0IHN0ZGVyciBub3QgZW1w dHkuCiB9CiAKLS0gCjIuMzcuMgoK --------------qn79NsLN7mqkTDX5jLhNe3r4--