From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 26 18:08:57 2024 Received: (at submit) by debbugs.gnu.org; 26 Oct 2024 22:08:57 +0000 Received: from localhost ([127.0.0.1]:42796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4oxr-0004vC-Qb for submit@debbugs.gnu.org; Sat, 26 Oct 2024 18:08:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:35262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4oxo-0004v1-8x for submit@debbugs.gnu.org; Sat, 26 Oct 2024 18:08:53 -0400 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 1t4oxF-0003k8-T6 for bug-gnu-emacs@gnu.org; Sat, 26 Oct 2024 18:08:17 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t4oxD-0000qK-4O for bug-gnu-emacs@gnu.org; Sat, 26 Oct 2024 18:08:17 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-71e70c32cd7so2526324b3a.1 for ; Sat, 26 Oct 2024 15:08:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729980493; x=1730585293; darn=gnu.org; h=subject:from:to:content-language:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=EORNrAaY4znKE5kODx8nl8aBLkGSPDpdpvlbD0GmOL0=; b=HmIn9eiQXmGbCi2k/gmMfRJmhFsxi2F+9oxmaUSmZJJAjRRs1/zdqntWkKHUuQpyOB LyjMZNdX9OAv45J//o9TcuFdsec5Am7aMj/FSibumuFKJumHDVkM2JcKenrKo6FiguIc c8Q+ZdKHw5/jyt8OkAmcincmQuLRCa9h/jmhVsri9nM0fH+/KC49uJjO/SXUp+1U1BA6 pMgD0GVCY+mnY6XH6lRixuVTRu6C/NnamkaiMT7SeFlm+8KV7jAi/eHUIN2hAHhnlmhr MENvby/DIucaglF2vA51UKFC1My6EUZStf6cHl6X0zqOcf+5o1stEYR0zxb3HlHKbikK 85tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729980493; x=1730585293; h=subject:from:to:content-language:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=EORNrAaY4znKE5kODx8nl8aBLkGSPDpdpvlbD0GmOL0=; b=kEXKSuNbuayp20LR8a0X4OR1A/N3TgpU0rLe8QOTSmbUsulxTqAkHIT1/kOzGElLwB 1DMZt8v0T2nTjxyO9isFr+T6Z5CfIRj8EfKLq5hOipLG/DG6w5VU4h16jd2rwFZxStDd zcLTQ1tztl9cb3zTl1dLjTFpUCuOGU0j0RCUlYm3y+dESmztfRtU9HkA/2nZ+IamHy+f X3AauvIb/pf0ZPaVkn2vg9PmDuJmkJK6cjVTaepPeMgXfYGdYQX6+MbP0IyWvYX6rem7 r3rhZ9y7cBpSp0/nU2xqqiBVXCo+rtGPhzD8wsWaQrRSuwHZy/1jaxxuHnaUesOaitw6 j7qA== X-Gm-Message-State: AOJu0YxbpHvK7epNxfepg2ZUYlxH03GyzEbwRtvRkUpmDQ29vrVQ9CTi lFKOiv6DB2eHR7zOFhECYIYQLp7SEX0hPPXwA3XC8PYjbHUACsKAsYyAvA== X-Google-Smtp-Source: AGHT+IH+RYqQ10KGiL9AKDWHw7YPPcEsKu/ky4C2fF2o5bDT5g0KBm6b9Z2oiqKyJl2hpZtLCplOTw== X-Received: by 2002:a05:6a00:1703:b0:71e:5d1d:1aa2 with SMTP id d2e1a72fcca58-72062fa0b5bmr5862288b3a.7.1729980491590; Sat, 26 Oct 2024 15:08:11 -0700 (PDT) Received: from [192.168.1.2] (syn-023-240-098-037.res.spectrum.com. [23.240.98.37]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-7205791dd65sm3256595b3a.18.2024.10.26.15.08.10 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 26 Oct 2024 15:08:10 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------lRD07bEiI4FhfAOJktczbXwB" Message-ID: <27fb2d7e-cbeb-9c9e-8a3d-d5a7ea750f6e@gmail.com> Date: Sat, 26 Oct 2024 15:08:10 -0700 MIME-Version: 1.0 X-Mozilla-News-Host: news://news.gmane.io:119 Content-Language: en-US To: bug-gnu-emacs@gnu.org From: Jim Porter Subject: 31.0.50; [PATCH] Improve accuracy of Eshell globbing syntax Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=jporterbugs@gmail.com; helo=mail-pf1-x42e.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-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 (--) This is a multi-part message in MIME format. --------------lRD07bEiI4FhfAOJktczbXwB Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit I've been tracking down a few issues with how Eshell parses its globs. For example: ~ $ echo **/ # Prints all subdirectories of the current dir (good) ~ $ echo '**/' **/ # Prints the literal string (also good) ~ $ echo \**/ # Prints all subdirectories (bad!) There are a few reasons this happens but one of the things that makes this code more brittle is that Eshell defaults to treating characters as globs, and you have to opt out via an 'escape' text property. By inverting this logic, and proactively marking globbing characters with 'eshell-glob-char', it now means that all the rules for determining which characters are globs and which are literals is in em-glob.el, so it should be harder to break in the future. --------------lRD07bEiI4FhfAOJktczbXwB Content-Type: text/plain; charset=UTF-8; name="0001-Improve-correctness-of-Eshell-globs-when-using-escap.patch" Content-Disposition: attachment; filename*0="0001-Improve-correctness-of-Eshell-globs-when-using-escap.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAxOTVmMjU5YWU4ZjhmYzE3YmZlZTFjODVlYzc4M2IzMWU1YWU3MTI4IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IE1vbiwgMjEgT2N0IDIwMjQgMTU6NDE6NDIgLTA3MDAKU3ViamVjdDogW1BB VENIXSBJbXByb3ZlIGNvcnJlY3RuZXNzIG9mIEVzaGVsbCBnbG9icyB3aGVuIHVzaW5nIGVz Y2FwZQogY2hhcmFjdGVycwoKVGhpcyBuZXcgaW1wbGVtZW50YXRpb24gb3B0cyAqaW4qIHRv IHRyZWF0aW5nIGNoYXJhY3RlcnMgYXMgZ2xvYgpjaGFyYWN0ZXJzLCByYXRoZXIgdGhhbiBv cHRpbmcgb3V0LiAgVGhpcyByZWR1Y2VzIHRoZSBuZWVkIHRvIGNvb3JkaW5hdGUKd2l0aCBv dGhlciBwYXJ0cyBvZiBFc2hlbGwgYW5kIHNob3VsZCBiZSBoYXJkZXIgdG8gYnJlYWsuCgoq IGxpc3AvZXNoZWxsL2VtLWdsb2IuZWwgKGVzaGVsbC1wYXJzZS1nbG9iLWNoYXJzKTogUmV0 dXJuIHRoZQpwcm9wZXJ0aXplZCBnbG9iYmluZyBjaGFyYWN0ZXIgZGlyZWN0bHkuCihlc2hl bGwtLXByb3BlcnRpemUtZ2xvYiwgZXNoZWxsLS1nbG9iLWNoYXItcCkKKGVzaGVsbC0tY29u dGFpbnMtZ2xvYi1jaGFyLXAsIGVzaGVsbC0tYWxsLWdsb2ItY2hhcnMtcCk6IE5ldyBmdW5j dGlvbnMuCihlc2hlbGwtZ2xvYi1wKTogTWFrZSBvYnNvbGV0ZS4KKGVzaGVsbC1nbG9iLXJl Z2V4cCwgZXNoZWxsLWdsb2ItY29udmVydC0xLCBlc2hlbGwtZ2xvYi1jb252ZXJ0KTogQ2hl Y2sKZm9yICdlc2hlbGwtZ2xvYi1jaGFyJyBwcm9wZXJ0eS4KKGVzaGVsbC1leHRlbmRlZC1n bG9iKTogUmVtb3ZlIHRleHQgcHJvcGVydGllcyB3aGVuIHJldHVybmluZyBubyBtYXRjaC4K KGVzaGVsbC0tZ2xvYi1hbnl0aGluZyk6IE5ldyBjb25zdGFudC4KKGVzaGVsbC1nbG9iLWVu dHJpZXMpOiBQcm9wZXJ0aXplICIqIiB0byB0cmVhdCBpdCBhcyBhIGdsb2IuCgoqIGxpc3Av ZXNoZWxsL2VtLWxzLmVsIChlc2hlbGwtbHMtLWV4cGFuZC13aWxkY2FyZHMpOiBOZXcgZnVu Y3Rpb24uLi4KKGVzaGVsbC1scy0taW5zZXJ0LWRpcmVjdG9yeSk6IC4uLiB1c2UgaXQuCgoq IHRlc3QvbGlzcC9lc2hlbGwvZW0tZ2xvYi10ZXN0cy5lbDogVXNlICdlc2hlbGwtLXByb3Bl cnRpemUtZ2xvYicgaW4KdGVzdHMuCihlbS1nbG9iLXRlc3QvY29udmVydC9saXRlcmFsLWNo YXJhY3RlcnMpCihlbS1nbG9iLXRlc3QvY29udmVydC9taXhlZC1saXRlcmFsLWNoYXJhY3Rl cnMpOiBOZXcgdGVzdHMuCgoqIGxpc3AvZXNoZWxsL2VtLWdsb2IuZWwKKGVzaGVsbC1leHBh bmQtZ2xvYik6IFJlbmFtZSBmcm9tICdlc2hlbGwtZXh0ZW5kZWQtZ2xvYicuICBVcGRhdGUK Y2FsbGVycy4KKGVzaGVsbC1leHRlbmRlZC1nbG9iKTogTmV3IGZ1bmN0aW9uIHRvIGV4cGFu ZCBhIEdMT0IgdGhhdCBoYXNuJ3QgYmVlbgpwcm9wZXJ0aXplZCB5ZXQsIGZvciB1c2Ugb3V0 c2lkZSBvZiBFc2hlbGwgY29tbWFuZCBmb3Jtcy4KKGVzaGVsbC1wYXJzZS1nbG9iLWNoYXJz KTogUmV0dXJuIHRoZSBwcm9wZXJ0aXplZCBnbG9iYmluZyBjaGFyYWN0ZXIKZGlyZWN0bHku Cihlc2hlbGwtcGFyc2UtZ2xvYi1zdHJpbmcsIGVzaGVsbC0tZ2xvYi1jaGFyLXApCihlc2hl bGwtLWNvbnRhaW5zLWdsb2ItY2hhci1wLCBlc2hlbGwtLWFsbC1nbG9iLWNoYXJzLXApOiBO ZXcgZnVuY3Rpb25zLgooZXNoZWxsLWdsb2ItcmVnZXhwLCBlc2hlbGwtZ2xvYi1jb252ZXJ0 LTEsIGVzaGVsbC1nbG9iLWNvbnZlcnQpOiBDaGVjawpmb3IgJ2VzaGVsbC1nbG9iLWNoYXIn IHByb3BlcnR5LgooZXNoZWxsLWdsb2ItcCk6IE1ha2Ugb2Jzb2xldGUuCihlc2hlbGwtLWds b2ItYW55dGhpbmcpOiBOZXcgY29uc3RhbnQuLi4KKGVzaGVsbC1nbG9iLWVudHJpZXMpOiAu Li4gdXNlIGl0LgoKKiBsaXNwL2VzaGVsbC9lbS1scy5lbCAoZXNoZWxsLWxzLS1leHBhbmQt d2lsZGNhcmRzKTogTmV3IGZ1bmN0aW9uLi4uCihlc2hlbGwtbHMtLWluc2VydC1kaXJlY3Rv cnkpOiAuLi4gdXNlIGl0LgoKKiB0ZXN0L2xpc3AvZXNoZWxsL2VtLWdsb2ItdGVzdHMuZWw6 IFVzZSAnZXNoZWxsLXBhcnNlLWdsb2Itc3RyaW5nIGluCnRlc3RzLgooZW0tZ2xvYi10ZXN0 L2NvbnZlcnQvbGl0ZXJhbC1jaGFyYWN0ZXJzKQooZW0tZ2xvYi10ZXN0L2NvbnZlcnQvbWl4 ZWQtbGl0ZXJhbC1jaGFyYWN0ZXJzKTogTmV3IHRlc3RzLgotLS0KIGxpc3AvZXNoZWxsL2Vt LWdsb2IuZWwgICAgICAgICAgICB8IDE0MSArKysrKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0KIGxpc3AvZXNoZWxsL2VtLWxzLmVsICAgICAgICAgICAgICB8ICAxOSArKy0tCiB0ZXN0 L2xpc3AvZXNoZWxsL2VtLWdsb2ItdGVzdHMuZWwgfCAgNDggKysrKysrLS0tLQogMyBmaWxl cyBjaGFuZ2VkLCAxNDAgaW5zZXJ0aW9ucygrKSwgNjggZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvbGlzcC9lc2hlbGwvZW0tZ2xvYi5lbCBiL2xpc3AvZXNoZWxsL2VtLWdsb2IuZWwK aW5kZXggNTdiYjBjNTNiNTcuLmI5NGM0ZTNlZDQ2IDEwMDY0NAotLS0gYS9saXNwL2VzaGVs bC9lbS1nbG9iLmVsCisrKyBiL2xpc3AvZXNoZWxsL2VtLWdsb2IuZWwKQEAgLTE0OSwyMyAr MTQ5LDQ4IEBAIGVzaGVsbC1uby1jb21tYW5kLWdsb2JiaW5nCiAgICJEb24ndCBnbG9iIHRo ZSBjb21tYW5kIGFyZ3VtZW50LiAgUmVmbGVjdCB0aGlzIGJ5IG1vZGlmeWluZyBURVJNUy4i CiAgIChpZ25vcmUKICAgIChwY2FzZSAoY2FyIHRlcm1zKQotICAgICAoKG9yIGAoZXNoZWxs LWV4dGVuZGVkLWdsb2IgLHRlcm0pCi0gICAgICAgICAgYChlc2hlbGwtc3BsaWNlLWFyZ3Mg KGVzaGVsbC1leHRlbmRlZC1nbG9iICx0ZXJtKSkpCisgICAgICgob3IgYChlc2hlbGwtZXhw YW5kLWdsb2IgLHRlcm0pCisgICAgICAgICAgYChlc2hlbGwtc3BsaWNlLWFyZ3MgKGVzaGVs bC1leHBhbmQtZ2xvYiAsdGVybSkpKQogICAgICAgKHNldGNhciB0ZXJtcyB0ZXJtKSkpKSkK IAogKGRlZnVuIGVzaGVsbC1hZGQtZ2xvYi1tb2RpZmllciAoKQotICAiQWRkIGBlc2hlbGwt ZXh0ZW5kZWQtZ2xvYicgdG8gdGhlIGFyZ3VtZW50IG1vZGlmaWVyIGxpc3QuIgorICAiQWRk IGBlc2hlbGwtZXhwYW5kLWdsb2InIHRvIHRoZSBhcmd1bWVudCBtb2RpZmllciBsaXN0LiIK ICAgKHdoZW4gZXNoZWxsLWdsb2Itc3BsaWNlLXJlc3VsdHMKICAgICAoYWRkLWhvb2sgJ2Vz aGVsbC1jdXJyZW50LW1vZGlmaWVycyAjJ2VzaGVsbC1zcGxpY2UtYXJncyA5OSkpCi0gIChh ZGQtaG9vayAnZXNoZWxsLWN1cnJlbnQtbW9kaWZpZXJzICMnZXNoZWxsLWV4dGVuZGVkLWds b2IpKQorICAoYWRkLWhvb2sgJ2VzaGVsbC1jdXJyZW50LW1vZGlmaWVycyAjJ2VzaGVsbC1l eHBhbmQtZ2xvYikpCiAKIChkZWZ1biBlc2hlbGwtcGFyc2UtZ2xvYi1jaGFycyAoKQotICAi UGFyc2UgYSBnbG9iYmluZyBkZWxpbWl0ZXIuCi1UaGUgY2hhcmFjdGVyIGlzIG5vdCBhZHZh bmNlZCBmb3Igb3JkaW5hcnkgZ2xvYmJpbmcgY2hhcmFjdGVycywgc28KLXRoYXQgb3RoZXIg ZnVuY3Rpb24gbWF5IGhhdmUgYSBjaGFuY2UgdG8gb3ZlcnJpZGUgdGhlIGdsb2JiaW5nCi1p bnRlcnByZXRhdGlvbi4iCisgICJQYXJzZSBhIGdsb2JiaW5nIGNoYXJhY3Rlci4iCiAgICh3 aGVuIChtZW1xIChjaGFyLWFmdGVyKSBlc2hlbGwtZ2xvYi1jaGFycy1saXN0KQotICAgIChp Z25vcmUgKGVzaGVsbC1hZGQtZ2xvYi1tb2RpZmllcikpKSkKKyAgICAoZXNoZWxsLWFkZC1n bG9iLW1vZGlmaWVyKQorICAgIChwcm9nMQorICAgICAgICAocHJvcGVydGl6ZSAoY2hhci10 by1zdHJpbmcgKGNoYXItYWZ0ZXIpKSAnZXNoZWxsLWdsb2ItY2hhciB0KQorICAgICAgKGZv cndhcmQtY2hhcikpKSkKKworKGRlZnZhciBlc2hlbGwtZ2xvYi1jaGFycy1yZWdleHAgbmls KQorKGRlZnN1YnN0IGVzaGVsbC1nbG9iLWNoYXJzLXJlZ2V4cCAoKQorICAiUmV0dXJuIHRo ZSBsYXppbHktY3JlYXRlZCB2YWx1ZSBmb3IgYGVzaGVsbC1nbG9iLWNoYXJzLXJlZ2V4cCcu IgorICAob3IgZXNoZWxsLWdsb2ItY2hhcnMtcmVnZXhwCisgICAgICAoc2V0cS1sb2NhbCBl c2hlbGwtZ2xvYi1jaGFycy1yZWdleHAKKyAgICAgICAgICAgICAgICAgIChyeC10by1zdHJp bmcgYCgrIChhbnkgLEBlc2hlbGwtZ2xvYi1jaGFycy1saXN0KSkgdCkpKSkKKworKGRlZnVu IGVzaGVsbC1wYXJzZS1nbG9iLXN0cmluZyAoZ2xvYikKKyAgIkFkZCB0ZXh0IHByb3BlcnRp ZXMgdG8gZ2xvYiBjaGFyYWN0ZXJzIGluIEdMT0IgYW5kIHJldHVybiB0aGUgcmVzdWx0LiIK KyAgKGxldCAoKHJlZ2V4cCAocngtdG8tc3RyaW5nCisgICAgICAgICAgICAgICAgIGAob3Ig KHNlcSAoZ3JvdXAtbiAxICJcXCIpIGFueWNoYXIpCisgICAgICAgICAgICAgICAgICAgICAg KGdyb3VwLW4gMiAocmVnZXhwICwoZXNoZWxsLWdsb2ItY2hhcnMtcmVnZXhwKSkpKQorICAg ICAgICAgICAgICAgICB0KSkpCisgICAgKHdpdGgtdGVtcC1idWZmZXIKKyAgICAgIChpbnNl cnQgZ2xvYikKKyAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1pbikpCisgICAgICAod2hpbGUg KHJlLXNlYXJjaC1mb3J3YXJkIHJlZ2V4cCBuaWwgdCkKKyAgICAgICAgKGNvbmQKKyAgICAg ICAgICgobWF0Y2gtYmVnaW5uaW5nIDEpICAgICAgICAgICA7IFJlbW92ZSBiYWNrc2xhc2gg ZXNjYXBlLgorICAgICAgICAgIChkZWxldGUtcmVnaW9uIChtYXRjaC1iZWdpbm5pbmcgMSkg KG1hdGNoLWVuZCAxKSkpCisgICAgICAgICAoKG1hdGNoLWJlZ2lubmluZyAyKSAgICAgICAg ICAgOyBQcm9wZXJ0aXplIGdsb2JiaW5nIGNoYXJhY3Rlci4KKyAgICAgICAgICAocHV0LXRl eHQtcHJvcGVydHkgKG1hdGNoLWJlZ2lubmluZyAyKSAobWF0Y2gtZW5kIDIpCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICdlc2hlbGwtZ2xvYi1jaGFyIHQpKSkpCisgICAgICAo YnVmZmVyLXN0cmluZykpKSkKIAogKGRlZnZhciBlc2hlbGwtZ2xvYi1tYXRjaGVzKQogKGRl ZnZhciBtZXNzYWdlLXNob3duKQpAQCAtMTc0LDEyICsxOTksMTYgQEAgZXNoZWxsLWdsb2It cmVjdXJzaXZlLWFsaXN0CiAgICcoKCIqKi8iIC4gcmVjdXJzZSkKICAgICAoIioqKi8iIC4g cmVjdXJzZS1zeW1saW5rKSkpCiAKLShkZWZ2YXIgZXNoZWxsLWdsb2ItY2hhcnMtcmVnZXhw IG5pbCkKLShkZWZzdWJzdCBlc2hlbGwtZ2xvYi1jaGFycy1yZWdleHAgKCkKLSAgIlJldHVy biB0aGUgbGF6aWx5LWNyZWF0ZWQgdmFsdWUgZm9yIGBlc2hlbGwtZ2xvYi1jaGFycy1yZWdl eHAnLiIKLSAgKG9yIGVzaGVsbC1nbG9iLWNoYXJzLXJlZ2V4cAotICAgICAgKHNldHEtbG9j YWwgZXNoZWxsLWdsb2ItY2hhcnMtcmVnZXhwCi0gICAgICAgICAgICAgICAgICAocngtdG8t c3RyaW5nIGAoKyAoYW55ICxAZXNoZWxsLWdsb2ItY2hhcnMtbGlzdCkpIHQpKSkpCisoZGVm c3Vic3QgZXNoZWxsLS1nbG9iLWNoYXItcCAoc3RyaW5nIGluZGV4KQorICAoZ2V0LXRleHQt cHJvcGVydHkgaW5kZXggJ2VzaGVsbC1nbG9iLWNoYXIgc3RyaW5nKSkKKworKGRlZnN1YnN0 IGVzaGVsbC0tY29udGFpbnMtZ2xvYi1jaGFyLXAgKHN0cmluZykKKyAgKHRleHQtcHJvcGVy dHktYW55IDAgKGxlbmd0aCBzdHJpbmcpICdlc2hlbGwtZ2xvYi1jaGFyIHQgc3RyaW5nKSkK KworKGRlZnVuIGVzaGVsbC0tYWxsLWdsb2ItY2hhcnMtcCAoc3RyaW5nKQorICAoYW5kIChs ZW5ndGg+IHN0cmluZyAwKQorICAgICAgIChub3QgKHRleHQtcHJvcGVydHktbm90LWFsbAor ICAgICAgICAgICAgIDAgKGxlbmd0aCBzdHJpbmcpICdlc2hlbGwtZ2xvYi1jaGFyIHQgc3Ry aW5nKSkpKQogCiAoZGVmdW4gZXNoZWxsLWdsb2ItcmVnZXhwIChwYXR0ZXJuKQogICAiQ29u dmVydCBnbG9iLXBhdHRlcm4gUEFUVEVSTiB0byBhIHJlZ3VsYXIgZXhwcmVzc2lvbi4KQEAg LTE5Niw5ICsyMjUsMTAgQEAgZXNoZWxsLWdsb2ItcmVnZXhwCiAgIFthLWJdICBbYS1iXSAg IG1hdGNoZXMgYSBjaGFyYWN0ZXIgb3IgcmFuZ2UKICAgW15hXSAgIFteYV0gICAgZXhjbHVk ZXMgYSBjaGFyYWN0ZXIgb3IgcmFuZ2UKIAotSWYgYW55IGNoYXJhY3RlcnMgaW4gUEFUVEVS TiBoYXZlIHRoZSB0ZXh0IHByb3BlcnR5IGBlc2NhcGVkJwotc2V0IHRvIHRydWUsIHRoZW4g dGhlc2UgY2hhcmFjdGVycyB3aWxsIG1hdGNoIHRoZW1zZWx2ZXMgaW4gdGhlCi1yZXN1bHRp bmcgcmVndWxhciBleHByZXNzaW9uLiIKK1RoaXMgZnVuY3Rpb24gb25seSBjb25zaWRlcnMg aW4gUEFUVEVSTiB0aGF0IGhhdmUgdGhlIHRleHQgcHJvcGVydHkKK2Blc2hlbGwtZ2xvYi1j aGFyJyBzZXQgdG8gdCBmb3IgY29udmVyc2lvbiBmcm9tIGdsb2IgdG8gcmVnZXhwIHN5bnRh eC4KK0FsbCBvdGhlciBjaGFyYWN0ZXJzIGFyZSB0cmVhdGVkIGFzIGxpdGVyYWxzLiAgU2Vl IGFsc28KK2Blc2hlbGwtcGFyc2UtZ2xvYi1jaGFycycgYW5kIGBlc2hlbGwtcGFyc2UtZ2xv Yi1zdHJpbmcnLiIKICAgKGxldCAoKG1hdGNoZWQtaW4tcGF0dGVybiAwKSAgICAgICAgICA7 IEhvdyBtdWNoIG9mIFBBVFRFUk4gaGFuZGxlZAogCXJlZ2V4cCkKICAgICAod2hpbGUgKHN0 cmluZy1tYXRjaCAoZXNoZWxsLWdsb2ItY2hhcnMtcmVnZXhwKQpAQCAtMjA5LDcgKzIzOSw3 IEBAIGVzaGVsbC1nbG9iLXJlZ2V4cAogCSAgICAgIChjb25jYXQgcmVnZXhwCiAJCSAgICAg IChyZWdleHAtcXVvdGUKIAkJICAgICAgIChzdWJzdHJpbmcgcGF0dGVybiBtYXRjaGVkLWlu LXBhdHRlcm4gb3AtYmVnaW4pKSkpCi0JKGlmIChnZXQtdGV4dC1wcm9wZXJ0eSBvcC1iZWdp biAnZXNjYXBlZCBwYXR0ZXJuKQorCShpZiAobm90IChlc2hlbGwtLWdsb2ItY2hhci1wIHBh dHRlcm4gb3AtYmVnaW4pKQogCSAgICAoc2V0cSByZWdleHAgKGNvbmNhdCByZWdleHAKIAkJ CQkgKHJlZ2V4cC1xdW90ZSAoY2hhci10by1zdHJpbmcgb3AtY2hhcikpKQogCQkgIG1hdGNo ZWQtaW4tcGF0dGVybiAoMSsgb3AtYmVnaW4pKQpAQCAtMjI5LDYgKzI1OSw3IEBAIGVzaGVs bC1nbG9iLXJlZ2V4cAogCiAoZGVmdW4gZXNoZWxsLWdsb2ItcCAocGF0dGVybikKICAgIlJl dHVybiBub24tbmlsIGlmIFBBVFRFUk4gaGFzIGFueSBzcGVjaWFsIGdsb2IgY2hhcmFjdGVy cy4iCisgIChkZWNsYXJlIChvYnNvbGV0ZSBuaWwgIjMxLjEiKSkKICAgOzsgIn4iIGlzIGFu IGluZml4IGdsb2JiaW5nIGNoYXJhY3Rlciwgc28gb25lIGF0IHRoZSBzdGFydCBvZiBhIGds b2IKICAgOzsgbXVzdCBiZSBhIGxpdGVyYWwuCiAgIChsZXQgKChzdGFydCAoaWYgKHN0cmlu Zy1wcmVmaXgtcCAifiIgcGF0dGVybikgMSAwKSkpCkBAIC0yNDksOCArMjgwLDggQEAgZXNo ZWxsLWdsb2ItY29udmVydC0xCiAgICAgOzsgU3BsaXQgdGhlIGdsb2IgaWYgaXQgY29udGFp bnMgYSBuZWdhdGlvbiBsaWtlIHh+eS4KICAgICAod2hpbGUgKGFuZCAoZXEgaW5jbCBnbG9i KQogICAgICAgICAgICAgICAgIChzZXRxIGluZGV4IChzdHJpbmctc2VhcmNoICJ+IiBnbG9i IGluZGV4KSkpCi0gICAgICAoaWYgKG9yIChnZXQtdGV4dC1wcm9wZXJ0eSBpbmRleCAnZXNj YXBlZCBnbG9iKQotICAgICAgICAgICAgICAob3IgKD0gKDErIGluZGV4KSBsZW4pKSkKKyAg ICAgIChpZiAob3IgKG5vdCAoZXNoZWxsLS1nbG9iLWNoYXItcCBnbG9iIGluZGV4KSkKKyAg ICAgICAgICAgICAgKD0gKDErIGluZGV4KSBsZW4pKQogICAgICAgICAgIChzZXRxIGluZGV4 ICgxKyBpbmRleCkpCiAgICAgICAgIChzZXRxIGluY2wgKHN1YnN0cmluZyBnbG9iIDAgaW5k ZXgpCiAgICAgICAgICAgICAgIGV4Y2wgKHN1YnN0cmluZyBnbG9iICgxKyBpbmRleCkpKSkp CkBAIC0yOTQsMTMgKzMyNSwxOCBAQCBlc2hlbGwtZ2xvYi1jb252ZXJ0CiAgICAgICAgIChz ZXRxIHN0YXJ0LWRpciAocG9wIGdsb2JzKSkKICAgICAgIChzZXRxIHN0YXJ0LWRpciAoZmls ZS1uYW1lLWFzLWRpcmVjdG9yeSAiLiIpKSkKICAgICAod2hpbGUgZ2xvYnMKLSAgICAgIChp Zi1sZXQqICgocmVjdXJzZSAoY2RyIChhc3NvYyAoY2FyIGdsb2JzKQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGVzaGVsbC1nbG9iLXJlY3Vyc2l2ZS1hbGlzdCkp KSkKKyAgICAgIDs7ICJ+IiBpcyBhbiBpbmZpeCBnbG9iYmluZyBjaGFyYWN0ZXIsIHNvIG9u ZSBhdCB0aGUgc3RhcnQgb2YgYQorICAgICAgOzsgZ2xvYiBjb21wb25lbnQgbXVzdCBiZSBh IGxpdGVyYWwuCisgICAgICAod2hlbiAoZXEgKGFyZWYgKGNhciBnbG9icykgMCkgP34pCisg ICAgICAgIChyZW1vdmUtdGV4dC1wcm9wZXJ0aWVzIDAgMSAnKGVzaGVsbC1nbG9iLWNoYXIp IChjYXIgZ2xvYnMpKSkKKyAgICAgIChpZi1sZXQqICgocmVjdXJzZSAoY2RyIChhc3NvYyAo Y2FyIGdsb2JzKSBlc2hlbGwtZ2xvYi1yZWN1cnNpdmUtYWxpc3QpKSkKKyAgICAgICAgICAg ICAgICAoKGVzaGVsbC0tYWxsLWdsb2ItY2hhcnMtcAorICAgICAgICAgICAgICAgICAgKHN0 cmluZy10cmltLXJpZ2h0IChjYXIgZ2xvYnMpICIvIikpKSkKICAgICAgICAgICAoaWYgbGFz dC1zYXctcmVjdXJzaW9uCiAgICAgICAgICAgICAgIChzZXRjYXIgcmVzdWx0IHJlY3Vyc2Up CiAgICAgICAgICAgICAocHVzaCByZWN1cnNlIHJlc3VsdCkKICAgICAgICAgICAgIChzZXRx IGxhc3Qtc2F3LXJlY3Vyc2lvbiB0KSkKLSAgICAgICAgKGlmIChvciByZXN1bHQgKGVzaGVs bC1nbG9iLXAgKGNhciBnbG9icykpKQorICAgICAgICAoaWYgKG9yIHJlc3VsdCAoZXNoZWxs LS1jb250YWlucy1nbG9iLWNoYXItcCAoY2FyIGdsb2JzKSkpCiAgICAgICAgICAgICAocHVz aCAoZXNoZWxsLWdsb2ItY29udmVydC0xIChjYXIgZ2xvYnMpIChudWxsIChjZHIgZ2xvYnMp KSkKICAgICAgICAgICAgICAgICAgIHJlc3VsdCkKICAgICAgICAgICA7OyBXZSBoYXZlbid0 IHNlZW4gYSBnbG9iIHlldCwgc28gaW5zdGVhZCBhcHBlbmQgdG8gdGhlIHN0YXJ0CkBAIC0z MTIsNiArMzQ4LDM4IEBAIGVzaGVsbC1nbG9iLWNvbnZlcnQKICAgICAgICAgICAobnJldmVy c2UgcmVzdWx0KQogICAgICAgICAgIGlzZGlyKSkpCiAKKyhkZWZ1biBlc2hlbGwtZXhwYW5k LWdsb2IgKGdsb2IpCisgICJSZXR1cm4gYSBsaXN0IG9mIGZpbGVzIG1hdGNoZWQgYnkgR0xP Qi4KK0VhY2ggZ2xvYmJpbmcgY2hhcmFjdGVyIGluIEdMT0Igc2hvdWxkIGhhdmUgYSBub24t bmlsIHZhbHVlIGZvciB0aGUgdGV4dAorcHJvcGVydHkgYGVzaGVsbC1nbG9iLWNoYXInIChl LmcuIGJ5IGBlc2hlbGwtcGFyc2UtZ2xvYi1jaGFycycpIGluIG9yZGVyCitmb3IgaXQgdG8g aGF2ZSBzeW50YWN0aWMgbWVhbmluZzsgb3RoZXJ3aXNlLCB0aGlzIGZ1bmN0aW9uIHRyZWF0 cyB0aGUKK2NoYXJhY3RlciBsaXRlcmFsbHkuCisKK1RoaXMgZnVuY3Rpb24gaXMgcHJpbWFy aWx5IGludGVuZGVkIGZvciB1c2Ugd2l0aGluIEVzaGVsbCBjb21tYW5kCitmb3Jtcy4gIElm IHlvdSB3YW50IHRvIHVzZSBhbiBvcmRpbmFyeSBzdHJpbmcgYXMgYSBnbG9iLCB1c2UKK2Bl c2hlbGwtZXh0ZW5kZWQtZ2xvYicgaW5zdGVhZC4iCisgIChsZXQgKChnbG9icyAoZXNoZWxs LWdsb2ItY29udmVydCBnbG9iKSkKKyAgICAgICAgZXNoZWxsLWdsb2ItbWF0Y2hlcyBtZXNz YWdlLXNob3duKQorICAgICh1bndpbmQtcHJvdGVjdAorICAgICAgICA7OyBBZnRlciBleGFt aW5pbmcgR0xPQiwgbWFrZSBzdXJlIHdlIGFjdHVhbGx5IGdvdCBzb21lIGdsb2JzCisgICAg ICAgIDs7IGJlZm9yZSBjb21wdXRpbmcgdGhlIHJlc3VsdHMuICBXZSBjYW4gZ2V0IHplcm8g Z2xvYnMgZm9yCisgICAgICAgIDs7IHJlbW90ZSBmaWxlIG5hbWVzIHVzaW5nICJ+IiwgbGlr ZSAiL3NzaDpyZW1vdGU6fi9maWxlLnR4dCIuCisgICAgICAgIDs7IER1cmluZyBFc2hlbGwg YXJndW1lbnQgcGFyc2luZywgd2UgY2FuJ3QgYWx3YXlzIGJlIHN1cmUgaWYKKyAgICAgICAg OzsgdGhlICJ+IiBpcyBhIGhvbWUgZGlyZWN0b3J5IHJlZmVyZW5jZSBvciBwYXJ0IG9mIGEg Z2xvYgorICAgICAgICA7OyAoZS5nLiBpZiB0aGUgYXJndW1lbnQgd2FzIGFzc2VtYmxlZCBm cm9tIHZhcmlhYmxlcykuCisgICAgICAgICh3aGVuIChjYWRyIGdsb2JzKQorICAgICAgICAg IChhcHBseSAjJ2VzaGVsbC1nbG9iLWVudHJpZXMgZ2xvYnMpKQorICAgICAgKHdoZW4gbWVz c2FnZS1zaG93bgorICAgICAgICAobWVzc2FnZSBuaWwpKSkKKyAgICAoY29uZAorICAgICAo ZXNoZWxsLWdsb2ItbWF0Y2hlcworICAgICAgKHNvcnQgZXNoZWxsLWdsb2ItbWF0Y2hlcyAj J3N0cmluZzwpKQorICAgICAoKGFuZCBlc2hlbGwtZXJyb3ItaWYtbm8tZ2xvYiAoY2FkciBn bG9icykpCisgICAgICAoZXJyb3IgIk5vIG1hdGNoZXMgZm91bmQ6ICVzIiBnbG9iKSkKKyAg ICAgKHQKKyAgICAgIChsZXQgKChyZXN1bHQgKHN1YnN0cmluZy1uby1wcm9wZXJ0aWVzIGds b2IpKSkKKyAgICAgICAgKGlmIGVzaGVsbC1nbG9iLXNwbGljZS1yZXN1bHRzIChsaXN0IHJl c3VsdCkgcmVzdWx0KSkpKSkpCisKIChkZWZ1biBlc2hlbGwtZXh0ZW5kZWQtZ2xvYiAoZ2xv YikKICAgIlJldHVybiBhIGxpc3Qgb2YgZmlsZXMgbWF0Y2hlZCBieSBHTE9CLgogSWYgbm8g ZmlsZXMgbWF0Y2gsIHNpZ25hbCBhbiBlcnJvciAoaWYgYGVzaGVsbC1lcnJvci1pZi1uby1n bG9iJwpAQCAtMzI3LDI2ICszOTUsOSBAQCBlc2hlbGwtZXh0ZW5kZWQtZ2xvYgogCiBNYWlu bHkgdGhleSBhcmUgbm90IHN1cHBvcnRlZCBiZWNhdXNlIGZpbGUgbWF0Y2hpbmcgaXMgZG9u ZSB3aXRoIEVtYWNzCiByZWd1bGFyIGV4cHJlc3Npb25zLCBhbmQgdGhlc2UgY2Fubm90IHN1 cHBvcnQgdGhlIGFib3ZlIGNvbnN0cnVjdHMuIgotICAobGV0ICgoZ2xvYnMgKGVzaGVsbC1n bG9iLWNvbnZlcnQgZ2xvYikpCi0gICAgICAgIGVzaGVsbC1nbG9iLW1hdGNoZXMgbWVzc2Fn ZS1zaG93bikKLSAgICAoaWYgKG51bGwgKGNhZHIgZ2xvYnMpKQotICAgICAgICA7OyBJZiwg YWZ0ZXIgZXhhbWluaW5nIEdMT0IsIHRoZXJlIGFyZSBubyBhY3R1YWwgZ2xvYnMsIGp1c3QK LSAgICAgICAgOzsgYmFpbCBvdXQuICBUaGlzIGNhbiBoYXBwZW4gZm9yIHJlbW90ZSBmaWxl IG5hbWVzIHVzaW5nICJ+IiwKLSAgICAgICAgOzsgbGlrZSAiL3NzaDpyZW1vdGU6fi9maWxl LnR4dCIuICBEdXJpbmcgcGFyc2luZywgd2UgY2FuJ3QKLSAgICAgICAgOzsgYWx3YXlzIGJl IHN1cmUgaWYgdGhlICJ+IiBpcyBhIGhvbWUgZGlyZWN0b3J5IHJlZmVyZW5jZSBvcgotICAg ICAgICA7OyBwYXJ0IG9mIGEgZ2xvYiAoZS5nLiBpZiB0aGUgYXJndW1lbnQgd2FzIGFzc2Vt YmxlZCBmcm9tCi0gICAgICAgIDs7IHZhcmlhYmxlcykuCi0gICAgICAgIChpZiBlc2hlbGwt Z2xvYi1zcGxpY2UtcmVzdWx0cyAobGlzdCBnbG9iKSBnbG9iKQotICAgICAgKHVud2luZC1w cm90ZWN0Ci0gICAgICAgICAgKGFwcGx5ICMnZXNoZWxsLWdsb2ItZW50cmllcyBnbG9icykK LSAgICAgICAgKGlmIG1lc3NhZ2Utc2hvd24KLSAgICAgICAgICAgIChtZXNzYWdlIG5pbCkp KQotICAgICAgKG9yIChhbmQgZXNoZWxsLWdsb2ItbWF0Y2hlcyAoc29ydCBlc2hlbGwtZ2xv Yi1tYXRjaGVzICMnc3RyaW5nPCkpCi0gICAgICAgICAgKGlmIGVzaGVsbC1lcnJvci1pZi1u by1nbG9iCi0gICAgICAgICAgICAgIChlcnJvciAiTm8gbWF0Y2hlcyBmb3VuZDogJXMiIGds b2IpCi0gICAgICAgICAgICAoaWYgZXNoZWxsLWdsb2Itc3BsaWNlLXJlc3VsdHMKLSAgICAg ICAgICAgICAgICAobGlzdCBnbG9iKQotICAgICAgICAgICAgICBnbG9iKSkpKSkpCisgIChl c2hlbGwtZXhwYW5kLWdsb2IgKGVzaGVsbC1wYXJzZS1nbG9iLXN0cmluZyBnbG9iKSkpCisK KyhkZWZjb25zdCBlc2hlbGwtLWdsb2ItYW55dGhpbmcgKGVzaGVsbC1wYXJzZS1nbG9iLXN0 cmluZyAiKiIpKQogCiA7OyBGSVhNRSBkb2VzIHRoaXMgcmVhbGx5IG5lZWQgdG8gYWJ1c2Ug ZXNoZWxsLWdsb2ItbWF0Y2hlcywgbWVzc2FnZS1zaG93bj8KIChkZWZ1biBlc2hlbGwtZ2xv Yi1lbnRyaWVzIChwYXRoIGdsb2JzIG9ubHktZGlycykKQEAgLTM2Myw3ICs0MTQsNyBAQCBl c2hlbGwtZ2xvYi1lbnRyaWVzCiAgICAgKGlmIChyYXNzcSAoY2FyIGdsb2JzKSBlc2hlbGwt Z2xvYi1yZWN1cnNpdmUtYWxpc3QpCiAgICAgICAgIChzZXRxIHJlY3Vyc2UtcCAoY2FyIGds b2JzKQogICAgICAgICAgICAgICBnbG9iIChvciAoY2FkciBnbG9icykKLSAgICAgICAgICAg ICAgICAgICAgICAgKGVzaGVsbC1nbG9iLWNvbnZlcnQtMSAiKiIgdCkpCisgICAgICAgICAg ICAgICAgICAgICAgIChlc2hlbGwtZ2xvYi1jb252ZXJ0LTEgZXNoZWxsLS1nbG9iLWFueXRo aW5nIHQpKQogICAgICAgICAgICAgICBnbG9iLXJlbWFpbmRlciAoY2RkciBnbG9icykpCiAg ICAgICAoc2V0cSBnbG9iIChjYXIgZ2xvYnMpCiAgICAgICAgICAgICBnbG9iLXJlbWFpbmRl ciAoY2RyIGdsb2JzKSkpCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lbS1scy5lbCBiL2xp c3AvZXNoZWxsL2VtLWxzLmVsCmluZGV4IDhiZjJlMjBkMzIwLi5lOGNkYjljODJjNCAxMDA2 NDQKLS0tIGEvbGlzcC9lc2hlbGwvZW0tbHMuZWwKKysrIGIvbGlzcC9lc2hlbGwvZW0tbHMu ZWwKQEAgLTI0Niw2ICsyNDYsMTcgQEAgZGlyZWQtZmxhZwogCiAoZGVjbGFyZS1mdW5jdGlv biBlc2hlbGwtZXh0ZW5kZWQtZ2xvYiAiZW0tZ2xvYiIgKGdsb2IpKQogKGRlZnZhciBlc2hl bGwtZXJyb3ItaWYtbm8tZ2xvYikKKyhkZWZ2YXIgZXNoZWxsLWdsb2Itc3BsaWNlLXJlc3Vs dHMpCisKKyhkZWZ1biBlc2hlbGwtbHMtLWV4cGFuZC13aWxkY2FyZHMgKGZpbGUpCisgICJF eHBhbmQgdGhlIHNoZWxsIHdpbGRjYXJkcyBpbiBGSUxFIGlmIGFueS4iCisgIChpZiAoYW5k IChhdG9tIGZpbGUpCisgICAgICAgICAgIChub3QgKGZpbGUtZXhpc3RzLXAgZmlsZSkpKQor ICAgICAgKGxldCAoKGVzaGVsbC1lcnJvci1pZi1uby1nbG9iIHQpCisgICAgICAgICAgICA7 OyBFbnN1cmUgYGVzaGVsbC1leHRlbmRlZC1nbG9iJyByZXR1cm5zIGEgbGlzdC4KKyAgICAg ICAgICAgIChlc2hlbGwtZ2xvYi1zcGxpY2UtcmVzdWx0cyB0KSkKKyAgICAgICAgKG1hcGNh ciAjJ2ZpbGUtcmVsYXRpdmUtbmFtZSAoZXNoZWxsLWV4dGVuZGVkLWdsb2IgZmlsZSkpKQor ICAgIChsaXN0IChmaWxlLXJlbGF0aXZlLW5hbWUgZmlsZSkpKSkKIAogKGRlZnVuIGVzaGVs bC1scy0taW5zZXJ0LWRpcmVjdG9yeQogICAob3JpZy1mdW4gZmlsZSBzd2l0Y2hlcyAmb3B0 aW9uYWwgd2lsZGNhcmQgZnVsbC1kaXJlY3RvcnktcCkKQEAgLTI3NywxMyArMjg4LDcgQEAg ZXNoZWxsLWxzLS1pbnNlcnQtZGlyZWN0b3J5CiAgICAgICAgICAgKHJlcXVpcmUgJ2VtLWds b2IpCiAgICAgICAgICAgKGxldCogKChpbnNlcnQtZnVuYyAnaW5zZXJ0KQogICAgICAgICAg ICAgICAgICAoZXJyb3ItZnVuYyAnaW5zZXJ0KQotICAgICAgICAgICAgICAgICAoZXNoZWxs LWVycm9yLWlmLW5vLWdsb2IgdCkKLSAgICAgICAgICAgICAgICAgKHRhcmdldCA7IEV4cGFu ZCB0aGUgc2hlbGwgd2lsZGNhcmRzIGlmIGFueS4KLSAgICAgICAgICAgICAgICAgIChpZiAo YW5kIChhdG9tIGZpbGUpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLW1h dGNoICJbWz8qXSIgZmlsZSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgIChub3QgKGZp bGUtZXhpc3RzLXAgZmlsZSkpKQotICAgICAgICAgICAgICAgICAgICAgIChtYXBjYXIgIydm aWxlLXJlbGF0aXZlLW5hbWUgKGVzaGVsbC1leHRlbmRlZC1nbG9iIGZpbGUpKQotICAgICAg ICAgICAgICAgICAgICAoZmlsZS1yZWxhdGl2ZS1uYW1lIGZpbGUpKSkKKyAgICAgICAgICAg ICAgICAgKHRhcmdldCAoZXNoZWxsLWxzLS1leHBhbmQtd2lsZGNhcmRzIGZpbGUpKQogICAg ICAgICAgICAgICAgICAoc3dpdGNoZXMKICAgICAgICAgICAgICAgICAgIChhcHBlbmQgZXNo ZWxsLWxzLWRpcmVkLWluaXRpYWwtYXJncwogICAgICAgICAgICAgICAgICAgICAgICAgICAo YW5kIChvciAoY29uc3AgZGlyZWQtZGlyZWN0b3J5KSB3aWxkY2FyZCkgKGxpc3QgIi1kIikp CmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvZXNoZWxsL2VtLWdsb2ItdGVzdHMuZWwgYi90ZXN0 L2xpc3AvZXNoZWxsL2VtLWdsb2ItdGVzdHMuZWwKaW5kZXggMjM5OTY4OTE3YWIuLjg4ZDNh ZmM1ZDRkIDEwMDY0NAotLS0gYS90ZXN0L2xpc3AvZXNoZWxsL2VtLWdsb2ItdGVzdHMuZWwK KysrIGIvdGVzdC9saXNwL2VzaGVsbC9lbS1nbG9iLXRlc3RzLmVsCkBAIC0xMzQsMTcgKzEz NCwxOSBAQCBlbS1nbG9iLXRlc3QvZXhwYW5kL2V4cGxpY2l0bHktbGlzdGlmeS1yZXN1bHRz CiAKIChlcnQtZGVmdGVzdCBlbS1nbG9iLXRlc3QvY29udmVydC9jdXJyZW50LXN0YXJ0LWRp cmVjdG9yeSAoKQogICAiVGVzdCBjb252ZXJ0aW5nIGEgZ2xvYiBzdGFydGluZyBpbiB0aGUg Y3VycmVudCBkaXJlY3RvcnkuIgotICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLWdsb2ItY29u dmVydCAiKi5lbCIpCisgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtZ2xvYi1jb252ZXJ0IChl c2hlbGwtcGFyc2UtZ2xvYi1zdHJpbmcgIiouZWwiKSkKICAgICAgICAgICAgICAgICAgJygi Li8iICgoIlxcYC4qXFwuZWxcXCciIC4gIlxcYFxcLiIpKSBuaWwpKSkpCiAKIChlcnQtZGVm dGVzdCBlbS1nbG9iLXRlc3QvY29udmVydC9yZWxhdGl2ZS1zdGFydC1kaXJlY3RvcnkgKCkK ICAgIlRlc3QgY29udmVydGluZyBhIGdsb2Igc3RhcnRpbmcgaW4gYSByZWxhdGl2ZSBkaXJl Y3RvcnkuIgotICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLWdsb2ItY29udmVydCAic29tZS93 aGVyZS8qLmVsIikKKyAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC1nbG9iLWNvbnZlcnQKKyAg ICAgICAgICAgICAgICAgIChlc2hlbGwtcGFyc2UtZ2xvYi1zdHJpbmcgInNvbWUvd2hlcmUv Ki5lbCIpKQogICAgICAgICAgICAgICAgICAnKCIuL3NvbWUvd2hlcmUvIiAoKCJcXGAuKlxc LmVsXFwnIiAuICJcXGBcXC4iKSkgbmlsKSkpKQogCiAoZXJ0LWRlZnRlc3QgZW0tZ2xvYi10 ZXN0L2NvbnZlcnQvYWJzb2x1dGUtc3RhcnQtZGlyZWN0b3J5ICgpCiAgICJUZXN0IGNvbnZl cnRpbmcgYSBnbG9iIHN0YXJ0aW5nIGluIGFuIGFic29sdXRlIGRpcmVjdG9yeS4iCi0gIChz aG91bGQgKGVxdWFsIChlc2hlbGwtZ2xvYi1jb252ZXJ0ICIvc29tZS93aGVyZS8qLmVsIikK KyAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC1nbG9iLWNvbnZlcnQKKyAgICAgICAgICAgICAg ICAgIChlc2hlbGwtcGFyc2UtZ2xvYi1zdHJpbmcgIi9zb21lL3doZXJlLyouZWwiKSkKICAg ICAgICAgICAgICAgICAgJygiL3NvbWUvd2hlcmUvIiAoKCJcXGAuKlxcLmVsXFwnIiAuICJc XGBcXC4iKSkgbmlsKSkpKQogCiAoZXJ0LWRlZnRlc3QgZW0tZ2xvYi10ZXN0L2NvbnZlcnQv cmVtb3RlLXN0YXJ0LWRpcmVjdG9yeSAoKQpAQCAtMTUyLDE2ICsxNTQsMzAgQEAgZW0tZ2xv Yi10ZXN0L2NvbnZlcnQvcmVtb3RlLXN0YXJ0LWRpcmVjdG9yeQogICAoc2tpcC11bmxlc3Mg KGVzaGVsbC10ZXN0cy1yZW1vdGUtYWNjZXNzaWJsZS1wKSkKICAgKGxldCogKChkZWZhdWx0 LWRpcmVjdG9yeSBlcnQtcmVtb3RlLXRlbXBvcmFyeS1maWxlLWRpcmVjdG9yeSkKICAgICAg ICAgIChyZW1vdGUgKGZpbGUtcmVtb3RlLXAgZGVmYXVsdC1kaXJlY3RvcnkpKSkKLSAgICAo c2hvdWxkIChlcXVhbCAoZXNoZWxsLWdsb2ItY29udmVydCAoZm9ybWF0ICIlcy9zb21lL3do ZXJlLyouZWwiIHJlbW90ZSkpCisgICAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC1nbG9iLWNv bnZlcnQKKyAgICAgICAgICAgICAgICAgICAgKGZvcm1hdCAoZXNoZWxsLXBhcnNlLWdsb2It c3RyaW5nICIlcy9zb21lL3doZXJlLyouZWwiKQorICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHJlbW90ZSkpCiAgICAgICAgICAgICAgICAgIGAoLChmb3JtYXQgIiVzL3NvbWUvd2hl cmUvIiByZW1vdGUpCiAgICAgICAgICAgICAgICAgICAgKCgiXFxgLipcXC5lbFxcJyIgLiAi XFxgXFwuIikpIG5pbCkpKSkpCiAKLShlcnQtZGVmdGVzdCBlbS1nbG9iLXRlc3QvY29udmVy dC9xdW90ZWQtc3RhcnQtZGlyZWN0b3J5ICgpCi0gICJUZXN0IGNvbnZlcnRpbmcgYSBnbG9i IHN0YXJ0aW5nIGluIGEgcXVvdGVkIGRpcmVjdG9yeSBuYW1lLiIKKyhlcnQtZGVmdGVzdCBl bS1nbG9iLXRlc3QvY29udmVydC9zdGFydC1kaXJlY3Rvcnktd2l0aC1zcGFjZXMgKCkKKyAg IlRlc3QgY29udmVydGluZyBhIGdsb2Igc3RhcnRpbmcgaW4gYSBkaXJlY3Rvcnkgd2l0aCBz cGFjZXMgaW4gaXRzIG5hbWUuIgogICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLWdsb2ItY29u dmVydAotICAgICAgICAgICAgICAgICAgKGNvbmNhdCAoZXNoZWxsLWVzY2FwZS1hcmcgInNv bWUgd2hlcmUvIikgIiouZWwiKSkKKyAgICAgICAgICAgICAgICAgIChlc2hlbGwtcGFyc2Ut Z2xvYi1zdHJpbmcgInNvbWUgd2hlcmUvKi5lbCIpKQogICAgICAgICAgICAgICAgICAnKCIu L3NvbWUgd2hlcmUvIiAoKCJcXGAuKlxcLmVsXFwnIiAuICJcXGBcXC4iKSkgbmlsKSkpKQog CisoZXJ0LWRlZnRlc3QgZW0tZ2xvYi10ZXN0L2NvbnZlcnQvbGl0ZXJhbC1jaGFyYWN0ZXJz ICgpCisgICJUZXN0IGNvbnZlcnRpbmcgYSBcImdsb2JcIiB3aXRoIG9ubHkgbGl0ZXJhbCBj aGFyYWN0ZXJzLiIKKyAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC1nbG9iLWNvbnZlcnQgIiou ZWwiKSAnKCIuLyouZWwiIG5pbCBuaWwpKSkKKyAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC1n bG9iLWNvbnZlcnQgIioqLyIpICcoIi4vKiovIiBuaWwgdCkpKSkKKworKGVydC1kZWZ0ZXN0 IGVtLWdsb2ItdGVzdC9jb252ZXJ0L21peGVkLWxpdGVyYWwtY2hhcmFjdGVycyAoKQorICAi VGVzdCBjb252ZXJ0aW5nIGEgZ2xvYiB3aXRoIHNvbWUgbGl0ZXJhbCBjaGFyYWN0ZXJzLiIK KyAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC1nbG9iLWNvbnZlcnQgKGVzaGVsbC1wYXJzZS1n bG9iLXN0cmluZyAiXFwqXFwqLyouZWwiKSkKKyAgICAgICAgICAgICAgICAgICcoIi4vKiov IiAoKCJcXGAuKlxcLmVsXFwnIiAuICJcXGBcXC4iKSkgbmlsKSkpCisgIChzaG91bGQgKGVx dWFsIChlc2hlbGwtZ2xvYi1jb252ZXJ0IChlc2hlbGwtcGFyc2UtZ2xvYi1zdHJpbmcgIioq L1xcKi5lbCIpKQorICAgICAgICAgICAgICAgICAgJygiLi8iIChyZWN1cnNlICgiXFxgXFwq XFwuZWxcXCciIC4gIlxcYFxcLiIpKSBuaWwpKSkpCisKIAwKIDs7IEdsb2IgbWF0Y2hpbmcK IApAQCAtMjYyLDExICsyNzgsMTEgQEAgZW0tZ2xvYi10ZXN0L21hdGNoLW4tb3ItbW9yZS1j aGFyYWN0ZXJzCiAKIChlcnQtZGVmdGVzdCBlbS1nbG9iLXRlc3QvbWF0Y2gtbi1vci1tb3Jl LWdyb3VwcyAoKQogICAiVGVzdCB0aGF0IFwiKHgpI1wiIGFuZCBcIih4KSNcIiBtYXRjaCB6 ZXJvIG9yIG1vcmUgaW5zdGFuY2VzIG9mIFwiKHgpXCIuIgotICAod2l0aC1mYWtlLWZpbGVz ICcoImguZWwiICJoYS5lbCIgImhpLmVsIiAiaGlpLmVsIiAiZGlyL2hpLmVsIikKLSAgICAo c2hvdWxkIChlcXVhbCAoZXNoZWxsLWV4dGVuZGVkLWdsb2IgImhpIy5lbCIpCi0gICAgICAg ICAgICAgICAgICAgJygiaC5lbCIgImhpLmVsIiAiaGlpLmVsIikpKQotICAgIChzaG91bGQg KGVxdWFsIChlc2hlbGwtZXh0ZW5kZWQtZ2xvYiAiaGkjIy5lbCIpCi0gICAgICAgICAgICAg ICAgICAgJygiaGkuZWwiICJoaWkuZWwiKSkpKSkKKyAgKHdpdGgtZmFrZS1maWxlcyAnKCJo LmVsIiAiaGEuZWwiICJoaS5lbCIgImhhaC5lbCIgImhhaGFoLmVsIiAiZGlyL2hhaC5lbCIp CisgICAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC1leHRlbmRlZC1nbG9iICJoKGFoKSMuZWwi KQorICAgICAgICAgICAgICAgICAgICcoImguZWwiICJoYWguZWwiICJoYWhhaC5lbCIpKSkK KyAgICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLWV4dGVuZGVkLWdsb2IgImgoYWgpIyMuZWwi KQorICAgICAgICAgICAgICAgICAgICcoImhhaC5lbCIgImhhaGFoLmVsIikpKSkpCiAKIChl cnQtZGVmdGVzdCBlbS1nbG9iLXRlc3QvbWF0Y2gtbi1vci1tb3JlLWNoYXJhY3Rlci1zZXRz ICgpCiAgICJUZXN0IHRoYXQgXCJbeF0jXCIgYW5kIFwiW3hdI1wiIG1hdGNoIHplcm8gb3Ig bW9yZSBpbnN0YW5jZXMgb2YgXCJbeF1cIi4iCkBAIC0zMDAsMTEgKzMxNiwxMSBAQCBlbS1n bG9iLXRlc3QvbWF0Y2gtZG90LWZpbGVzCiAoZXJ0LWRlZnRlc3QgZW0tZ2xvYi10ZXN0L25v LW1hdGNoZXMgKCkKICAgIlRlc3QgYmVoYXZpb3Igd2hlbiBhIGdsb2IgZmFpbHMgdG8gbWF0 Y2ggYW55IGZpbGVzLiIKICAgKHdpdGgtZmFrZS1maWxlcyAnKCJmb28uZWwiICJiYXIuZWwi KQotICAgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtZXh0ZW5kZWQtZ2xvYiAiKi50eHQiKQot ICAgICAgICAgICAgICAgICAgICIqLnR4dCIpKQorICAgIChzaG91bGQgKGVxdWFsLWluY2x1 ZGluZy1wcm9wZXJ0aWVzIChlc2hlbGwtZXh0ZW5kZWQtZ2xvYiAiKi50eHQiKQorICAgICAg ICAgICAgICIqLnR4dCIpKQogICAgIChsZXQgKChlc2hlbGwtZ2xvYi1zcGxpY2UtcmVzdWx0 cyB0KSkKLSAgICAgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtZXh0ZW5kZWQtZ2xvYiAiKi50 eHQiKQotICAgICAgICAgICAgICAgICAgICAgJygiKi50eHQiKSkpKQorICAgICAgKHNob3Vs ZCAoZXF1YWwtaW5jbHVkaW5nLXByb3BlcnRpZXMgKGVzaGVsbC1leHRlbmRlZC1nbG9iICIq LnR4dCIpCisgICAgICAgICAgICAgICAnKCIqLnR4dCIpKSkpCiAgICAgKGxldCAoKGVzaGVs bC1lcnJvci1pZi1uby1nbG9iIHQpKQogICAgICAgKHNob3VsZC1lcnJvciAoZXNoZWxsLWV4 dGVuZGVkLWdsb2IgIioudHh0IikpKSkpCiAKLS0gCjIuMjUuMQoK --------------lRD07bEiI4FhfAOJktczbXwB-- From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 01 01:41:12 2024 Received: (at 74033-done) by debbugs.gnu.org; 1 Nov 2024 05:41:12 +0000 Received: from localhost ([127.0.0.1]:46898 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6kPI-0002FW-33 for submit@debbugs.gnu.org; Fri, 01 Nov 2024 01:41:12 -0400 Received: from mail-pl1-f172.google.com ([209.85.214.172]:60574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6kPF-0002FH-HK for 74033-done@debbugs.gnu.org; Fri, 01 Nov 2024 01:41:10 -0400 Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-20c805a0753so16030265ad.0 for <74033-done@debbugs.gnu.org>; Thu, 31 Oct 2024 22:41:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730439606; x=1731044406; darn=debbugs.gnu.org; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=55LbVtnjHYyyu0uZhajam0lF748s/wt5YcwsmcaqOs8=; b=ie5t7pJdoOeu764TvoCrD5WIpTbzlygnIq/8hDbo4Q9VEzpheGbypCKLP2LBpteDIa RInqVANh13WVvW9KMhswQ9y2lhuiWARJP6oCW1Eb+ey2Oj0L2nuL2a5OhGiWIoe50/pM u5u84xTthZvHC6DWsB6mFQ9f3IjqBvCBuWcbw3XSxWZhdIuAb3cf/Kg56Ri2gsAsKLrC VHx/KTBUowCR2IeU/uvPTBF+Kf/WurmApMfM4nPCy7CkkiyVDqdx8rINYGAIWWWKzYxu g9ufUONin7f/U3VfYfa48XP5TFPz08LignaLDSwRaiOcDjPzxfeB/071oNUIGauERuC6 EIHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730439606; x=1731044406; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=55LbVtnjHYyyu0uZhajam0lF748s/wt5YcwsmcaqOs8=; b=pv325nMr2UXoQCQ4PryUhIP2Pi/fzssgCDQukUpKtArmLsOdoknLjGaWrVtnk/RW5l 3b1gLf7scPIYsbsfbkuIGlSU0NRgAmSJ3ZNLAoB5RlYOCz29EOUWVip5OPVqlGBfVdOi kAxgAZoBHLIeeedzgnJ1H6KPhXepqHvA2Y1qhKySp7nvxSQOguE4Q95KWSKUxLIxhRfw T2jSzYtIP4GieXPL5VGi8Z/naTUOm9sx0uBhWDWc2g+oEsWYRayNjgnJTewhmEwcN16r BarGTNDZuoMmn1mrcrc/epnjEvjOy7dH0YH/m59jbJRxh04D0Ot7L5UW2Q+6yaurs3eh 5ojA== X-Gm-Message-State: AOJu0YwU/FAOwR0XgY2hW4js2qF1PFPkbgooGGSe7EIMXhkIMfLX0NXk bWemYLm9Kpb6+/backT5CJZQaVTGa7KG1Rj9SYaX9TuoN6QkKtHys4O0iw== X-Google-Smtp-Source: AGHT+IHM/rQxy+qT3ktd18kUy54eFoeb4qAiMLl5Hskp26fKkxNfwU9UxCUYsY9uegh18Yaew9Wjjw== X-Received: by 2002:a17:902:c945:b0:20c:cd23:449d with SMTP id d9443c01a7336-210c6c43228mr277034895ad.46.1730439606373; Thu, 31 Oct 2024 22:40:06 -0700 (PDT) Received: from [192.168.1.2] (syn-023-240-098-037.res.spectrum.com. [23.240.98.37]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-211057d469bsm16115275ad.271.2024.10.31.22.40.05 for <74033-done@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 31 Oct 2024 22:40:05 -0700 (PDT) Message-ID: Date: Thu, 31 Oct 2024 22:40:06 -0700 MIME-Version: 1.0 Subject: Re: bug#74033: 31.0.50; [PATCH] Improve accuracy of Eshell globbing syntax Content-Language: en-US From: Jim Porter To: 74033-done@debbugs.gnu.org References: <27fb2d7e-cbeb-9c9e-8a3d-d5a7ea750f6e@gmail.com> In-Reply-To: <27fb2d7e-cbeb-9c9e-8a3d-d5a7ea750f6e@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74033-done 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 10/26/2024 3:08 PM, Jim Porter wrote: > I've been tracking down a few issues with how Eshell parses its globs. Now merged to the master branch as 9682d385c10, so closing this bug. From unknown Sat Aug 16 11:39:31 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 29 Nov 2024 12:24:16 +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