From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jim Porter Newsgroups: gmane.emacs.bugs Subject: bug#50470: 27.1; 'company-mode' 'eshell' Date: Mon, 20 Mar 2023 19:30:38 -0700 Message-ID: <48cd486a-c554-5bab-cd67-713e21732500@gmail.com> References: <87h7evegav.fsf@debian-BULLSEYE-live-builder-AMD64> <154bd0e9-2779-5a28-5587-a845a982e39f@yandex.ru> <815516d6-262b-4ef1-786e-ec5b4199847c@yandex.ru> <01845bee-7637-76f6-2e86-2e2de91f6f6e@yandex.ru> <0e8cc089-63ae-71b5-9617-ce76478d3ba4@yandex.ru> <602e2d92-7914-0e2b-b06e-0d47d0ac8c99@yandex.ru> <20ee85be-aafc-8942-14ea-b0c2a1abc2c9@yandex.ru> <00ad5c72-20c5-d27e-2bc8-6436858bbd8d@gmail.com> <5d0b85af-2cd0-bc7c-16ca-17ecd2cbf12c@yandex.ru> <0c63be3e-5c7d-bea4-e23d-606abe59a847@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------R0Zdqj8iNhyQh6Tpl6FLdJDT" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="40193"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Christophe , 50470@debbugs.gnu.org, John Wiegley , Dmitry Gutov To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Mar 21 03:31:30 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1peRma-000AD3-IO for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 21 Mar 2023 03:31:28 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peRmC-0000H8-BO; Mon, 20 Mar 2023 22:31:04 -0400 Original-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 1peRmA-0000Gu-Jr for bug-gnu-emacs@gnu.org; Mon, 20 Mar 2023 22:31:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peRmA-0006gT-BZ for bug-gnu-emacs@gnu.org; Mon, 20 Mar 2023 22:31:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peRmA-00088k-1a for bug-gnu-emacs@gnu.org; Mon, 20 Mar 2023 22:31:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 21 Mar 2023 02:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50470 X-GNU-PR-Package: emacs Original-Received: via spool by 50470-submit@debbugs.gnu.org id=B50470.167936584931269 (code B ref 50470); Tue, 21 Mar 2023 02:31:01 +0000 Original-Received: (at 50470) by debbugs.gnu.org; 21 Mar 2023 02:30:49 +0000 Original-Received: from localhost ([127.0.0.1]:57249 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peRlw-00088E-9C for submit@debbugs.gnu.org; Mon, 20 Mar 2023 22:30:49 -0400 Original-Received: from mail-pj1-f50.google.com ([209.85.216.50]:35644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peRlt-000880-Dj for 50470@debbugs.gnu.org; Mon, 20 Mar 2023 22:30:46 -0400 Original-Received: by mail-pj1-f50.google.com with SMTP id gp15-20020a17090adf0f00b0023d1bbd9f9eso18706033pjb.0 for <50470@debbugs.gnu.org>; Mon, 20 Mar 2023 19:30:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679365839; h=in-reply-to:from:references:cc:to:content-language:subject :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=SO9nn/bCst5Ei+M3qmwEjgmOdMH1zIti5eTMqkDudWE=; b=jmG5W+k/ryqG+CPGf991d83ZbKqXlBz5IORrvWDg/cMd80if7bunWU+zTh8BxA5DVP d2d3rU2KEUuK88QE/eB/B3x3hFKwvn+MUNWZWFXtF3zQuI5tm6onsylFNu+IVLIYylWf Hvu0k/RbutB8H0NFWH+m/60kcTMv67Yfi4oRJhwzL//kolCm4vTed3yP2FWVnUX3unqN mkAmwpsBZ6LGCYgLahFb1r6gLz/tJ8aHFDdmPaKzZY7298m1hKLUeIyejLYcNPT539gB yGUxBKyOgx+4WOW0VGrPd3UhPPK5UjavaQOBoNhPqMTYrZn6EcLW3M2FAttMAttGjpHF NBYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679365839; h=in-reply-to:from:references:cc:to:content-language:subject :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=SO9nn/bCst5Ei+M3qmwEjgmOdMH1zIti5eTMqkDudWE=; b=NivrYgcuTboQkRjxem2/P45uk0Zhpyn2F3xfSpEp8pYboj8YRLQ5DaFwCyzi8hQ6P/ 0I523/q2IfxGV3WyrNXr9ebNHLV8E0DeDYVupz0OsDGhjUs9a8g3r8hCmgYp85R2szzz RM8yPWs4eBz+0KahHCx0mxaYsgVOiqtohfDEX4mkYAcoP8v6EGcSZ2YyRRZtP2gXFR0A yTaCvw42iFGs4E0Bk/bPCjZu9QvcdbIpWsJbgZtvJYNrEvH100ceebiM/RopLn4kVCV4 nEDXmUCqX5lZ6DxWMFotnKybLTmufARGLRpLSl4PpbaI0qGsyBs/8YPNSVZOEpFfaOP/ HPvw== X-Gm-Message-State: AO0yUKXlG/8e9NRpDF+SpSIYA5lxwHg7YDGBp+KiSdtn3+B3ZX2ITnSY jqTK3m2l5kRko3WObQ47ocY= X-Google-Smtp-Source: AK7set+sXlCjYusJUrXykr08BcUEl4vhrZ0H3Cy6wyqqZLIQsY0Q5IySc2AXhCCoiH8TTncxaLa63Q== X-Received: by 2002:a05:6a20:b915:b0:d6:b03d:a612 with SMTP id fe21-20020a056a20b91500b000d6b03da612mr562036pzb.23.1679365839313; Mon, 20 Mar 2023 19:30:39 -0700 (PDT) Original-Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id c15-20020aa78c0f000000b005a7c892b435sm7017068pfd.25.2023.03.20.19.30.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 20 Mar 2023 19:30:38 -0700 (PDT) Content-Language: en-US In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:258326 Archived-At: This is a multi-part message in MIME format. --------------R0Zdqj8iNhyQh6Tpl6FLdJDT Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 3/19/2023 6:34 PM, Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors wrote: > I definitely don't want to force preloading that module. > But maybe that var could have a meaning that's independent > from completion, thus justifying to move it out of the completion > extension module? Well, luckily(?) it turns out my patch wasn't quite right anyway, so I completely rewrote it. (In particular, it didn't correctly generate a top-level stub if there was a subcommand nested somewhere *inside* an argument.) With this change, we now have a more-general way of preventing commands that can cause side effects: 'eshell-allow-commands'. We can let-bind that to nil, and then any commands within an argument will signal an error. Then we just need to disable globbing via a different method (using the patch I originally posted), and all is well for this bug. I also added a couple preliminary patches to fix some semi-related issues I discovered while working on this. These could probably go in a separate bug, but I'm lazy. ;) The real meat of this change is patch 0003. --------------R0Zdqj8iNhyQh6Tpl6FLdJDT Content-Type: text/plain; charset=UTF-8; name="0001-Fix-an-edge-case-in-how-eshell-do-eval-handles-let-b.patch" Content-Disposition: attachment; filename*0="0001-Fix-an-edge-case-in-how-eshell-do-eval-handles-let-b.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA0OTlkZDU3OGQ4MDcyZTU2ZDEyNjg3OTdkNTQwN2QwMjFjNGYxZDkzIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IE1vbiwgMjAgTWFyIDIwMjMgMTc6MjQ6MjggLTA3MDAKU3ViamVjdDogW1BB VENIIDEvM10gOyBGaXggYW4gZWRnZSBjYXNlIGluIGhvdyAnZXNoZWxsLWRvLWV2YWwnIGhh bmRsZXMgJ2xldCcKIGJvZGllcwoKKiBsaXNwL2VzaGVsbC9lc2gtY21kLmVsIChlaGVsbC1k by1ldmFsKTogVXNlICdjYXItc2FmZSc7IHRoZSBvYmplY3QKaW4gcXVlc3Rpb24gbWlnaHQg bm90IGJlIGEgY29ucyBjZWxsLgotLS0KIGxpc3AvZXNoZWxsL2VzaC1jbWQuZWwgfCAyICst CiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKCmRpZmYg LS1naXQgYS9saXNwL2VzaGVsbC9lc2gtY21kLmVsIGIvbGlzcC9lc2hlbGwvZXNoLWNtZC5l bAppbmRleCA5M2YyNjE2MDIwYy4uZTA2NTFiNzYyNDkgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNo ZWxsL2VzaC1jbWQuZWwKKysrIGIvbGlzcC9lc2hlbGwvZXNoLWNtZC5lbApAQCAtMTE2OCw3 ICsxMTY4LDcgQEAgZXNoZWxsLWRvLWV2YWwKIAkoc2V0Y2FyIChjZHIgYXJncykgKGVzaGVs bC1kby1ldmFsIChjYWRyIGFyZ3MpIHN5bmNocm9ub3VzLXApKQogCShldmFsIGZvcm0pKQog ICAgICAgICgoZXEgKGNhciBmb3JtKSAnbGV0KQotICAgICAgICAod2hlbiAobm90IChlcSAo Y2FyIChjYWRyIGFyZ3MpKSAnZXNoZWxsLWRvLWV2YWwpKQorICAgICAgICAodW5sZXNzIChl cSAoY2FyLXNhZmUgKGNhZHIgYXJncykpICdlc2hlbGwtZG8tZXZhbCkKICAgICAgICAgICAo ZXNoZWxsLW1hbmlwdWxhdGUgImV2YWx1YXRpbmcgbGV0IGFyZ3MiCiAgICAgICAgICAgICAo ZG9saXN0IChsZXRhcmcgKGNhciBhcmdzKSkKICAgICAgICAgICAgICAgKHdoZW4gKGFuZCAo bGlzdHAgbGV0YXJnKQotLSAKMi4yNS4xCgo= --------------R0Zdqj8iNhyQh6Tpl6FLdJDT Content-Type: text/plain; charset=UTF-8; name="0002-Simplify-parsing-subcommands-slightly.patch" Content-Disposition: attachment; filename="0002-Simplify-parsing-subcommands-slightly.patch" Content-Transfer-Encoding: base64 RnJvbSAxYjZjOTg4ZWQ2OTdkZTljMzA2OTBhYTY5YzNmYzVhNWYzMDVhMzQyIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IE1vbiwgMjAgTWFyIDIwMjMgMTc6MjU6MjQgLTA3MDAKU3ViamVjdDogW1BB VENIIDIvM10gU2ltcGxpZnkgcGFyc2luZyBzdWJjb21tYW5kcyBzbGlnaHRseQoKVGhpcyBt YWlubHkgcmVkdWNlcyBzb21lIG92ZXJseS1kZWVwIGluZGVudGF0aW9uLCBidXQgYWxzbyBm aXhlcyBzb21lCm1pbm9yIGlzc3VlcyB3aXRoIHRoZSAiJDxzdWJjbWQ+IiBmb3JtOiBpdCB1 bm5lY2Vzc2FyaWx5IGFkZGVkICIgPgpURU1QIiAod2UgYWxyZWFkeSBzZXQgdGhpcyBsYXRl ciB2aWEgJ2VzaGVsbC1jcmVhdGUtaGFuZGxlcycpLCBhbmQgaXQKZGlkbid0IHByb3Blcmx5 IHVuZXNjYXBlIGlubmVyIGRvdWJsZSBxdW90ZXMuCgoqIGxpc3AvZXNoZWxsL2VzaC1jbWQu ZWwgKGVzaGVsbC1wYXJzZS1zdWJjb21tYW5kLWFyZ3VtZW50KTogU2ltcGxpZnkuCgoqIGxp c3AvZXNoZWxsL2VzaC12YXIuZWwgKGVzaGVsbC1wYXJzZS12YXJpYWJsZS1yZWYpOiBTaW1w bGlmeSBhbmQKZml4IGVkZ2UgY2FzZXMgaW4gIiQ8c3ViY21kPiIuCi0tLQogbGlzcC9lc2hl bGwvZXNoLWNtZC5lbCB8IDE0ICsrKy0tLS0KIGxpc3AvZXNoZWxsL2VzaC12YXIuZWwgfCA5 NSArKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMg Y2hhbmdlZCwgNTUgaW5zZXJ0aW9ucygrKSwgNTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvbGlzcC9lc2hlbGwvZXNoLWNtZC5lbCBiL2xpc3AvZXNoZWxsL2VzaC1jbWQuZWwKaW5k ZXggZTA2NTFiNzYyNDkuLjFhNDU4MjkwZGZlIDEwMDY0NAotLS0gYS9saXNwL2VzaGVsbC9l c2gtY21kLmVsCisrKyBiL2xpc3AvZXNoZWxsL2VzaC1jbWQuZWwKQEAgLTY3NSwxMyArNjc1 LDEzIEBAIGVzaGVsbC1wYXJzZS1zdWJjb21tYW5kLWFyZ3VtZW50CiAJICAgKG9yICg9IChw b2ludC1tYXgpICgxKyAocG9pbnQpKSkKIAkgICAgICAgKG5vdCAoZXEgKGNoYXItYWZ0ZXIg KDErIChwb2ludCkpKSA/XH0pKSkpCiAgICAgICAobGV0ICgoZW5kIChlc2hlbGwtZmluZC1k ZWxpbWl0ZXIgP1x7ID9cfSkpKQotCShpZiAobm90IGVuZCkKLSAgICAgICAgICAgICh0aHJv dyAnZXNoZWxsLWluY29tcGxldGUgInsiKQotCSAgKHdoZW4gKGVzaGVsbC1hcmctZGVsaW1p dGVyICgxKyBlbmQpKQotCSAgICAocHJvZzEKLQkJYChlc2hlbGwtYXMtc3ViY29tbWFuZAot ICAgICAgICAgICAgICAgICAgLChlc2hlbGwtcGFyc2UtY29tbWFuZCAoY29ucyAoMSsgKHBv aW50KSkgZW5kKSkpCi0JICAgICAgKGdvdG8tY2hhciAoMSsgZW5kKSkpKSkpKSkKKyAgICAg ICAgKHVubGVzcyBlbmQKKyAgICAgICAgICAodGhyb3cgJ2VzaGVsbC1pbmNvbXBsZXRlICJ7 IikpCisgICAgICAgICh3aGVuIChlc2hlbGwtYXJnLWRlbGltaXRlciAoMSsgZW5kKSkKKyAg ICAgICAgICAocHJvZzEKKyAgICAgICAgICAgICAgYChlc2hlbGwtYXMtc3ViY29tbWFuZAor ICAgICAgICAgICAgICAgICwoZXNoZWxsLXBhcnNlLWNvbW1hbmQgKGNvbnMgKDErIChwb2lu dCkpIGVuZCkpKQorICAgICAgICAgICAgKGdvdG8tY2hhciAoMSsgZW5kKSkpKSkpKQogCiAo ZGVmdW4gZXNoZWxsLXBhcnNlLWxpc3AtYXJndW1lbnQgKCkKICAgIlBhcnNlIGEgTGlzcCBl eHByZXNzaW9uIHdoaWNoIGlzIHNwZWNpZmllZCBhcyBhbiBhcmd1bWVudC4iCmRpZmYgLS1n aXQgYS9saXNwL2VzaGVsbC9lc2gtdmFyLmVsIGIvbGlzcC9lc2hlbGwvZXNoLXZhci5lbApp bmRleCA1ZDYyOTlhZjU2NC4uN2RjYWZmMWUyNGYgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxs L2VzaC12YXIuZWwKKysrIGIvbGlzcC9lc2hlbGwvZXNoLXZhci5lbApAQCAtNTA3LDU1ICs1 MDcsNTYgQEAgZXNoZWxsLXBhcnNlLXZhcmlhYmxlLXJlZgogICAoY29uZAogICAgKChlcSAo Y2hhci1hZnRlcikgP3spCiAgICAgKGxldCAoKGVuZCAoZXNoZWxsLWZpbmQtZGVsaW1pdGVy ID9ceyA/XH0pKSkKLSAgICAgIChpZiAobm90IGVuZCkKLSAgICAgICAgICAodGhyb3cgJ2Vz aGVsbC1pbmNvbXBsZXRlICIkeyIpCi0gICAgICAgIChmb3J3YXJkLWNoYXIpCi0gICAgICAg IChwcm9nMQotICAgICAgICAgICAgYChlc2hlbGwtYXBwbHktaW5kaWNlcwotICAgICAgICAg ICAgICAoZXNoZWxsLWNvbnZlcnQKLSAgICAgICAgICAgICAgIChlc2hlbGwtY29tbWFuZC10 by12YWx1ZQotICAgICAgICAgICAgICAgIChlc2hlbGwtYXMtc3ViY29tbWFuZAotICAgICAg ICAgICAgICAgICAsKGxldCAoKHN1YmNtZCAob3IgKGVzaGVsbC11bmVzY2FwZS1pbm5lci1k b3VibGUtcXVvdGUgZW5kKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KGNvbnMgKHBvaW50KSBlbmQpKSkKLSAgICAgICAgICAgICAgICAgICAgICAgIChlc2hlbGwt Y3VycmVudC1xdW90ZWQgbmlsKSkKLSAgICAgICAgICAgICAgICAgICAgKGVzaGVsbC1wYXJz ZS1jb21tYW5kIHN1YmNtZCkpKSkKLSAgICAgICAgICAgICAgIDs7IElmIHRoaXMgaXMgYSBz aW1wbGUgZG91YmxlLXF1b3RlZCBmb3JtIGxpa2UKLSAgICAgICAgICAgICAgIDs7ICIke0NP TU1BTkR9IiAoaS5lLiBubyBpbmRpY2VzIGFmdGVyIHRoZSBzdWJjb21tYW5kCi0gICAgICAg ICAgICAgICA7OyBhbmQgbm8gYCMnIG1vZGlmaWVyIGJlZm9yZSksIGVuc3VyZSB3ZSBjb252 ZXJ0IHRvIGEKLSAgICAgICAgICAgICAgIDs7IHNpbmdsZSBzdHJpbmcuICBUaGlzIGF2b2lk cyB1bm5lY2Vzc2FyeSB3b3JrCi0gICAgICAgICAgICAgICA7OyAoZS5nLiBzcGxpdHRpbmcg dGhlIG91dHB1dCBieSBsaW5lcykgd2hlbiBpdCB3b3VsZAotICAgICAgICAgICAgICAgOzsg anVzdCBiZSBqb2luZWQgYmFjayB0b2dldGhlciBhZnRlcndhcmRzLgotICAgICAgICAgICAg ICAgLCh3aGVuIChhbmQgKG5vdCBtb2RpZmllci1wKSBlc2hlbGwtY3VycmVudC1xdW90ZWQp Ci0gICAgICAgICAgICAgICAgICAnKG5vdCBpbmRpY2VzKSkpCi0gICAgICAgICAgICAgIGlu ZGljZXMgLGVzaGVsbC1jdXJyZW50LXF1b3RlZCkKLSAgICAgICAgICAoZ290by1jaGFyICgx KyBlbmQpKSkpKSkKKyAgICAgICh1bmxlc3MgZW5kCisgICAgICAgICh0aHJvdyAnZXNoZWxs LWluY29tcGxldGUgIiR7IikpCisgICAgICAoZm9yd2FyZC1jaGFyKQorICAgICAgKHByb2cx CisgICAgICAgICAgYChlc2hlbGwtYXBwbHktaW5kaWNlcworICAgICAgICAgICAgKGVzaGVs bC1jb252ZXJ0CisgICAgICAgICAgICAgKGVzaGVsbC1jb21tYW5kLXRvLXZhbHVlCisgICAg ICAgICAgICAgIChlc2hlbGwtYXMtc3ViY29tbWFuZAorICAgICAgICAgICAgICAgLChsZXQg KChzdWJjbWQgKG9yIChlc2hlbGwtdW5lc2NhcGUtaW5uZXItZG91YmxlLXF1b3RlIGVuZCkK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY29ucyAocG9pbnQpIGVuZCkp KQorICAgICAgICAgICAgICAgICAgICAgIChlc2hlbGwtY3VycmVudC1xdW90ZWQgbmlsKSkK KyAgICAgICAgICAgICAgICAgIChlc2hlbGwtcGFyc2UtY29tbWFuZCBzdWJjbWQpKSkpCisg ICAgICAgICAgICAgOzsgSWYgdGhpcyBpcyBhIHNpbXBsZSBkb3VibGUtcXVvdGVkIGZvcm0g bGlrZQorICAgICAgICAgICAgIDs7ICIke0NPTU1BTkR9IiAoaS5lLiBubyBpbmRpY2VzIGFm dGVyIHRoZSBzdWJjb21tYW5kIGFuZAorICAgICAgICAgICAgIDs7IG5vIGAjJyBtb2RpZmll ciBiZWZvcmUpLCBlbnN1cmUgd2UgY29udmVydCB0byBhIHNpbmdsZQorICAgICAgICAgICAg IDs7IHN0cmluZy4gIFRoaXMgYXZvaWRzIHVubmVjZXNzYXJ5IHdvcmsgKGUuZy4gc3BsaXR0 aW5nCisgICAgICAgICAgICAgOzsgdGhlIG91dHB1dCBieSBsaW5lcykgd2hlbiBpdCB3b3Vs ZCBqdXN0IGJlIGpvaW5lZCBiYWNrCisgICAgICAgICAgICAgOzsgdG9nZXRoZXIgYWZ0ZXJ3 YXJkcy4KKyAgICAgICAgICAgICAsKHdoZW4gKGFuZCAobm90IG1vZGlmaWVyLXApIGVzaGVs bC1jdXJyZW50LXF1b3RlZCkKKyAgICAgICAgICAgICAgICAnKG5vdCBpbmRpY2VzKSkpCisg ICAgICAgICAgICBpbmRpY2VzICxlc2hlbGwtY3VycmVudC1xdW90ZWQpCisgICAgICAgIChn b3RvLWNoYXIgKDErIGVuZCkpKSkpCiAgICAoKGVxIChjaGFyLWFmdGVyKSA/XDwpCiAgICAg KGxldCAoKGVuZCAoZXNoZWxsLWZpbmQtZGVsaW1pdGVyID9cPCA/XD4pKSkKLSAgICAgIChp ZiAobm90IGVuZCkKLSAgICAgICAgICAodGhyb3cgJ2VzaGVsbC1pbmNvbXBsZXRlICIkPCIp Ci0gICAgICAgIChsZXQqICgodGVtcCAobWFrZS10ZW1wLWZpbGUgdGVtcG9yYXJ5LWZpbGUt ZGlyZWN0b3J5KSkKLSAgICAgICAgICAgICAgIChjbWQgKGNvbmNhdCAoYnVmZmVyLXN1YnN0 cmluZyAoMSsgKHBvaW50KSkgZW5kKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICIg PiAiIHRlbXApKSkKLSAgICAgICAgICAocHJvZzEKLSAgICAgICAgICAgICAgYChsZXQgKChl c2hlbGwtY3VycmVudC1oYW5kbGVzCi0gICAgICAgICAgICAgICAgICAgICAgKGVzaGVsbC1j cmVhdGUtaGFuZGxlcyAsdGVtcCAnb3ZlcndyaXRlKSkpCi0gICAgICAgICAgICAgICAgIChw cm9nbgotICAgICAgICAgICAgICAgICAgIChlc2hlbGwtYXMtc3ViY29tbWFuZAotICAgICAg ICAgICAgICAgICAgICAsKGxldCAoKGVzaGVsbC1jdXJyZW50LXF1b3RlZCBuaWwpKQotICAg ICAgICAgICAgICAgICAgICAgICAoZXNoZWxsLXBhcnNlLWNvbW1hbmQgY21kKSkpCi0gICAg ICAgICAgICAgICAgICAgKGlnbm9yZQotICAgICAgICAgICAgICAgICAgICAobmNvbmMgZXNo ZWxsLXRoaXMtY29tbWFuZC1ob29rCi0gICAgICAgICAgICAgICAgICAgICAgICAgICA7OyBR dW90ZSB0aGlzIGxhbWJkYTsgaXQgd2lsbCBiZSBldmFsdWF0ZWQKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgIDs7IGJ5IGBlc2hlbGwtZG8tZXZhbCcsIHdoaWNoIHJlcXVpcmVzIHZl cnkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgIDs7IHBhcnRpY3VsYXIgZm9ybXMgaW4g b3JkZXIgdG8gd29yawotICAgICAgICAgICAgICAgICAgICAgICAgICAgOzsgcHJvcGVybHku ICBTZWUgYnVnIzU0MTkwLgotICAgICAgICAgICAgICAgICAgICAgICAgICAgKGxpc3QgKGZ1 bmN0aW9uCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGxhbWJkYSAoKQot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGRlbGV0ZS1maWxlICx0ZW1w KQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHdoZW4tbGV0ICgoYnVm ZmVyIChnZXQtZmlsZS1idWZmZXIgLHRlbXApKSkKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKGtpbGwtYnVmZmVyIGJ1ZmZlcikpKSkpKSkKLSAgICAgICAgICAg ICAgICAgICAoZXNoZWxsLWFwcGx5LWluZGljZXMgLHRlbXAgaW5kaWNlcyAsZXNoZWxsLWN1 cnJlbnQtcXVvdGVkKSkpCi0gICAgICAgICAgICAoZ290by1jaGFyICgxKyBlbmQpKSkpKSkp CisgICAgICAodW5sZXNzIGVuZAorICAgICAgICAodGhyb3cgJ2VzaGVsbC1pbmNvbXBsZXRl ICIkPCIpKQorICAgICAgKGZvcndhcmQtY2hhcikKKyAgICAgIChsZXQqICgodGVtcCAobWFr ZS10ZW1wLWZpbGUgdGVtcG9yYXJ5LWZpbGUtZGlyZWN0b3J5KSkKKyAgICAgICAgICAgICAo c3ViY21kIChvciAoZXNoZWxsLXVuZXNjYXBlLWlubmVyLWRvdWJsZS1xdW90ZSBlbmQpCisg ICAgICAgICAgICAgICAgICAgICAgICAgKGNvbnMgKHBvaW50KSBlbmQpKSkpCisgICAgICAg IChwcm9nMQorICAgICAgICAgICAgYChsZXQgKChlc2hlbGwtY3VycmVudC1oYW5kbGVzCisg ICAgICAgICAgICAgICAgICAgIChlc2hlbGwtY3JlYXRlLWhhbmRsZXMgLHRlbXAgJ292ZXJ3 cml0ZSkpKQorICAgICAgICAgICAgICAgKHByb2duCisgICAgICAgICAgICAgICAgIChlc2hl bGwtYXMtc3ViY29tbWFuZAorICAgICAgICAgICAgICAgICAgLChsZXQgKChlc2hlbGwtY3Vy cmVudC1xdW90ZWQgbmlsKSkKKyAgICAgICAgICAgICAgICAgICAgIChlc2hlbGwtcGFyc2Ut Y29tbWFuZCBzdWJjbWQpKSkKKyAgICAgICAgICAgICAgICAgKGlnbm9yZQorICAgICAgICAg ICAgICAgICAgKG5jb25jIGVzaGVsbC10aGlzLWNvbW1hbmQtaG9vaworICAgICAgICAgICAg ICAgICAgICAgICAgIDs7IFF1b3RlIHRoaXMgbGFtYmRhOyBpdCB3aWxsIGJlIGV2YWx1YXRl ZCBieQorICAgICAgICAgICAgICAgICAgICAgICAgIDs7IGBlc2hlbGwtZG8tZXZhbCcsIHdo aWNoIHJlcXVpcmVzIHZlcnkKKyAgICAgICAgICAgICAgICAgICAgICAgICA7OyBwYXJ0aWN1 bGFyIGZvcm1zIGluIG9yZGVyIHRvIHdvcmsKKyAgICAgICAgICAgICAgICAgICAgICAgICA7 OyBwcm9wZXJseS4gIFNlZSBidWcjNTQxOTAuCisgICAgICAgICAgICAgICAgICAgICAgICAg KGxpc3QgKGZ1bmN0aW9uCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChsYW1i ZGEgKCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoZGVsZXRlLWZpbGUg LHRlbXApCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHdoZW4tbGV0ICgo YnVmZmVyIChnZXQtZmlsZS1idWZmZXIgLHRlbXApKSkKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIChraWxsLWJ1ZmZlciBidWZmZXIpKSkpKSkpCisgICAgICAgICAg ICAgICAgIChlc2hlbGwtYXBwbHktaW5kaWNlcyAsdGVtcCBpbmRpY2VzICxlc2hlbGwtY3Vy cmVudC1xdW90ZWQpKSkKKyAgICAgICAgICAoZ290by1jaGFyICgxKyBlbmQpKSkpKSkKICAg ICgoZXEgKGNoYXItYWZ0ZXIpID9cKCkKICAgICAoY29uZGl0aW9uLWNhc2UgbmlsCiAgICAg ICAgIGAoZXNoZWxsLWFwcGx5LWluZGljZXMKLS0gCjIuMjUuMQoK --------------R0Zdqj8iNhyQh6Tpl6FLdJDT Content-Type: text/plain; charset=UTF-8; name="0003-Avoid-parsing-some-Eshell-forms-when-performing-comp.patch" Content-Disposition: attachment; filename*0="0003-Avoid-parsing-some-Eshell-forms-when-performing-comp.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAwYTA2YzFlNDFiY2MxMTlkYTI5ZjQ2ZTJmOWUxZTg1ZGEwNmRjNWIxIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IE1vbiwgMjAgTWFyIDIwMjMgMTc6MjU6NTQgLTA3MDAKU3ViamVjdDogW1BB VENIIDMvM10gQXZvaWQgcGFyc2luZyBzb21lIEVzaGVsbCBmb3JtcyB3aGVuIHBlcmZvcm1p bmcKIGNvbXBsZXRpb24KCkR1cmluZyBjb21wbGV0aW9uLCB3ZSB3YW50IHRvIGV2YWx1YXRl IG1vc3QgRXNoZWxsIGZvcm1zCihlLmcuIHZhcmlhYmxlIHJlZmVyZW5jZXMpLCBidXQgc2tp cCBvdGhlcnMgKGUuZy4gZ2xvYmJpbmcsCnN1YmNvbW1hbmRzKS4gIEZvciBnbG9iYmluZywg d2Ugd2FudCB0byBwYXNzIHRoZSBsaXRlcmFsIGdsb2IgdG8KUGNvbXBsZXRlIHNvIGl0IGNh biB1c2UgdGhlIGdsb2IgZm9yIHNlbGVjdGluZyBjb21wbGV0aW9uIGNhbmRpZGF0ZXMuCkZv ciBzdWJjb21tYW5kcyAoaW5jbHVkaW5nIExpc3AgZm9ybXMpLCB3ZSBlc3BlY2lhbGx5IHdh bnQgdG8gYXZvaWQKZXZhbHVhdGlvbiwgc2luY2UgdGhleSBjYW4gcHJvZHVjZSBhcmJpdGFy eSBzaWRlIGVmZmVjdHMhICAoQnVnIzUwNDcwKQoKKiBsaXNwL2VzaGVsbC9lc2gtY21kLmVs IChlc2hlbGwtYWxsb3ctY29tbWFuZHMpOiBOZXcgdmFyaWFibGUuLi4KKGVzaGVsbC1jb21t YW5kcy1mb3JiaWRkZW4pOiBOZXcgZXJyb3IuLi4KKGVzaGVsbC1uYW1lZC1jb21tYW5kLCBl c2hlbGwtbGlzcC1jb21tYW5kKTogLi4uIHVzZSB0aGVtLgoKKiBsaXNwL2VzaGVsbC9lbS1j bXBsLmVsIChlc2hlbGwtY29tcGxldGUtLWV2YWwtYXJndW1lbnQtZm9ybSk6CkRpc2FsbG93 IGNvbW1hbmQgZm9ybXMgYW5kIGhhbmRsZSBlcnJvcnMgb3Vyc2VsdmVzLgooZXNoZWxsLWNv bXBsZXRlLXBhcnNlLWFyZ3VtZW50cyk6IERvbid0IHBhcnNlIGdsb2IgY2hhcmFjdGVycy4K CiogdGVzdC9saXNwL2VzaGVsbC9lbS1jbXBsLXRlc3RzLmVsCihlbS1jbXBsLXRlc3QvcGFy c2UtYXJndW1lbnRzL3VuZXZhbHVhdGVkLXN1YmNvbW1hbmQpCihlbS1jbXBsLXRlc3QvcGFy c2UtYXJndW1lbnRzL3VuZXZhbHVhdGVkLWxpc3AtZm9ybSkKKGVtLWNtcGwtdGVzdC9maWxl LWNvbXBsZXRpb24vZ2xvYiwgZW0tY21wbC10ZXN0L2NvbW1hbmQtY29tcGxldGlvbikKKGVt LWNtcGwtdGVzdC9zdWJjb21tYW5kLWNvbXBsZXRpb24pOiBOZXcgdGVzdHMuCihlbS1jbXBs LXRlc3QvbGlzcC1mdW5jdGlvbi1jb21wbGV0aW9uKTogQ2hlY2sgIiQoZnVuYykiIHN5bnRh eC4KLS0tCiBsaXNwL2VzaGVsbC9lbS1jbXBsLmVsICAgICAgICAgICAgfCA2MCArKysrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tCiBsaXNwL2VzaGVsbC9lc2gtY21kLmVsICAgICAg ICAgICAgfCAxNSArKysrKysrKwogdGVzdC9saXNwL2VzaGVsbC9lbS1jbXBsLXRlc3RzLmVs IHwgNTkgKysrKysrKysrKysrKysrKysrKysrKysrKysrKystCiAzIGZpbGVzIGNoYW5nZWQs IDExMyBpbnNlcnRpb25zKCspLCAyMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNw L2VzaGVsbC9lbS1jbXBsLmVsIGIvbGlzcC9lc2hlbGwvZW0tY21wbC5lbAppbmRleCBiNjU2 NTIwMTlkNC4uNzMyYmJiM2YxZmEgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VtLWNtcGwu ZWwKKysrIGIvbGlzcC9lc2hlbGwvZW0tY21wbC5lbApAQCAtMzA2LDkgKzMwNiwyNCBAQCBl c2hlbGwtLXBjb21wbGV0ZS1pbnNlcnQtdGFiCiAKIChkZWZ1biBlc2hlbGwtY29tcGxldGUt LWV2YWwtYXJndW1lbnQtZm9ybSAoYXJnKQogICAiRXZhbHVhdGUgYSBzaW5nbGUgRXNoZWxs IGFyZ3VtZW50IGZvcm0gQVJHIGZvciB0aGUgcHVycG9zZXMgb2YgY29tcGxldGlvbi4iCi0g IChsZXQgKChyZXN1bHQgKGVzaGVsbC1kby1ldmFsIGAoZXNoZWxsLWNvbW1hbmRzICxhcmcp IHQpKSkKLSAgICAoY2wtYXNzZXJ0IChlcSAoY2FyIHJlc3VsdCkgJ3F1b3RlKSkKLSAgICAo Y2FkciByZXN1bHQpKSkKKyAgKGNvbmRpdGlvbi1jYXNlIGVycgorICAgICAgKGxldCogKDs7 IERvbid0IGFsbG93IHJ1bm5pbmcgY29tbWFuZHM7IHRoZXkgY291bGQgaGF2ZQorICAgICAg ICAgICAgIDs7IGFyYml0cmFyeSBzaWRlIGVmZmVjdHMsIHdoaWNoIHdlIGRvbid0IHdhbnQg d2hlbiB3ZSdyZQorICAgICAgICAgICAgIDs7IGp1c3QgcGVyZm9ybWluZyBjb21wbGV0aW9u cyEKKyAgICAgICAgICAgICAoZXNoZWxsLWFsbG93LWNvbW1hbmRzKQorICAgICAgICAgICAg IDs7IEhhbmRsZSBlcnJvcnMgb3Vyc2VsdmVzIHNvIHRoYXQgd2UgY2FuIHByb3Blcmx5IGNh dGNoCisgICAgICAgICAgICAgOzsgYGVzaGVsbC1jb21tYW5kcy1mb3JiaWRkZW4nLgorICAg ICAgICAgICAgIChlc2hlbGwtaGFuZGxlLWVycm9ycykKKyAgICAgICAgICAgICAocmVzdWx0 IChlc2hlbGwtZG8tZXZhbCBgKGVzaGVsbC1jb21tYW5kcyAsYXJnKSB0KSkpCisgICAgICAg IChjbC1hc3NlcnQgKGVxIChjYXIgcmVzdWx0KSAncXVvdGUpKQorICAgICAgICAoY2FkciBy ZXN1bHQpKQorICAgIChlc2hlbGwtY29tbWFuZHMtZm9yYmlkZGVuCisgICAgIChwcm9wZXJ0 aXplICJcMCIgJ2VzaGVsbC1hcmd1bWVudC1zdHViCisgICAgICAgICAgICAgICAgIChpbnRl cm4gKGZvcm1hdCAiJXMtY29tbWFuZCIgKGNhZHIgZXJyKSkpKSkKKyAgICAoZXJyb3IKKyAg ICAgKGx3YXJuICdlc2hlbGwgOmVycm9yCisgICAgICAgICAgICAiRmFpbGVkIHRvIGV2YWx1 YXRlIGFyZ3VtZW50IGZvcm0gZHVyaW5nIGNvbXBsZXRpb246ICVTIiBhcmcpCisgICAgIChw cm9wZXJ0aXplICJcMCIgJ2VzaGVsbC1hcmd1bWVudC1zdHViICdlcnJvcikpKSkKIAogKGRl ZnVuIGVzaGVsbC1jb21wbGV0ZS1wYXJzZS1hcmd1bWVudHMgKCkKICAgIlBhcnNlIHRoZSBj b21tYW5kIGxpbmUgYXJndW1lbnRzIGZvciBgcGNvbXBsZXRlLWFyZ3VtZW50Jy4iCkBAIC0z MjUsMjMgKzM0MCwyOCBAQCBlc2hlbGwtY29tcGxldGUtcGFyc2UtYXJndW1lbnRzCiAgICAg ICAoaWYgKD0gYmVnaW4gZW5kKQogCSAgKGVuZC1vZi1saW5lKSkKICAgICAgIChzZXRxIGVu ZCAocG9pbnQtbWFya2VyKSkpCi0gICAgKGlmIChzZXRxIGRlbGltCi0JICAgICAgKGNhdGNo ICdlc2hlbGwtaW5jb21wbGV0ZQotCQkoaWdub3JlCi0JCSAoc2V0cSBhcmdzIChlc2hlbGwt cGFyc2UtYXJndW1lbnRzIGJlZ2luIGVuZCkpKSkpCi0gICAgICAgIChjb25kICgobWVtYmVy IChjYXIgZGVsaW0pICcoInsiICIkeyIgIiQ8IikpCi0JICAgICAgIChzZXRxIGJlZ2luICgx KyAoY2FkciBkZWxpbSkpCi0JCSAgICAgYXJncyAoZXNoZWxsLXBhcnNlLWFyZ3VtZW50cyBi ZWdpbiBlbmQpKSkKLSAgICAgICAgICAgICAgKChtZW1iZXIgKGNhciBkZWxpbSkgJygiJCci ICIkXCIiICIjPCIpKQotICAgICAgICAgICAgICAgOzsgQWRkIHRoZSAoaW5jb21wbGV0ZSkg YXJndW1lbnQgdG8gb3VyIGFyZ3VtZW50cywgYW5kCi0gICAgICAgICAgICAgICA7OyBub3Rl IGl0cyBwb3NpdGlvbi4KLSAgICAgICAgICAgICAgIChzZXRxIGFyZ3MgKGFwcGVuZCAobnRo IDIgZGVsaW0pIChsaXN0IChjYXIgZGVsaW0pKSkKLSAgICAgICAgICAgICAgICAgICAgIGlu Y29tcGxldGUtYXJnIHQpCi0gICAgICAgICAgICAgICAocHVzaCAoLSAobnRoIDEgZGVsaW0p IDIpIHBvc25zKSkKLSAgICAgICAgICAgICAgKChtZW1iZXIgKGNhciBkZWxpbSkgJygiKCIg IiQoIikpCi0JICAgICAgICh0aHJvdyAncGNvbXBsZXRlZCAoZWxpc3AtY29tcGxldGlvbi1h dC1wb2ludCkpKQotCSAgICAgICh0Ci0JICAgICAgIChlc2hlbGwtLXBjb21wbGV0ZS1pbnNl cnQtdGFiKSkpKQorICAgIDs7IERvbid0IGV4cGFuZCBnbG9icyB3aGVuIHBhcnNpbmcgYXJn dW1lbnRzOyB3ZSB3YW50IHRvIHBhc3MgYW55CisgICAgOzsgZ2xvYnMgdG8gUGNvbXBsZXRl IHVuYWx0ZXJlZC4KKyAgICAoZGVjbGFyZS1mdW5jdGlvbiBlc2hlbGwtcGFyc2UtZ2xvYi1j aGFycyAiZW0tZ2xvYiIgKCkpCisgICAgKGxldCAoKGVzaGVsbC1wYXJzZS1hcmd1bWVudC1o b29rIChyZW1xICMnZXNoZWxsLXBhcnNlLWdsb2ItY2hhcnMKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZXNoZWxsLXBhcnNlLWFyZ3VtZW50LWhvb2sp KSkKKyAgICAgIChpZiAoc2V0cSBkZWxpbQorCSAgICAgICAgKGNhdGNoICdlc2hlbGwtaW5j b21wbGV0ZQorCQkgIChpZ25vcmUKKwkJICAgKHNldHEgYXJncyAoZXNoZWxsLXBhcnNlLWFy Z3VtZW50cyBiZWdpbiBlbmQpKSkpKQorICAgICAgICAgIChjb25kICgobWVtYmVyIChjYXIg ZGVsaW0pICcoInsiICIkeyIgIiQ8IikpCisJICAgICAgICAgKHNldHEgYmVnaW4gKDErIChj YWRyIGRlbGltKSkKKwkJICAgICAgIGFyZ3MgKGVzaGVsbC1wYXJzZS1hcmd1bWVudHMgYmVn aW4gZW5kKSkpCisgICAgICAgICAgICAgICAgKChtZW1iZXIgKGNhciBkZWxpbSkgJygiJCci ICIkXCIiICIjPCIpKQorICAgICAgICAgICAgICAgICA7OyBBZGQgdGhlIChpbmNvbXBsZXRl KSBhcmd1bWVudCB0byBvdXIgYXJndW1lbnRzLCBhbmQKKyAgICAgICAgICAgICAgICAgOzsg bm90ZSBpdHMgcG9zaXRpb24uCisgICAgICAgICAgICAgICAgIChzZXRxIGFyZ3MgKGFwcGVu ZCAobnRoIDIgZGVsaW0pIChsaXN0IChjYXIgZGVsaW0pKSkKKyAgICAgICAgICAgICAgICAg ICAgICAgaW5jb21wbGV0ZS1hcmcgdCkKKyAgICAgICAgICAgICAgICAgKHB1c2ggKC0gKG50 aCAxIGRlbGltKSAyKSBwb3NucykpCisgICAgICAgICAgICAgICAgKChtZW1iZXIgKGNhciBk ZWxpbSkgJygiKCIgIiQoIikpCisJICAgICAgICAgKHRocm93ICdwY29tcGxldGVkIChlbGlz cC1jb21wbGV0aW9uLWF0LXBvaW50KSkpCisJICAgICAgICAodAorCSAgICAgICAgIChlc2hl bGwtLXBjb21wbGV0ZS1pbnNlcnQtdGFiKSkpKSkKICAgICAod2hlbiAoZ2V0LXRleHQtcHJv cGVydHkgKDEtIGVuZCkgJ2NvbW1lbnQpCiAgICAgICAoZXNoZWxsLS1wY29tcGxldGUtaW5z ZXJ0LXRhYikpCiAgICAgKGxldCAoKHBvcyAoMS0gZW5kKSkpCmRpZmYgLS1naXQgYS9saXNw L2VzaGVsbC9lc2gtY21kLmVsIGIvbGlzcC9lc2hlbGwvZXNoLWNtZC5lbAppbmRleCAxYTQ1 ODI5MGRmZS4uZDUyMzdlZTFmMDQgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VzaC1jbWQu ZWwKKysrIGIvbGlzcC9lc2hlbGwvZXNoLWNtZC5lbApAQCAtMjkzLDYgKzI5MywxNyBAQCBl c2hlbGwtbGFzdC1hc3luYy1wcm9jcwogCiBXaGVuIHRoZSBwcm9jZXNzIGluIHRoZSBDRFIg Y29tcGxldGVzLCByZXN1bWUgY29tbWFuZCBldmFsdWF0aW9uLiIpCiAKKyhkZWZ2YXIgZXNo ZWxsLWFsbG93LWNvbW1hbmRzIHQKKyAgIklmIG5vbi1uaWwsIGFsbG93IGV2YWx1YXRpbmcg Y29tbWFuZCBmb3JtcyAoaW5jbHVkaW5nIExpc3AgZm9ybXMpLgorSWYgeW91IHdhbnQgdG8g Zm9yYmlkIGNvbW1hbmQgZm9ybXMsIHlvdSBjYW4gbGV0LWJpbmQgdGhpcyB0byBhCitub24t bmlsIHZhbHVlIGJlZm9yZSBjYWxsaW5nIGBlc2hlbGwtZG8tZXZhbCcuICBUaGVuLCBhbnkg Y29tbWFuZAorZm9ybXMgd2lsbCBzaWduYWwgYGVzaGVsbC1jb21tYW5kcy1mb3JiaWRkZW4n LiAgVGhpcyBpcyB1c2VmdWwKK2lmLCBmb3IgZXhhbXBsZSwgeW91IHdhbnQgdG8gZXZhbHVh dGUgc2ltcGxlIGV4cHJlc3Npb25zIGxpa2UKK3ZhcmlhYmxlIGV4cGFuc2lvbnMsIGJ1dCBu b3QgZnVsbHktZXZhbHVhdGUgdGhlIGNvbW1hbmQuICBTZWUKK2Fsc28gYGVzaGVsbC1jb21w bGV0ZS1wYXJzZS1hcmd1bWVudHMnLiIpCisKKyhkZWZpbmUtZXJyb3IgJ2VzaGVsbC1jb21t YW5kcy1mb3JiaWRkZW4gIkNvbW1hbmRzIGZvcmJpZGRlbiIpCisKIDs7OyBGdW5jdGlvbnM6 CiAKIChkZWZzdWJzdCBlc2hlbGwtaW50ZXJhY3RpdmUtcHJvY2Vzcy1wICgpCkBAIC0xMzI4 LDYgKzEzMzksOCBAQCBlc2hlbGwvd2hpY2gKIChkZWZ1biBlc2hlbGwtbmFtZWQtY29tbWFu ZCAoY29tbWFuZCAmb3B0aW9uYWwgYXJncykKICAgIkluc2VydCBvdXRwdXQgZnJvbSBhIHBs YWluIENPTU1BTkQsIHVzaW5nIEFSR1MuCiBDT01NQU5EIG1heSByZXN1bHQgaW4gYW4gYWxp YXMgYmVpbmcgZXhlY3V0ZWQsIG9yIGEgcGxhaW4gY29tbWFuZC4iCisgICh1bmxlc3MgZXNo ZWxsLWFsbG93LWNvbW1hbmRzCisgICAgKHNpZ25hbCAnZXNoZWxsLWNvbW1hbmRzLWZvcmJp ZGRlbiAnKG5hbWVkKSkpCiAgIChzZXRxIGVzaGVsbC1sYXN0LWFyZ3VtZW50cyBhcmdzCiAJ ZXNoZWxsLWxhc3QtY29tbWFuZC1uYW1lIChlc2hlbGwtc3RyaW5naWZ5IGNvbW1hbmQpKQog ICAocnVuLWhvb2std2l0aC1hcmdzICdlc2hlbGwtcHJlcGFyZS1jb21tYW5kLWhvb2spCkBA IC0xNDY1LDYgKzE0NzgsOCBAQCBlc2hlbGwtbGFzdC1vdXRwdXQtZW5kCiAKIChkZWZ1biBl c2hlbGwtbGlzcC1jb21tYW5kIChvYmplY3QgJm9wdGlvbmFsIGFyZ3MpCiAgICJJbnNlcnQg TGlzcCBPQkpFQ1QsIHVzaW5nIEFSR1MgaWYgYSBmdW5jdGlvbi4iCisgICh1bmxlc3MgZXNo ZWxsLWFsbG93LWNvbW1hbmRzCisgICAgKHNpZ25hbCAnZXNoZWxsLWNvbW1hbmRzLWZvcmJp ZGRlbiAnKGxpc3ApKSkKICAgKGNhdGNoICdlc2hlbGwtZXh0ZXJuYWwgICAgICAgICAgICAg ICA7IGRlZmVycmVkIHRvIGFuIGV4dGVybmFsIGNvbW1hbmQKICAgICAoc2V0cSBlc2hlbGwt bGFzdC1jb21tYW5kLXN0YXR1cyAwCiAgICAgICAgICAgZXNoZWxsLWxhc3QtYXJndW1lbnRz IGFyZ3MpCmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvZXNoZWxsL2VtLWNtcGwtdGVzdHMuZWwg Yi90ZXN0L2xpc3AvZXNoZWxsL2VtLWNtcGwtdGVzdHMuZWwKaW5kZXggZWE5MDdmMTk0NWQu LjFmNzcxMmUyM2QxIDEwMDY0NAotLS0gYS90ZXN0L2xpc3AvZXNoZWxsL2VtLWNtcGwtdGVz dHMuZWwKKysrIGIvdGVzdC9saXNwL2VzaGVsbC9lbS1jbXBsLXRlc3RzLmVsCkBAIC0xMjMs NiArMTIzLDM2IEBAIGVtLWNtcGwtdGVzdC9wYXJzZS1hcmd1bWVudHMvdmFyaWFibGUvc3Bs aWNlCiAgICAgICAgICAgICAgIChjYXIgKGVzaGVsbC1jb21wbGV0ZS1wYXJzZS1hcmd1bWVu dHMpKQogICAgICAgICAgICAgICAnKCJlY2hvIiAiZm9vIiAiYmFyIikpKSkpKQogCisoZXJ0 LWRlZnRlc3QgZW0tY21wbC10ZXN0L3BhcnNlLWFyZ3VtZW50cy91bmV2YWx1YXRlZC1zdWJj b21tYW5kICgpCisgICJUZXN0IHRoYXQgc3ViY29tbWFuZHMgcmV0dXJuIGEgc3R1YiB3aGVu IHBhcnNpbmcgZm9yIGNvbXBsZXRpb24uIgorICAod2l0aC10ZW1wLWVzaGVsbAorICAgKGlu c2VydCAiZWNobyB7ZWNobyBoaX0iKQorICAgKHNob3VsZCAoZXNoZWxsLWFyZ3VtZW50cy1l cXVhbAorICAgICAgICAgICAgKGNhciAoZXNoZWxsLWNvbXBsZXRlLXBhcnNlLWFyZ3VtZW50 cykpCisgICAgICAgICAgICBgKCJlY2hvIiAsKHByb3BlcnRpemUKKyAgICAgICAgICAgICAg ICAgICAgICAgIlwwIiAnZXNoZWxsLWFyZ3VtZW50LXN0dWIgJ25hbWVkLWNvbW1hbmQpKSkp KQorICAod2l0aC10ZW1wLWVzaGVsbAorICAgKGluc2VydCAiZWNobyAke2VjaG8gaGl9IikK KyAgIChzaG91bGQgKGVzaGVsbC1hcmd1bWVudHMtZXF1YWwKKyAgICAgICAgICAgIChjYXIg KGVzaGVsbC1jb21wbGV0ZS1wYXJzZS1hcmd1bWVudHMpKQorICAgICAgICAgICAgYCgiZWNo byIgLChwcm9wZXJ0aXplCisgICAgICAgICAgICAgICAgICAgICAgICJcMCIgJ2VzaGVsbC1h cmd1bWVudC1zdHViICduYW1lZC1jb21tYW5kKSkpKSkpCisKKyhlcnQtZGVmdGVzdCBlbS1j bXBsLXRlc3QvcGFyc2UtYXJndW1lbnRzL3VuZXZhbHVhdGVkLWxpc3AtZm9ybSAoKQorICAi VGVzdCB0aGF0IExpc3AgZm9ybXMgcmV0dXJuIGEgc3R1YiB3aGVuIHBhcnNpbmcgZm9yIGNv bXBsZXRpb24uIgorICAod2l0aC10ZW1wLWVzaGVsbAorICAgKGluc2VydCAiZWNobyAoY29u Y2F0IFwiaGlcIikiKQorICAgKHNob3VsZCAoZXNoZWxsLWFyZ3VtZW50cy1lcXVhbAorICAg ICAgICAgICAgKGNhciAoZXNoZWxsLWNvbXBsZXRlLXBhcnNlLWFyZ3VtZW50cykpCisgICAg ICAgICAgICBgKCJlY2hvIiAsKHByb3BlcnRpemUKKyAgICAgICAgICAgICAgICAgICAgICAg IlwwIiAnZXNoZWxsLWFyZ3VtZW50LXN0dWIgJ2xpc3AtY29tbWFuZCkpKSkpCisgICh3aXRo LXRlbXAtZXNoZWxsCisgICAoaW5zZXJ0ICJlY2hvICQoY29uY2F0IFwiaGlcIikiKQorICAg KHNob3VsZCAoZXNoZWxsLWFyZ3VtZW50cy1lcXVhbAorICAgICAgICAgICAgKGNhciAoZXNo ZWxsLWNvbXBsZXRlLXBhcnNlLWFyZ3VtZW50cykpCisgICAgICAgICAgICBgKCJlY2hvIiAs KHByb3BlcnRpemUKKyAgICAgICAgICAgICAgICAgICAgICAgIlwwIiAnZXNoZWxsLWFyZ3Vt ZW50LXN0dWIgJ2xpc3AtY29tbWFuZCkpKSkpKQorCiAoZXJ0LWRlZnRlc3QgZW0tY21wbC10 ZXN0L2ZpbGUtY29tcGxldGlvbi91bmlxdWUgKCkKICAgIlRlc3QgY29tcGxldGlvbiBvZiBm aWxlIG5hbWVzIHdoZW4gdGhlcmUncyBhIHVuaXF1ZSByZXN1bHQuIgogICAod2l0aC10ZW1w LWVzaGVsbApAQCAtMTUwLDYgKzE4MCwxNSBAQCBlbS1jbXBsLXRlc3QvZmlsZS1jb21wbGV0 aW9uL25vbi11bmlxdWUKICAgICAgICAgIChmb3J3YXJkLWxpbmUgLTEpCiAgICAgICAgICAo c2hvdWxkIChsb29raW5nLWF0ICJDb21wbGV0ZSwgYnV0IG5vdCB1bmlxdWUiKSkpKSkpKQog CisoZXJ0LWRlZnRlc3QgZW0tY21wbC10ZXN0L2ZpbGUtY29tcGxldGlvbi9nbG9iICgpCisg ICJUZXN0IGNvbXBsZXRpb24gb2YgZmlsZSBuYW1lcyB1c2luZyBhIGdsb2IuIgorICAod2l0 aC10ZW1wLWVzaGVsbAorICAgKGVydC13aXRoLXRlbXAtZGlyZWN0b3J5IGRlZmF1bHQtZGly ZWN0b3J5CisgICAgICh3cml0ZS1yZWdpb24gbmlsIG5pbCAoZXhwYW5kLWZpbGUtbmFtZSAi ZmlsZS50eHQiKSkKKyAgICAgKHdyaXRlLXJlZ2lvbiBuaWwgbmlsIChleHBhbmQtZmlsZS1u YW1lICJmaWxlLmVsIikpCisgICAgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtaW5zZXJ0LWFu ZC1jb21wbGV0ZSAiZWNobyBmaSouZWwiKQorICAgICAgICAgICAgICAgICAgICAiZWNobyBm aWxlLmVsICIpKSkpKQorCiAoZXJ0LWRlZnRlc3QgZW0tY21wbC10ZXN0L2ZpbGUtY29tcGxl dGlvbi9hZnRlci1saXN0ICgpCiAgICJUZXN0IGNvbXBsZXRpb24gb2YgZmlsZSBuYW1lcyBh ZnRlciBwcmV2aW91cyBsaXN0IGFyZ3VtZW50cy4KIFNlZSBidWcjNTk5NTYuIgpAQCAtMTU5 LDYgKzE5OCwyMSBAQCBlbS1jbXBsLXRlc3QvZmlsZS1jb21wbGV0aW9uL2FmdGVyLWxpc3QK ICAgICAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC1pbnNlcnQtYW5kLWNvbXBsZXRlICJlY2hv IChsaXN0IDEgMikgZmkiKQogICAgICAgICAgICAgICAgICAgICAiZWNobyAobGlzdCAxIDIp IGZpbGUudHh0ICIpKSkpKQogCisoZXJ0LWRlZnRlc3QgZW0tY21wbC10ZXN0L2NvbW1hbmQt Y29tcGxldGlvbiAoKQorICAiVGVzdCBjb21wbGV0aW9uIG9mIGNvbW1hbmQgbmFtZXMgbGlr ZSBcImNvbW1hbmRcIi4iCisgICh3aXRoLXRlbXAtZXNoZWxsCisgICAoc2hvdWxkIChlcXVh bCAoZXNoZWxsLWluc2VydC1hbmQtY29tcGxldGUgImxpc3RpZiIpCisgICAgICAgICAgICAg ICAgICAibGlzdGlmeSAiKSkpKQorCisoZXJ0LWRlZnRlc3QgZW0tY21wbC10ZXN0L3N1YmNv bW1hbmQtY29tcGxldGlvbiAoKQorICAiVGVzdCBjb21wbGV0aW9uIG9mIGNvbW1hbmQgbmFt ZXMgbGlrZSBcIntjb21tYW5kfVwiLiIKKyAgKHdpdGgtdGVtcC1lc2hlbGwKKyAgIChzaG91 bGQgKGVxdWFsIChlc2hlbGwtaW5zZXJ0LWFuZC1jb21wbGV0ZSAieyBsaXN0aWYiKQorICAg ICAgICAgICAgICAgICAgInsgbGlzdGlmeSAiKSkpCisgICh3aXRoLXRlbXAtZXNoZWxsCisg ICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLWluc2VydC1hbmQtY29tcGxldGUgImVjaG8gJHsg bGlzdGlmIikKKyAgICAgICAgICAgICAgICAgICJlY2hvICR7IGxpc3RpZnkgIikpKSkKKwog KGVydC1kZWZ0ZXN0IGVtLWNtcGwtdGVzdC9saXNwLXN5bWJvbC1jb21wbGV0aW9uICgpCiAg ICJUZXN0IGNvbXBsZXRpb24gb2YgTGlzcCBmb3JtcyBsaWtlIFwiIydzeW1ib2xcIiBhbmQg XCJgc3ltYm9sXCIuCiBTZWUgPGxpc3AvZXNoZWxsL2VzaC1jbWQuZWw+LiIKQEAgLTE3NCw3 ICsyMjgsMTAgQEAgZW0tY21wbC10ZXN0L2xpc3AtZnVuY3Rpb24tY29tcGxldGlvbgogU2Vl IDxsaXNwL2VzaGVsbC9lc2gtY21kLmVsPi4iCiAgICh3aXRoLXRlbXAtZXNoZWxsCiAgICAo c2hvdWxkIChlcXVhbCAoZXNoZWxsLWluc2VydC1hbmQtY29tcGxldGUgImVjaG8gKGVzaGVs bC9lY2giKQotICAgICAgICAgICAgICAgICAgImVjaG8gKGVzaGVsbC9lY2hvIikpKSkKKyAg ICAgICAgICAgICAgICAgICJlY2hvIChlc2hlbGwvZWNobyIpKSkKKyAgKHdpdGgtdGVtcC1l c2hlbGwKKyAgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtaW5zZXJ0LWFuZC1jb21wbGV0ZSAi ZWNobyAkKGVzaGVsbC9lY2giKQorICAgICAgICAgICAgICAgICAgImVjaG8gJChlc2hlbGwv ZWNobyIpKSkpCiAKIChlcnQtZGVmdGVzdCBlbS1jbXBsLXRlc3Qvc3BlY2lhbC1yZWYtY29t cGxldGlvbi90eXBlICgpCiAgICJUZXN0IGNvbXBsZXRpb24gb2YgdGhlIHN0YXJ0IG9mIHNw ZWNpYWwgcmVmZXJlbmNlcyBsaWtlIFwiIzxidWZmZXJcIi4KLS0gCjIuMjUuMQoK --------------R0Zdqj8iNhyQh6Tpl6FLdJDT--