From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 24 20:11:44 2022 Received: (at submit) by debbugs.gnu.org; 25 Jan 2022 01:11:45 +0000 Received: from localhost ([127.0.0.1]:46389 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCAN5-000559-S2 for submit@debbugs.gnu.org; Mon, 24 Jan 2022 20:11:44 -0500 Received: from lists.gnu.org ([209.51.188.17]:40006) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCAN1-00054z-3Y for submit@debbugs.gnu.org; Mon, 24 Jan 2022 20:11:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50548) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nCAN0-0006Oh-UT for bug-gnu-emacs@gnu.org; Mon, 24 Jan 2022 20:11:38 -0500 Received: from [2607:f8b0:4864:20::434] (port=40526 helo=mail-pf1-x434.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nCAMs-0007Kn-Fv for bug-gnu-emacs@gnu.org; Mon, 24 Jan 2022 20:11:33 -0500 Received: by mail-pf1-x434.google.com with SMTP id w190so11609574pfw.7 for ; Mon, 24 Jan 2022 17:11:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:subject:to:message-id:date:mime-version:content-language; bh=bJWClHbk3DUWrpU1unoIBeGBsfmW1GP0gQVNZkChEmw=; b=Gk2imbZ1bgEMPiQ7YWfEBasX6cQSXrVeXXwFD9d1U42E5pYeG4MjXWOHvJ/1w1QxiV GGuMsCwVE7pg40Nt8kzVlAGDUXphXZ6KFynhf2LiwkFwSsth753vAXt3nfKGRer0aQNf V4QaeNIfNh6G8oObj/ubPmqHPhkE5jUOb6qIlJ55NjhG8nJyLhtE/j8fPqBZHpjgDors WD7pdPvNSIQaM+w7giz1oiYDn9/cdL8kg8HfggmmSIYr4C2rR0gPLGDd8C4GDOy4MlDy /6ISbpGl4oCWGvKO3MtzbAdRt4adaYjJkXZnc/oeBsFG6qQrrdwn30cIeqZp638nIxRO NfXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:subject:to:message-id:date:mime-version :content-language; bh=bJWClHbk3DUWrpU1unoIBeGBsfmW1GP0gQVNZkChEmw=; b=gQAmAH3wrQs82JuFDT0JZBCjkPV7gqt9BuIKxnqAAghqGAgPSXSSKzGbFsEKF/86az bFa3QlLRtj6Mgr7TbwHCdZ2gNCCCuhkSo2brrPNZiOEUxXDOWjeSGre8y+al1hp67pv2 BO6QQTd8tCyK9bbnCb6EJTqft/XoWHWh+5k6lsBW6R1VoeuKaDpr8LespBivVR+PAgE4 gWpW0UGE+sisNJcfkcN9X1afte+GZbRhTK8yDqqgF58R4JJfAdyGDR9B+P6MMxzpmMr6 ZS7hqqwtvTOvpf9B/pqCB64FY8A170cIdaoCvZRfwKo6KhSWV3hGmFxWq0osXBWEZ5GR 2vLw== X-Gm-Message-State: AOAM5324sS/hvuNujP3DKmHTGY0Ng3KBb+BlYrsVJgLkBX+zyvWVdrnS RptKrpBv28r4DwsU1Z6sD4dfd+32ixLk8A== X-Google-Smtp-Source: ABdhPJyTb61i+uMdDC5I+I5Z9lpRqlMcl5SX0zRNFASmSzoGjYRRcO99iSEWdLo37S5SVcGW9rxpFw== X-Received: by 2002:a63:10d:: with SMTP id 13mr13397710pgb.559.1643073088724; Mon, 24 Jan 2022 17:11:28 -0800 (PST) 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 x17sm15997636pfu.135.2022.01.24.17.11.27 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Jan 2022 17:11:27 -0800 (PST) From: Jim Porter Subject: 29.0.50; [PATCH] `eshell-eval-using-options' :preserve-args breaks :external handling in some cases X-Mozilla-News-Host: news://news.gmane.org To: bug-gnu-emacs@gnu.org Message-ID: <31760ab2-2f47-dacd-0a9f-6a0bddced866@gmail.com> Date: Mon, 24 Jan 2022 17:11:27 -0800 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------D311FDC71EF8723005F77684" Content-Language: en-US X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::434 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=jporterbugs@gmail.com; helo=mail-pf1-x434.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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. --------------D311FDC71EF8723005F77684 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit To see this in action: $ touch foo $ emacs -Q M-x eshell cp foo bar -s ls -l bar `bar' should be a symlink pointing to `foo', but it's just a regular file. This happens because, when :preserve-args is true, `eshell-eval-using-options' doesn't flatten and stringify the args to be parsed. That results in the various helper functions modifying the list of raw args in-place. When :external is set, if `eshell--process-option' finds an option it doesn't recognize, it throws, telling `eshell--do-opts' to run the external command instead. That requires having the original args, un-tampered with, in order to forward on to the external command. Attached is a patch that fixes this by copying the raw args list for the :preserve-args case before manipulating it. I considered only adding this when :external is also set, but I think it's useful for callers to be able to inspect the raw args afterwards. This is used by `eshell/su' to check for the presence of a "-" argument, since `eshell-eval-using-options' doesn't handle that. (It might be nice to fix that too, but I think it's still useful to keep the original raw args around unchanged. Improving "-" support could be done later.) As part of this, I also added several unit tests for `eshell/su' and `eshell/sudo' to make sure I didn't break anything there; these should pass both before and after the rest of the patch. I also added tests to make sure the original arguments are preserved for calling the external command; these should fail before the patch, and pass after. There's just one remaining issue that I'm not sure how to fix: since I updated the `eshell-eval-using-options' macro, any file that uses it needs to be recompiled to get the new version. What's the right way to tell the build system about this? I just ran `touch lisp/eshell/*.el' locally, but I'm sure there's a better way so that people can just run `make' after pulling this patch. --------------D311FDC71EF8723005F77684 Content-Type: text/plain; charset=UTF-8; name="0001-Don-t-manipulate-args-in-place-for-eshell-eval-using.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Don-t-manipulate-args-in-place-for-eshell-eval-using.pa"; filename*1="tch" RnJvbSBlZjI3NTk2ZmM2MzM1N2QzNzI0OGIxNTU3NWM2NGFmNTU1Zjc1YTk3IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IE1vbiwgMjQgSmFuIDIwMjIgMTU6NDY6MDEgLTA4MDAKU3ViamVjdDogW1BB VENIXSBEb24ndCBtYW5pcHVsYXRlIGFyZ3MgaW4tcGxhY2UgZm9yCiAnZXNoZWxsLWV2YWwt dXNpbmctb3B0aW9ucycKClRoaXMgaXMgbmVjZXNzYXJ5IGZvciBwcmVzZXJ2ZSB0aGUgb3Jp Z2luYWwgYXJndW1lbnRzIHRvIGZvcndhcmQgb24gdG8KOmV4dGVybmFsIGNvbW1hbmRzLiAg UHJldmlvdXNseSwgd2hlbiA6cHJlc2VydmUtYXJncyB3YXMgYWxzbyBzZXQsIHRoZQpvcmln aW5hbCBhcmd1bWVudCBsaXN0IGNvdWxkIGJlIGFsdGVyZWQsIGNoYW5naW5nIHRoZSBtZWFu aW5nIG9mIHRoZQpjb21tYW5kLgoKKiBsaXNwL2VzaGVsbC9lc2gtb3B0LmVsIChlc2hlbGwt ZXZhbC11c2luZy1vcHRpb25zKTogQ29weSBNQUNSTy1BUkdTCndoZW4gOnByZXNlcnZlLWFy Z3MgaXMgc2V0LCBhbmQgcGFzcyB0aGUgb3JpZ2luYWwgdmFsdWUgdG8KJ2VzaGVsbC0tZG8t b3B0cycuCihlc2hlbGwtLWRvLW9wdHMpOiBVc2UgdGhlIG9yaWdpbmFsIGFyZ3VtZW50cyB3 aGVuIGNhbGxpbmcgYW4gZXh0ZXJuYWwKY29tbWFuZC4KCiogbGlzcC9lc2hlbGwvZW0tdHJh bXAuZWwgKGVzaGVsbC9zdSwgZXNoZWxsL3N1ZG8pOiBEb24ndCBjb3B5IHRoZQpvcmlnaW5h bCBhcmd1bWVudHMsIHNpbmNlICdlc2hlbGwtZXZhbC11c2luZy1vcHRpb25zJyBkb2VzIHRo aXMgZm9yCnVzLgoKKiB0ZXN0L2xpc3AvZXNoZWxsL2VzaC1vcHQtdGVzdHMuZWwgKGVzaC1v cHQtcHJvY2Vzcy1hcmdzLXRlc3QpOgpTcGxpdCB0aGlzIHRlc3QgaW50by4uLgooZXNoLW9w dC10ZXN0L3Byb2Nlc3MtYXJncykKKGVzaC1vcHQtdGVzdC9wcm9jZXNzLWFyZ3MtcGFyc2Ut bGVhZGluZy1vcHRpb25zLW9ubHkpCihlc2gtb3B0LXRlc3QvcHJvY2Vzcy1hcmdzLWV4dGVy bmFsKTogLi4uIHRoZXNlLgoodGVzdC1lc2hlbGwtZXZhbC11c2luZy1vcHRpb25zKTogU3Bs aXQgdGhpcyB0ZXN0IGludG8uLi4KKGVzaC1vcHQtdGVzdC9ldmFsLXVzaW5nLW9wdGlvbnMt c2hvcnQpCihlc2gtb3B0LXRlc3QvZXZhbC11c2luZy1vcHRpb25zLWxvbmcpCihlc2gtb3B0 LXRlc3QvZXZhbC11c2luZy1vcHRpb25zLWNvbnN0YW50KQooZXNoLW9wdC10ZXN0L2V2YWwt dXNpbmctb3B0aW9ucy11c2VyLXNwZWNpZmllZCkKKGVzaC1vcHQtdGVzdC9ldmFsLXVzaW5n LW9wdGlvbnMtc2hvcnQtc2luZ2xlLXRva2VuKQooZXNoLW9wdC10ZXN0L2V2YWwtdXNpbmct b3B0aW9ucy10ZXJtaW5hdGUtb3B0aW9ucykKKGVzaC1vcHQtdGVzdC9ldmFsLXVzaW5nLW9w dGlvbnMtcGFyc2UtbGVhZGluZy1vcHRpb25zLW9ubHkpCihlc2gtb3B0LXRlc3QvZXZhbC11 c2luZy1vcHRpb25zLXVucmVjb2duaXplZCk6IC4uLiB0aGVzZS4KKGVzaC1vcHQtdGVzdC9l dmFsLXVzaW5nLW9wdGlvbnMtZXh0ZXJuYWwpOiBOZXcgdGVzdC4KCiogdGVzdC9saXNwL2Vz aGVsbC9lbS10cmFtcC10ZXN0cy5lbDogTmV3IHRlc3RzLgotLS0KIGxpc3AvZXNoZWxsL2Vt LXRyYW1wLmVsICAgICAgICAgICAgfCAxMjUgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0t LS0KIGxpc3AvZXNoZWxsL2VzaC1vcHQuZWwgICAgICAgICAgICAgfCAgIDggKy0KIHRlc3Qv bGlzcC9lc2hlbGwvZW0tdHJhbXAtdGVzdHMuZWwgfCAgODUgKysrKysrKysrKysrKysrKysr KysKIHRlc3QvbGlzcC9lc2hlbGwvZXNoLW9wdC10ZXN0cy5lbCAgfCAgODkgKysrKysrKysr KysrKy0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMjA4IGluc2VydGlvbnMoKyksIDk5IGRl bGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IHRlc3QvbGlzcC9lc2hlbGwvZW0tdHJh bXAtdGVzdHMuZWwKCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lbS10cmFtcC5lbCBiL2xp c3AvZXNoZWxsL2VtLXRyYW1wLmVsCmluZGV4IGU5MDE4YmRiOTMuLjc5MTQ1ODgyMmQgMTAw NjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VtLXRyYW1wLmVsCisrKyBiL2xpc3AvZXNoZWxsL2Vt LXRyYW1wLmVsCkBAIC01Nyw0MSArNTcsNDIgQEAgZXNoZWxsLXRyYW1wLWluaXRpYWxpemUK IAogKGF1dG9sb2FkICdlc2hlbGwtcGFyc2UtY29tbWFuZCAiZXNoLWNtZCIpCiAKLShkZWZ1 biBlc2hlbGwvc3UgKCZyZXN0IGFyZ3MpCisoZGVmdW4gZXNoZWxsL3N1ICgmcmVzdCBhcmd1 bWVudHMpCiAgICJBbGlhcyBcInN1XCIgdG8gY2FsbCBUUkFNUC4KIAogVXNlcyB0aGUgc3lz dGVtIHN1IHRocm91Z2ggVFJBTVAncyBzdSBtZXRob2QuIgotICAoc2V0cSBhcmdzIChlc2hl bGwtc3RyaW5naWZ5LWxpc3QgKGZsYXR0ZW4tdHJlZSBhcmdzKSkpCi0gIChsZXQgKChvcmln LWFyZ3MgKGNvcHktdHJlZSBhcmdzKSkpCi0gICAgKGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlv bnMKLSAgICAgInN1IiBhcmdzCi0gICAgICcoKD9oICJoZWxwIiBuaWwgbmlsICJzaG93IHRo aXMgdXNhZ2Ugc2NyZWVuIikKLSAgICAgICAoP2wgImxvZ2luIiBuaWwgbG9naW4gInByb3Zp ZGUgYSBsb2dpbiBlbnZpcm9ubWVudCIpCi0gICAgICAgKD8gIG5pbCBuaWwgbG9naW4gInBy b3ZpZGUgYSBsb2dpbiBlbnZpcm9ubWVudCIpCi0gICAgICAgOnVzYWdlICJbLSB8IC1sIHwg LS1sb2dpbl0gW1VTRVJdCisgIChzZXRxIGFyZ3VtZW50cyAoZXNoZWxsLXN0cmluZ2lmeS1s aXN0IChmbGF0dGVuLXRyZWUgYXJndW1lbnRzKSkpCisgIChlc2hlbGwtZXZhbC11c2luZy1v cHRpb25zCisgICAic3UiIGFyZ3VtZW50cworICAgJygoP2ggImhlbHAiIG5pbCBuaWwgInNo b3cgdGhpcyB1c2FnZSBzY3JlZW4iKQorICAgICAoP2wgImxvZ2luIiBuaWwgbG9naW4gInBy b3ZpZGUgYSBsb2dpbiBlbnZpcm9ubWVudCIpCisgICAgICg/ICBuaWwgbmlsIGxvZ2luICJw cm92aWRlIGEgbG9naW4gZW52aXJvbm1lbnQiKQorICAgICA6dXNhZ2UgIlstIHwgLWwgfCAt LWxvZ2luXSBbVVNFUl0KIEJlY29tZSBhbm90aGVyIFVTRVIgZHVyaW5nIGEgbG9naW4gc2Vz c2lvbi4iKQotICAgICAodGhyb3cgJ2VzaGVsbC1yZXBsYWNlLWNvbW1hbmQKLQkgICAgKGxl dCAoKHVzZXIgInJvb3QiKQotCQkgIChob3N0IChvciAoZmlsZS1yZW1vdGUtcCBkZWZhdWx0 LWRpcmVjdG9yeSAnaG9zdCkKLQkJCSAgICAibG9jYWxob3N0IikpCi0JCSAgKGRpciAoZmls ZS1sb2NhbC1uYW1lIChleHBhbmQtZmlsZS1uYW1lIGRlZmF1bHQtZGlyZWN0b3J5KSkpCi0J CSAgKHByZWZpeCAoZmlsZS1yZW1vdGUtcCBkZWZhdWx0LWRpcmVjdG9yeSkpKQotCSAgICAg IChkb2xpc3QgKGFyZyBhcmdzKQotCQkoaWYgKHN0cmluZy1lcXVhbCBhcmcgIi0iKSAoc2V0 cSBsb2dpbiB0KSAoc2V0cSB1c2VyIGFyZykpKQotCSAgICAgIDs7IGBlc2hlbGwtZXZhbC11 c2luZy1vcHRpb25zJyBkb2VzIG5vdCBoYW5kbGUgIi0iLgotCSAgICAgIChpZiAobWVtYmVy ICItIiBvcmlnLWFyZ3MpIChzZXRxIGxvZ2luIHQpKQotCSAgICAgIChpZiBsb2dpbiAoc2V0 cSBkaXIgIn4vIikpCi0JICAgICAgKGlmIChhbmQgcHJlZml4Ci0JCSAgICAgICAob3IKLQkJ CShub3QgKHN0cmluZy1lcXVhbAotCQkJICAgICAgInN1IiAoZmlsZS1yZW1vdGUtcCBkZWZh dWx0LWRpcmVjdG9yeSAnbWV0aG9kKSkpCi0JCQkobm90IChzdHJpbmctZXF1YWwKLQkJCSAg ICAgIHVzZXIgKGZpbGUtcmVtb3RlLXAgZGVmYXVsdC1kaXJlY3RvcnkgJ3VzZXIpKSkpKQot CQkgIChlc2hlbGwtcGFyc2UtY29tbWFuZAotCQkgICAiY2QiIChsaXN0IChmb3JtYXQgIiVz fHN1OiVzQCVzOiVzIgotCQkJCSAgICAgIChzdWJzdHJpbmcgcHJlZml4IDAgLTEpIHVzZXIg aG9zdCBkaXIpKSkKLQkJKGVzaGVsbC1wYXJzZS1jb21tYW5kCi0JCSAiY2QiIChsaXN0IChm b3JtYXQgIi9zdTolc0AlczolcyIgdXNlciBob3N0IGRpcikpKSkpKSkpKQorICAgKHRocm93 ICdlc2hlbGwtcmVwbGFjZS1jb21tYW5kCisgICAgICAgICAgKGxldCAoKHVzZXIgInJvb3Qi KQorICAgICAgICAgICAgICAgIChob3N0IChvciAoZmlsZS1yZW1vdGUtcCBkZWZhdWx0LWRp cmVjdG9yeSAnaG9zdCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgImxvY2FsaG9zdCIp KQorICAgICAgICAgICAgICAgIChkaXIgKGZpbGUtbG9jYWwtbmFtZSAoZXhwYW5kLWZpbGUt bmFtZSBkZWZhdWx0LWRpcmVjdG9yeSkpKQorICAgICAgICAgICAgICAgIChwcmVmaXggKGZp bGUtcmVtb3RlLXAgZGVmYXVsdC1kaXJlY3RvcnkpKSkKKyAgICAgICAgICAgIChkb2xpc3Qg KGFyZyBhcmdzKQorICAgICAgICAgICAgICAoaWYgKHN0cmluZy1lcXVhbCBhcmcgIi0iKSAo c2V0cSBsb2dpbiB0KSAoc2V0cSB1c2VyIGFyZykpKQorICAgICAgICAgICAgOzsgYGVzaGVs bC1ldmFsLXVzaW5nLW9wdGlvbnMnIHRyaWVzIHRvIGhhbmRsZSAiLSIgYXMgYQorICAgICAg ICAgICAgOzsgc2hvcnQgb3B0aW9uOyBkb3VibGUtY2hlY2sgd2hldGhlciB0aGUgb3JpZ2lu YWwKKyAgICAgICAgICAgIDs7IGFyZ3VtZW50cyBpbmNsdWRlIGl0LgorICAgICAgICAgICAg KHdoZW4gKG1lbWJlciAiLSIgYXJndW1lbnRzKSAoc2V0cSBsb2dpbiB0KSkKKyAgICAgICAg ICAgICh3aGVuIGxvZ2luIChzZXRxIGRpciAifi8iKSkKKyAgICAgICAgICAgIChpZiAoYW5k IHByZWZpeAorICAgICAgICAgICAgICAgICAgICAgKG9yCisgICAgICAgICAgICAgICAgICAg ICAgKG5vdCAoc3RyaW5nLWVxdWFsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgInN1 IiAoZmlsZS1yZW1vdGUtcCBkZWZhdWx0LWRpcmVjdG9yeSAnbWV0aG9kKSkpCisgICAgICAg ICAgICAgICAgICAgICAgKG5vdCAoc3RyaW5nLWVxdWFsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgdXNlciAoZmlsZS1yZW1vdGUtcCBkZWZhdWx0LWRpcmVjdG9yeSAndXNlcikp KSkpCisgICAgICAgICAgICAgICAgKGVzaGVsbC1wYXJzZS1jb21tYW5kCisgICAgICAgICAg ICAgICAgICJjZCIgKGxpc3QgKGZvcm1hdCAiJXN8c3U6JXNAJXM6JXMiCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAoc3Vic3RyaW5nIHByZWZpeCAwIC0xKSB1c2Vy IGhvc3QgZGlyKSkpCisgICAgICAgICAgICAgIChlc2hlbGwtcGFyc2UtY29tbWFuZAorICAg ICAgICAgICAgICAgImNkIiAobGlzdCAoZm9ybWF0ICIvc3U6JXNAJXM6JXMiIHVzZXIgaG9z dCBkaXIpKSkpKSkpKQogCiAocHV0ICdlc2hlbGwvc3UgJ2VzaGVsbC1uby1udW1lcmljLWNv bnZlcnNpb25zIHQpCiAKQEAgLTk5LDQxICsxMDAsMzUgQEAgZXNoZWxsL3N1ZG8KICAgIkFs aWFzIFwic3Vkb1wiIHRvIGNhbGwgVHJhbXAuCiAKIFVzZXMgdGhlIHN5c3RlbSBzdWRvIHRo cm91Z2ggVFJBTVAncyBzdWRvIG1ldGhvZC4iCi0gIChzZXRxIGFyZ3MgKGVzaGVsbC1zdHJp bmdpZnktbGlzdCAoZmxhdHRlbi10cmVlIGFyZ3MpKSkKLSAgKGxldCAoKG9yaWctYXJncyAo Y29weS10cmVlIGFyZ3MpKSkKLSAgICAoZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9ucwotICAg ICAic3VkbyIgYXJncwotICAgICAnKCg/aCAiaGVscCIgbmlsIG5pbCAic2hvdyB0aGlzIHVz YWdlIHNjcmVlbiIpCi0gICAgICAgKD91ICJ1c2VyIiB0IHVzZXIgImV4ZWN1dGUgYSBjb21t YW5kIGFzIGFub3RoZXIgVVNFUiIpCi0gICAgICAgOnNob3ctdXNhZ2UKLSAgICAgICA6cGFy c2UtbGVhZGluZy1vcHRpb25zLW9ubHkKLSAgICAgICA6dXNhZ2UgIlsoLXUgfCAtLXVzZXIp IFVTRVJdIENPTU1BTkQKKyAgKGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMKKyAgICJzdWRv IiBhcmdzCisgICAnKCg/aCAiaGVscCIgbmlsIG5pbCAic2hvdyB0aGlzIHVzYWdlIHNjcmVl biIpCisgICAgICg/dSAidXNlciIgdCB1c2VyICJleGVjdXRlIGEgY29tbWFuZCBhcyBhbm90 aGVyIFVTRVIiKQorICAgICA6c2hvdy11c2FnZQorICAgICA6cGFyc2UtbGVhZGluZy1vcHRp b25zLW9ubHkKKyAgICAgOnVzYWdlICJbKC11IHwgLS11c2VyKSBVU0VSXSBDT01NQU5ECiBF eGVjdXRlIGEgQ09NTUFORCBhcyB0aGUgc3VwZXJ1c2VyIG9yIGFub3RoZXIgVVNFUi4iKQot ICAgICAodGhyb3cgJ2VzaGVsbC1leHRlcm5hbAotCSAgICAobGV0ICgodXNlciAob3IgdXNl ciAicm9vdCIpKQotCQkgIChob3N0IChvciAoZmlsZS1yZW1vdGUtcCBkZWZhdWx0LWRpcmVj dG9yeSAnaG9zdCkKLQkJCSAgICAibG9jYWxob3N0IikpCi0JCSAgKGRpciAoZmlsZS1sb2Nh bC1uYW1lIChleHBhbmQtZmlsZS1uYW1lIGRlZmF1bHQtZGlyZWN0b3J5KSkpCi0JCSAgKHBy ZWZpeCAoZmlsZS1yZW1vdGUtcCBkZWZhdWx0LWRpcmVjdG9yeSkpKQotCSAgICAgIDs7IGBl c2hlbGwtZXZhbC11c2luZy1vcHRpb25zJyByZWFkcyBvcHRpb25zIG9mIENPTU1BTkQuCi0J ICAgICAgKHdoaWxlIChhbmQgKHN0cmluZ3AgKGNhciBvcmlnLWFyZ3MpKQotCQkJICAobWVt YmVyIChjYXIgb3JpZy1hcmdzKSAnKCItdSIgIi0tdXNlciIpKSkKLQkJKHNldHEgb3JpZy1h cmdzIChjZGRyIG9yaWctYXJncykpKQotCSAgICAgIChsZXQgKChkZWZhdWx0LWRpcmVjdG9y eQotCQkgICAgICAoaWYgKGFuZCBwcmVmaXgKLQkJCSAgICAgICAob3IKLQkJCQkobm90Ci0J CQkJIChzdHJpbmctZXF1YWwKLQkJCQkgICJzdWRvIgotCQkJCSAgKGZpbGUtcmVtb3RlLXAg ZGVmYXVsdC1kaXJlY3RvcnkgJ21ldGhvZCkpKQotCQkJCShub3QKLQkJCQkgKHN0cmluZy1l cXVhbAotCQkJCSAgdXNlcgotCQkJCSAgKGZpbGUtcmVtb3RlLXAgZGVmYXVsdC1kaXJlY3Rv cnkgJ3VzZXIpKSkpKQotCQkJICAoZm9ybWF0ICIlc3xzdWRvOiVzQCVzOiVzIgotCQkJCSAg KHN1YnN0cmluZyBwcmVmaXggMCAtMSkgdXNlciBob3N0IGRpcikKLQkJCShmb3JtYXQgIi9z dWRvOiVzQCVzOiVzIiB1c2VyIGhvc3QgZGlyKSkpKQotCQkoZXNoZWxsLW5hbWVkLWNvbW1h bmQgKGNhciBvcmlnLWFyZ3MpIChjZHIgb3JpZy1hcmdzKSkpKSkpKSkKKyAgICh0aHJvdyAn ZXNoZWxsLWV4dGVybmFsCisgICAgICAgICAgKGxldCogKCh1c2VyIChvciB1c2VyICJyb290 IikpCisgICAgICAgICAgICAgICAgIChob3N0IChvciAoZmlsZS1yZW1vdGUtcCBkZWZhdWx0 LWRpcmVjdG9yeSAnaG9zdCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICJsb2NhbGhv c3QiKSkKKyAgICAgICAgICAgICAgICAgKGRpciAoZmlsZS1sb2NhbC1uYW1lIChleHBhbmQt ZmlsZS1uYW1lIGRlZmF1bHQtZGlyZWN0b3J5KSkpCisgICAgICAgICAgICAgICAgIChwcmVm aXggKGZpbGUtcmVtb3RlLXAgZGVmYXVsdC1kaXJlY3RvcnkpKQorICAgICAgICAgICAgICAg ICAoZGVmYXVsdC1kaXJlY3RvcnkKKyAgICAgICAgICAgICAgICAgICAoaWYgKGFuZCBwcmVm aXgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAob3IKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKG5vdAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0cmlu Zy1lcXVhbAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJzdWRvIgorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIChmaWxlLXJlbW90ZS1wIGRlZmF1bHQtZGlyZWN0 b3J5ICdtZXRob2QpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG5vdAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1lcXVhbAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHVzZXIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAoZmlsZS1yZW1vdGUtcCBkZWZhdWx0LWRpcmVjdG9yeSAndXNlcikpKSkpCisgICAgICAg ICAgICAgICAgICAgICAgIChmb3JtYXQgIiVzfHN1ZG86JXNAJXM6JXMiCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKHN1YnN0cmluZyBwcmVmaXggMCAtMSkgdXNlciBob3N0 IGRpcikKKyAgICAgICAgICAgICAgICAgICAgIChmb3JtYXQgIi9zdWRvOiVzQCVzOiVzIiB1 c2VyIGhvc3QgZGlyKSkpKQorICAgICAgICAgICAgKGVzaGVsbC1uYW1lZC1jb21tYW5kIChj YXIgYXJncykgKGNkciBhcmdzKSkpKSkpCiAKIChwdXQgJ2VzaGVsbC9zdWRvICdlc2hlbGwt bm8tbnVtZXJpYy1jb252ZXJzaW9ucyB0KQogCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9l c2gtb3B0LmVsIGIvbGlzcC9lc2hlbGwvZXNoLW9wdC5lbAppbmRleCBjODAyYmVlM2FmLi44 YzI5ZmZmODA5IDEwMDY0NAotLS0gYS9saXNwL2VzaGVsbC9lc2gtb3B0LmVsCisrKyBiL2xp c3AvZXNoZWxsL2VzaC1vcHQuZWwKQEAgLTk3LDEwICs5NywxMCBAQCBlc2hlbGwtZXZhbC11 c2luZy1vcHRpb25zCiAgIChkZWNsYXJlIChkZWJ1ZyAoZm9ybSBmb3JtIHNleHAgYm9keSkp KQogICBgKGxldCogKCh0ZW1wLWFyZ3MKICAgICAgICAgICAgLChpZiAobWVtcSAnOnByZXNl cnZlLWFyZ3MgKGNhZHIgb3B0aW9ucykpCi0gICAgICAgICAgICAgICAgbWFjcm8tYXJncwor ICAgICAgICAgICAgICAgIChsaXN0ICdjb3B5LXRyZWUgbWFjcm8tYXJncykKICAgICAgICAg ICAgICAgKGxpc3QgJ2VzaGVsbC1zdHJpbmdpZnktbGlzdAogICAgICAgICAgICAgICAgICAg ICAobGlzdCAnZmxhdHRlbi10cmVlIG1hY3JvLWFyZ3MpKSkpCi0gICAgICAgICAgKHByb2Nl c3NlZC1hcmdzIChlc2hlbGwtLWRvLW9wdHMgLG5hbWUgLG9wdGlvbnMgdGVtcC1hcmdzKSkK KyAgICAgICAgICAocHJvY2Vzc2VkLWFyZ3MgKGVzaGVsbC0tZG8tb3B0cyAsbmFtZSAsb3B0 aW9ucyB0ZW1wLWFyZ3MgLG1hY3JvLWFyZ3MpKQogICAgICAgICAgICxAKGRlbGV0ZS1kdXBz CiAgICAgICAgICAgICAgKGRlbHEgbmlsIChtYXBjYXIgKGxhbWJkYSAob3B0KQogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgKGFuZCAobGlzdHAgb3B0KSAobnRoIDMgb3B0 KQpAQCAtMTE3LDcgKzExNyw3IEBAIGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMKIDs7IERv Y3VtZW50ZWQgcGFydCBvZiB0aGUgaW50ZXJmYWNlOyBzZWUgZXNoZWxsLWV2YWwtdXNpbmct b3B0aW9ucy4KIChkZWZ2YXIgZXNoZWxsLS1hcmdzKQogCi0oZGVmdW4gZXNoZWxsLS1kby1v cHRzIChuYW1lIG9wdGlvbnMgYXJncykKKyhkZWZ1biBlc2hlbGwtLWRvLW9wdHMgKG5hbWUg b3B0aW9ucyBhcmdzIG9yaWctYXJncykKICAgIkhlbHBlciBmdW5jdGlvbiBmb3IgYGVzaGVs bC1ldmFsLXVzaW5nLW9wdGlvbnMnLgogVGhpcyBjb2RlIGRvZXNuJ3QgcmVhbGx5IG5lZWQg dG8gYmUgbWFjcm8gZXhwYW5kZWQgZXZlcnl3aGVyZS4iCiAgIChyZXF1aXJlICdlc2gtZXh0 KQpAQCAtMTM1LDcgKzEzNSw3IEBAIGVzaGVsbC0tZG8tb3B0cwogICAgICAgICAgICAgICAg KGVycm9yICIlcyIgdXNhZ2UtbXNnKSkpKSkpCiAgICAgKGlmIGV4dC1jb21tYW5kCiAgICAg ICAgICh0aHJvdyAnZXNoZWxsLWV4dGVybmFsCi0gICAgICAgICAgICAgICAoZXNoZWxsLWV4 dGVybmFsLWNvbW1hbmQgZXh0LWNvbW1hbmQgYXJncykpCisgICAgICAgICAgICAgICAoZXNo ZWxsLWV4dGVybmFsLWNvbW1hbmQgZXh0LWNvbW1hbmQgb3JpZy1hcmdzKSkKICAgICAgIGFy Z3MpKSkKIAogKGRlZnVuIGVzaGVsbC1zaG93LXVzYWdlIChuYW1lIG9wdGlvbnMpCmRpZmYg LS1naXQgYS90ZXN0L2xpc3AvZXNoZWxsL2VtLXRyYW1wLXRlc3RzLmVsIGIvdGVzdC9saXNw L2VzaGVsbC9lbS10cmFtcC10ZXN0cy5lbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwLi43ZjA1NGRhNTE0Ci0tLSAvZGV2L251bGwKKysrIGIvdGVzdC9saXNwL2Vz aGVsbC9lbS10cmFtcC10ZXN0cy5lbApAQCAtMCwwICsxLDg1IEBACis7OzsgZW0tdHJhbXAt dGVzdHMuZWwgLS0tIGVtLXRyYW1wIHRlc3Qgc3VpdGUgIC0qLSBsZXhpY2FsLWJpbmRpbmc6 dCAtKi0KKworOzsgQ29weXJpZ2h0IChDKSAyMDIyIEZyZWUgU29mdHdhcmUgRm91bmRhdGlv biwgSW5jLgorCis7OyBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgRW1hY3MuCisKKzs7IEdO VSBFbWFjcyBpcyBmcmVlIHNvZnR3YXJlOiB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQv b3IgbW9kaWZ5Cis7OyBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1 YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQorOzsgdGhlIEZyZWUgU29mdHdhcmUgRm91 bmRhdGlvbiwgZWl0aGVyIHZlcnNpb24gMyBvZiB0aGUgTGljZW5zZSwgb3IKKzs7IChhdCB5 b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisKKzs7IEdOVSBFbWFjcyBpcyBkaXN0 cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorOzsgYnV0IFdJ VEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkg b2YKKzs7IE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVS UE9TRS4gIFNlZSB0aGUKKzs7IEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3Jl IGRldGFpbHMuCisKKzs7IFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhl IEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCis7OyBhbG9uZyB3aXRoIEdOVSBFbWFjcy4g IElmIG5vdCwgc2VlIDxodHRwczovL3d3dy5nbnUub3JnL2xpY2Vuc2VzLz4uCisKKzs7OyBD b2RlOgorCisocmVxdWlyZSAnZXJ0KQorKHJlcXVpcmUgJ2VtLXRyYW1wKQorCisoZXJ0LWRl ZnRlc3QgZW0tdHJhbXAtdGVzdC9zdS1kZWZhdWx0ICgpCisgICJUZXN0IEVzaGVsbCBgc3Un IGNvbW1hbmQgd2l0aCBubyBhcmd1bWVudHMuIgorICAoc2hvdWxkIChlcXVhbAorICAgICAg ICAgICAoY2F0Y2ggJ2VzaGVsbC1yZXBsYWNlLWNvbW1hbmQgKGVzaGVsbC9zdSkpCisgICAg ICAgICAgIGAoZXNoZWxsLXRyYXAtZXJyb3JzCisgICAgICAgICAgICAgKGVzaGVsbC1uYW1l ZC1jb21tYW5kCisgICAgICAgICAgICAgICJjZCIKKyAgICAgICAgICAgICAgKGxpc3QgLChm b3JtYXQgIi9zdTpyb290QGxvY2FsaG9zdDolcyIgZGVmYXVsdC1kaXJlY3RvcnkpKSkpKSkp CisKKyhlcnQtZGVmdGVzdCBlbS10cmFtcC10ZXN0L3N1LXVzZXIgKCkKKyAgIlRlc3QgRXNo ZWxsIGBzdScgY29tbWFuZCB3aXRoIFVTRVIgYXJndW1lbnQuIgorICAoc2hvdWxkIChlcXVh bAorICAgICAgICAgICAoY2F0Y2ggJ2VzaGVsbC1yZXBsYWNlLWNvbW1hbmQgKGVzaGVsbC9z dSAiVVNFUiIpKQorICAgICAgICAgICBgKGVzaGVsbC10cmFwLWVycm9ycworICAgICAgICAg ICAgIChlc2hlbGwtbmFtZWQtY29tbWFuZAorICAgICAgICAgICAgICAiY2QiCisgICAgICAg ICAgICAgIChsaXN0ICwoZm9ybWF0ICIvc3U6VVNFUkBsb2NhbGhvc3Q6JXMiIGRlZmF1bHQt ZGlyZWN0b3J5KSkpKSkpKQorCisoZXJ0LWRlZnRlc3QgZW0tdHJhbXAtdGVzdC9zdS1sb2dp biAoKQorICAiVGVzdCBFc2hlbGwgYHN1JyBjb21tYW5kIHdpdGggLS8tbC8tLWxvZ2luIG9w dGlvbi4iCisgIChkb2xpc3QgKGFyZ3MgJygoIi0tbG9naW4iKQorICAgICAgICAgICAgICAg ICAgKCItbCIpCisgICAgICAgICAgICAgICAgICAoIi0iKSkpCisgICAgKHNob3VsZCAoZXF1 YWwKKyAgICAgICAgICAgICAoY2F0Y2ggJ2VzaGVsbC1yZXBsYWNlLWNvbW1hbmQgKGFwcGx5 ICMnZXNoZWxsL3N1IGFyZ3MpKQorICAgICAgICAgICAgIGAoZXNoZWxsLXRyYXAtZXJyb3Jz CisgICAgICAgICAgICAgICAoZXNoZWxsLW5hbWVkLWNvbW1hbmQKKyAgICAgICAgICAgICAg ICAiY2QiCisgICAgICAgICAgICAgICAgKGxpc3QgIi9zdTpyb290QGxvY2FsaG9zdDp+LyIp KSkpKSkpCisKKyhkZWZ1biBtb2NrLWVzaGVsbC1uYW1lZC1jb21tYW5kICgmcmVzdCBhcmdz KQorICAiRHVtbXkgZnVuY3Rpb24gdG8gdGVzdCBFc2hlbGwgYHN1ZG8nIGNvbW1hbmQgcmV3 cml0aW5nLiIKKyAgKGxpc3QgZGVmYXVsdC1kaXJlY3RvcnkgYXJncykpCisKKyhlcnQtZGVm dGVzdCBlbS10cmFtcC10ZXN0L3N1ZG8tYmFzaWMgKCkKKyAgIlRlc3QgRXNoZWxsIGBzdWRv JyBjb21tYW5kIHdpdGggZGVmYXVsdCB1c2VyLiIKKyAgKGNsLWxldGYgKCgoc3ltYm9sLWZ1 bmN0aW9uICdlc2hlbGwtbmFtZWQtY29tbWFuZCkKKyAgICAgICAgICAgICAjJ21vY2stZXNo ZWxsLW5hbWVkLWNvbW1hbmQpKQorICAgIChzaG91bGQgKGVxdWFsCisgICAgICAgICAgICAg KGNhdGNoICdlc2hlbGwtZXh0ZXJuYWwgKGVzaGVsbC9zdWRvICJlY2hvIiAiaGkiKSkKKyAg ICAgICAgICAgICBgKCwoZm9ybWF0ICIvc3Vkbzpyb290QGxvY2FsaG9zdDolcyIgZGVmYXVs dC1kaXJlY3RvcnkpCisgICAgICAgICAgICAgICAoImVjaG8iICgiaGkiKSkpKSkKKyAgICAo c2hvdWxkIChlcXVhbAorICAgICAgICAgICAgIChjYXRjaCAnZXNoZWxsLWV4dGVybmFsIChl c2hlbGwvc3VkbyAiZWNobyIgIi11IiAiaGkiKSkKKyAgICAgICAgICAgICBgKCwoZm9ybWF0 ICIvc3Vkbzpyb290QGxvY2FsaG9zdDolcyIgZGVmYXVsdC1kaXJlY3RvcnkpCisgICAgICAg ICAgICAgICAoImVjaG8iICgiLXUiICJoaSIpKSkpKSkpCisKKyhlcnQtZGVmdGVzdCBlbS10 cmFtcC10ZXN0L3N1ZG8tdXNlciAoKQorICAiVGVzdCBFc2hlbGwgYHN1ZG8nIGNvbW1hbmQg d2l0aCBzcGVjaWZpZWQgdXNlci4iCisgIChjbC1sZXRmICgoKHN5bWJvbC1mdW5jdGlvbiAn ZXNoZWxsLW5hbWVkLWNvbW1hbmQpCisgICAgICAgICAgICAgIydtb2NrLWVzaGVsbC1uYW1l ZC1jb21tYW5kKSkKKyAgICAoc2hvdWxkIChlcXVhbAorICAgICAgICAgICAgIChjYXRjaCAn ZXNoZWxsLWV4dGVybmFsIChlc2hlbGwvc3VkbyAiLXUiICJVU0VSIiAiZWNobyIgImhpIikp CisgICAgICAgICAgICAgYCgsKGZvcm1hdCAiL3N1ZG86VVNFUkBsb2NhbGhvc3Q6JXMiIGRl ZmF1bHQtZGlyZWN0b3J5KQorICAgICAgICAgICAgICAgKCJlY2hvIiAoImhpIikpKSkpCisg ICAgKHNob3VsZCAoZXF1YWwKKyAgICAgICAgICAgICAoY2F0Y2ggJ2VzaGVsbC1leHRlcm5h bCAoZXNoZWxsL3N1ZG8gIi11IiAiVVNFUiIgImVjaG8iICItdSIgImhpIikpCisgICAgICAg ICAgICAgYCgsKGZvcm1hdCAiL3N1ZG86VVNFUkBsb2NhbGhvc3Q6JXMiIGRlZmF1bHQtZGly ZWN0b3J5KQorICAgICAgICAgICAgICAgKCJlY2hvIiAoIi11IiAiaGkiKSkpKSkpKQorCis7 OzsgZW0tdHJhbXAtdGVzdHMuZWwgZW5kcyBoZXJlCmRpZmYgLS1naXQgYS90ZXN0L2xpc3Av ZXNoZWxsL2VzaC1vcHQtdGVzdHMuZWwgYi90ZXN0L2xpc3AvZXNoZWxsL2VzaC1vcHQtdGVz dHMuZWwKaW5kZXggYjc2ZWQ4ODY2ZC4uZWMzZjc0ZWY0MCAxMDA2NDQKLS0tIGEvdGVzdC9s aXNwL2VzaGVsbC9lc2gtb3B0LXRlc3RzLmVsCisrKyBiL3Rlc3QvbGlzcC9lc2hlbGwvZXNo LW9wdC10ZXN0cy5lbApAQCAtMjIsOCArMjIsOCBAQAogKHJlcXVpcmUgJ2VydCkKIChyZXF1 aXJlICdlc2gtb3B0KQogCi0oZXJ0LWRlZnRlc3QgZXNoLW9wdC1wcm9jZXNzLWFyZ3MtdGVz dCAoKQotICAiVW5pdCB0ZXN0cyB3aGljaCB2ZXJpZnkgY29ycmVjdCBiZWhhdmlvciBvZiBg ZXNoZWxsLS1wcm9jZXNzLWFyZ3MnLiIKKyhlcnQtZGVmdGVzdCBlc2gtb3B0LXRlc3QvcHJv Y2Vzcy1hcmdzICgpCisgICJUZXN0IGJlaGF2aW9yIG9mIGBlc2hlbGwtLXByb2Nlc3MtYXJn cycuIgogICAoc2hvdWxkCiAgICAoZXF1YWwgJyh0KQogICAgICAgICAgIChlc2hlbGwtLXBy b2Nlc3MtYXJncwpAQCAtMzUsNyArMzUsMTAgQEAgZXNoLW9wdC1wcm9jZXNzLWFyZ3MtdGVz dAogICAgICAgICAgIChlc2hlbGwtLXByb2Nlc3MtYXJncwogICAgICAgICAgICAic3VkbyIg JygiLXUiICJyb290IiAid29ybGQiKQogICAgICAgICAgICAnKCg/dSAidXNlciIgdCB1c2Vy Ci0gICAgICAgICAgICAgICAgICJleGVjdXRlIGEgY29tbWFuZCBhcyBhbm90aGVyIFVTRVIi KSkpKSkKKyAgICAgICAgICAgICAgICAgImV4ZWN1dGUgYSBjb21tYW5kIGFzIGFub3RoZXIg VVNFUiIpKSkpKSkKKworKGVydC1kZWZ0ZXN0IGVzaC1vcHQtdGVzdC9wcm9jZXNzLWFyZ3Mt cGFyc2UtbGVhZGluZy1vcHRpb25zLW9ubHkgKCkKKyAgIlRlc3QgYmVoYXZpb3Igb2YgOnBh cnNlLWxlYWRpbmctb3B0aW9ucy1vbmx5IGluIGBlc2hlbGwtLXByb2Nlc3MtYXJncycuIgog ICAoc2hvdWxkCiAgICAoZXF1YWwgJyhuaWwgImVtZXJnZSIgIi11RE4iICJ3b3JsZCIpCiAg ICAgICAgICAgKGVzaGVsbC0tcHJvY2Vzcy1hcmdzCkBAIC01NSw5ICs1OCwxMCBAQCBlc2gt b3B0LXByb2Nlc3MtYXJncy10ZXN0CiAgICAgICAgICAgKGVzaGVsbC0tcHJvY2Vzcy1hcmdz CiAgICAgICAgICAgICJzdWRvIiAnKCItdSIgInJvb3QiICJlbWVyZ2UiICItdUROIiAid29y bGQiKQogICAgICAgICAgICAnKCg/dSAidXNlciIgdCB1c2VyCi0gICAgICAgICAgICAgICAg ICJleGVjdXRlIGEgY29tbWFuZCBhcyBhbm90aGVyIFVTRVIiKSkpKSkKKyAgICAgICAgICAg ICAgICAgImV4ZWN1dGUgYSBjb21tYW5kIGFzIGFub3RoZXIgVVNFUiIpKSkpKSkKIAotICA7 OyBUZXN0IDpleHRlcm5hbC4KKyhlcnQtZGVmdGVzdCBlc2gtb3B0LXRlc3QvcHJvY2Vzcy1h cmdzLWV4dGVybmFsICgpCisgICJUZXN0IGJlaGF2aW9yIG9mIDpleHRlcm5hbCBpbiBgZXNo ZWxsLS1wcm9jZXNzLWFyZ3MnLiIKICAgKGNsLWxldGYgKCgoc3ltYm9sLWZ1bmN0aW9uICdl c2hlbGwtc2VhcmNoLXBhdGgpICMnaWdub3JlKSkKICAgICAoc2hvdWxkCiAgICAgIChlcXVh bCAnKG5pbCAiL3NvbWUvcGF0aCIpCkBAIC04NSw5ICs4OSw4IEBAIGVzaC1vcHQtcHJvY2Vz cy1hcmdzLXRlc3QKICAgICAgICAgOmV4dGVybmFsICJscyIpKQogICAgICA6dHlwZSAnZXJy b3IpKSkKIAotKGVydC1kZWZ0ZXN0IHRlc3QtZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9ucyAo KQotICAiVGVzdHMgZm9yIGBlc2hlbGwtZXZhbC11c2luZy1vcHRpb25zJy4iCi0gIDs7IFRl c3Qgc2hvcnQgb3B0aW9ucy4KKyhlcnQtZGVmdGVzdCBlc2gtb3B0LXRlc3QvZXZhbC11c2lu Zy1vcHRpb25zLXNob3J0ICgpCisgICJUZXN0IGBlc2hlbGwtZXZhbC11c2luZy1vcHRpb25z JyB3aXRoIHNob3J0IG9wdGlvbnMuIgogICAoZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9ucwog ICAgImxzIiAnKCItYSIgIi9zb21lL3BhdGgiKQogICAgJygoP2EgImFsbCIgbmlsIHNob3ct YWxsCkBAIC05OSwxNyArMTAyLDE5IEBAIHRlc3QtZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9u cwogICAgJygoP2EgImFsbCIgbmlsIHNob3ctYWxsCiAgICAgICAgICAiZG8gbm90IGlnbm9y ZSBlbnRyaWVzIHN0YXJ0aW5nIHdpdGggLiIpKQogICAgKHNob3VsZCAoZXEgc2hvdy1hbGwg bmlsKSkKLSAgIChzaG91bGQgKGVxdWFsIGFyZ3MgJygiL3NvbWUvcGF0aCIpKSkpCisgICAo c2hvdWxkIChlcXVhbCBhcmdzICcoIi9zb21lL3BhdGgiKSkpKSkKIAotICA7OyBUZXN0IGxv bmcgb3B0aW9ucy4KKyhlcnQtZGVmdGVzdCBlc2gtb3B0LXRlc3QvZXZhbC11c2luZy1vcHRp b25zLWxvbmcgKCkKKyAgIlRlc3QgYGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMnIHdpdGgg bG9uZyBvcHRpb25zLiIKICAgKGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMKICAgICJscyIg JygiLS1hbGwiICIvc29tZS9wYXRoIikKICAgICcoKD9hICJhbGwiIG5pbCBzaG93LWFsbAog ICAgICAgICAgImRvIG5vdCBpZ25vcmUgZW50cmllcyBzdGFydGluZyB3aXRoIC4iKSkKICAg IChzaG91bGQgKGVxIHNob3ctYWxsIHQpKQotICAgKHNob3VsZCAoZXF1YWwgYXJncyAnKCIv c29tZS9wYXRoIikpKSkKKyAgIChzaG91bGQgKGVxdWFsIGFyZ3MgJygiL3NvbWUvcGF0aCIp KSkpKQogCi0gIDs7IFRlc3Qgb3B0aW9ucyB3aXRoIGNvbnN0YW50IHZhbHVlcy4KKyhlcnQt ZGVmdGVzdCBlc2gtb3B0LXRlc3QvZXZhbC11c2luZy1vcHRpb25zLWNvbnN0YW50ICgpCisg ICJUZXN0IGBlc2hlbGwtZXZhbC11c2luZy1vcHRpb25zJyB3aXRoIG9wdGlvbnMgd2l0aCBj b25zdGFudCB2YWx1ZXMuIgogICAoZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9ucwogICAgImxz IiAnKCIvc29tZS9wYXRoIiAiLWgiKQogICAgJygoP2ggImh1bWFuLXJlYWRhYmxlIiAxMDI0 IGh1bWFuLXJlYWRhYmxlCkBAIC0xMjcsOSArMTMyLDEwIEBAIHRlc3QtZXNoZWxsLWV2YWwt dXNpbmctb3B0aW9ucwogICAgJygoP2ggImh1bWFuLXJlYWRhYmxlIiAxMDI0IGh1bWFuLXJl YWRhYmxlCiAgICAgICAgICAicHJpbnQgc2l6ZXMgaW4gaHVtYW4gcmVhZGFibGUgZm9ybWF0 IikpCiAgICAoc2hvdWxkIChlcSBodW1hbi1yZWFkYWJsZSBuaWwpKQotICAgKHNob3VsZCAo ZXF1YWwgYXJncyAnKCIvc29tZS9wYXRoIikpKSkKKyAgIChzaG91bGQgKGVxdWFsIGFyZ3Mg JygiL3NvbWUvcGF0aCIpKSkpKQogCi0gIDs7IFRlc3Qgb3B0aW9ucyB3aXRoIHVzZXItc3Bl Y2lmaWVkIHZhbHVlcy4KKyhlcnQtZGVmdGVzdCBlc2gtb3B0LXRlc3QvZXZhbC11c2luZy1v cHRpb25zLXVzZXItc3BlY2lmaWVkICgpCisgICJUZXN0IGBlc2hlbGwtZXZhbC11c2luZy1v cHRpb25zJyB3aXRoIG9wdGlvbnMgd2l0aCB1c2VyLXNwZWNpZmllZCB2YWx1ZXMuIgogICAo ZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9ucwogICAgImxzIiAnKCItSSIgIioudHh0IiAiL3Nv bWUvcGF0aCIpCiAgICAnKCg/SSAiaWdub3JlIiB0IGlnbm9yZS1wYXR0ZXJuCkBAIC0xNTMs OSArMTU5LDEwIEBAIHRlc3QtZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9ucwogICAgJygoP0kg Imlnbm9yZSIgdCBpZ25vcmUtcGF0dGVybgogICAgICAgICAgImRvIG5vdCBsaXN0IGltcGxp ZWQgZW50cmllcyBtYXRjaGluZyBwYXR0ZXJuIikpCiAgICAoc2hvdWxkIChlcXVhbCBpZ25v cmUtcGF0dGVybiAiKi50eHQiKSkKLSAgIChzaG91bGQgKGVxdWFsIGFyZ3MgJygiL3NvbWUv cGF0aCIpKSkpCisgICAoc2hvdWxkIChlcXVhbCBhcmdzICcoIi9zb21lL3BhdGgiKSkpKSkK IAotICA7OyBUZXN0IG11bHRpcGxlIHNob3J0IG9wdGlvbnMgaW4gYSBzaW5nbGUgdG9rZW4u CisoZXJ0LWRlZnRlc3QgZXNoLW9wdC10ZXN0L2V2YWwtdXNpbmctb3B0aW9ucy1zaG9ydC1z aW5nbGUtdG9rZW4gKCkKKyAgIlRlc3QgYGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMnIHdp dGggbXVsdGlwbGUgc2hvcnQgb3B0aW9ucyBpbiBvbmUgdG9rZW4uIgogICAoZXNoZWxsLWV2 YWwtdXNpbmctb3B0aW9ucwogICAgImxzIiAnKCItYWwiICIvc29tZS9wYXRoIikKICAgICco KD9hICJhbGwiIG5pbCBzaG93LWFsbApAQCAtMTc1LDcgKzE4Miw4IEBAIHRlc3QtZXNoZWxs LWV2YWwtdXNpbmctb3B0aW9ucwogICAgKHNob3VsZCAoZXF1YWwgaWdub3JlLXBhdHRlcm4g IioudHh0IikpCiAgICAoc2hvdWxkIChlcXVhbCBhcmdzICcoIi9zb21lL3BhdGgiKSkpKQog Ci0gIDs7IFRlc3QgdGhhdCAiLS0iIHRlcm1pbmF0ZXMgb3B0aW9ucy4KKyhlcnQtZGVmdGVz dCBlc2gtb3B0LXRlc3QvZXZhbC11c2luZy1vcHRpb25zLXRlcm1pbmF0ZS1vcHRpb25zICgp CisgICJUZXN0IHRoYXQgXCItLVwiIHRlcm1pbmF0ZXMgb3B0aW9ucyBpbiBgZXNoZWxsLWV2 YWwtdXNpbmctb3B0aW9ucycuIgogICAoZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9ucwogICAg ImxzIiAnKCItLSIgIi1hIikKICAgICcoKD9hICJhbGwiIG5pbCBzaG93LWFsbApAQCAtMTg3 LDkgKzE5NSwxMCBAQCB0ZXN0LWVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMKICAgICcoKD9h ICJhbGwiIG5pbCBzaG93LWFsbAogICAgICAgICAgImRvIG5vdCBpZ25vcmUgZW50cmllcyBz dGFydGluZyB3aXRoIC4iKSkKICAgIChzaG91bGQgKGVxIHNob3ctYWxsIG5pbCkpCi0gICAo c2hvdWxkIChlcXVhbCBhcmdzICcoIi0tYWxsIikpKSkKKyAgIChzaG91bGQgKGVxdWFsIGFy Z3MgJygiLS1hbGwiKSkpKSkKIAotICA7OyBUZXN0IDpwYXJzZS1sZWFkaW5nLW9wdGlvbnMt b25seS4KKyhlcnQtZGVmdGVzdCBlc2gtb3B0LXRlc3QvZXZhbC11c2luZy1vcHRpb25zLXBh cnNlLWxlYWRpbmctb3B0aW9ucy1vbmx5ICgpCisgICJUZXN0IDpwYXJzZS1sZWFkaW5nLW9w dGlvbnMtb25seSBpbiBgZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9ucycuIgogICAoZXNoZWxs LWV2YWwtdXNpbmctb3B0aW9ucwogICAgInN1ZG8iICcoIi11IiAicm9vdCIgIndob2FtaSIp CiAgICAnKCg/dSAidXNlciIgdCB1c2VyICJleGVjdXRlIGEgY29tbWFuZCBhcyBhbm90aGVy IFVTRVIiKQpAQCAtMjEyLDI3ICsyMjEsNDcgQEAgdGVzdC1lc2hlbGwtZXZhbC11c2luZy1v cHRpb25zCiAgICAnKCg/dSAidXNlciIgdCB1c2VyICJleGVjdXRlIGEgY29tbWFuZCBhcyBh bm90aGVyIFVTRVIiKQogICAgICA6cGFyc2UtbGVhZGluZy1vcHRpb25zLW9ubHkpCiAgICAo c2hvdWxkIChlcSB1c2VyIG5pbCkpCi0gICAoc2hvdWxkIChlcXVhbCBhcmdzICcoImVtZXJn ZSIgIi11RE4iICJ3b3JsZCIpKSkpCisgICAoc2hvdWxkIChlcXVhbCBhcmdzICcoImVtZXJn ZSIgIi11RE4iICJ3b3JsZCIpKSkpKQogCi0gIDs7IFRlc3QgdW5yZWNvZ25pemVkIG9wdGlv bnMuCisoZXJ0LWRlZnRlc3QgZXNoLW9wdC10ZXN0L2V2YWwtdXNpbmctb3B0aW9ucy11bnJl Y29nbml6ZWQgKCkKKyAgIlRlc3QgYGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMnIHdpdGgg dW5yZWNvZ25pemVkIG9wdGlvbnMuIgogICAoc2hvdWxkLWVycm9yCiAgICAoZXNoZWxsLWV2 YWwtdXNpbmctb3B0aW9ucwogICAgICJscyIgJygiLXUiICIvc29tZS9wYXRoIikKLSAgICAn KCg/YSAiYWxsIiBuaWwgc2hvdy1hbGwKLSAgICAgICAgICAiZG8gbm90IGlnbm9yZSBlbnRy aWVzIHN0YXJ0aW5nIHdpdGggLiIpKQotICAgIChpZ25vcmUgc2hvdy1hbGwpKSkKKyAgICAn KCg/YSAiYWxsIiBuaWwgX3Nob3ctYWxsCisgICAgICAgICAgImRvIG5vdCBpZ25vcmUgZW50 cmllcyBzdGFydGluZyB3aXRoIC4iKSkpKQogICAoc2hvdWxkLWVycm9yCiAgICAoZXNoZWxs LWV2YWwtdXNpbmctb3B0aW9ucwogICAgICJscyIgJygiLWF1IiAiL3NvbWUvcGF0aCIpCi0g ICAgJygoP2EgImFsbCIgbmlsIHNob3ctYWxsCi0gICAgICAgICAgImRvIG5vdCBpZ25vcmUg ZW50cmllcyBzdGFydGluZyB3aXRoIC4iKSkKLSAgICAoaWdub3JlIHNob3ctYWxsKSkpCisg ICAgJygoP2EgImFsbCIgbmlsIF9zaG93LWFsbAorICAgICAgICAgICJkbyBub3QgaWdub3Jl IGVudHJpZXMgc3RhcnRpbmcgd2l0aCAuIikpKSkKICAgKHNob3VsZC1lcnJvcgogICAgKGVz aGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMKICAgICAibHMiICcoIi0tdW5yZWNvZ25pemVkIiAi L3NvbWUvcGF0aCIpCi0gICAgJygoP2EgImFsbCIgbmlsIHNob3ctYWxsCi0gICAgICAgICAg ImRvIG5vdCBpZ25vcmUgZW50cmllcyBzdGFydGluZyB3aXRoIC4iKSkKLSAgICAoaWdub3Jl IHNob3ctYWxsKSkpKQorICAgICcoKD9hICJhbGwiIG5pbCBfc2hvdy1hbGwKKyAgICAgICAg ICAiZG8gbm90IGlnbm9yZSBlbnRyaWVzIHN0YXJ0aW5nIHdpdGggLiIpKSkpKQorCisoZXJ0 LWRlZnRlc3QgZXNoLW9wdC10ZXN0L2V2YWwtdXNpbmctb3B0aW9ucy1leHRlcm5hbCAoKQor ICAiVGVzdCA6ZXh0ZXJuYWwgaW4gYGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMnLiIKKyAg KGNsLWxldGYgKCgoc3ltYm9sLWZ1bmN0aW9uICdlc2hlbGwtc2VhcmNoLXBhdGgpICMnaWRl bnRpdHkpCisgICAgICAgICAgICAoKHN5bWJvbC1mdW5jdGlvbiAnZXNoZWxsLWV4dGVybmFs LWNvbW1hbmQpICMnbGlzdCkpCisgICAgKHNob3VsZAorICAgICAoZXF1YWwgKGNhdGNoICdl c2hlbGwtZXh0ZXJuYWwKKyAgICAgICAgICAgICAgKGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlv bnMKKyAgICAgICAgICAgICAgICJscyIgJygiL3NvbWUvcGF0aCIgIi11IikKKyAgICAgICAg ICAgICAgICcoKD9hICJhbGwiIG5pbCBfc2hvdy1hbGwKKyAgICAgICAgICAgICAgICAgICAg ICJkbyBub3QgaWdub3JlIGVudHJpZXMgc3RhcnRpbmcgd2l0aCAuIikKKyAgICAgICAgICAg ICAgICAgOmV4dGVybmFsICJscyIpKSkKKyAgICAgICAgICAgICcoImxzIiAoIi9zb21lL3Bh dGgiICItdSIpKSkpCisgICAgKHNob3VsZAorICAgICAoZXF1YWwgKGNhdGNoICdlc2hlbGwt ZXh0ZXJuYWwKKyAgICAgICAgICAgICAgKGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMKKyAg ICAgICAgICAgICAgICJscyIgJygiL3NvbWUvcGF0aDIiICItdSIpCisgICAgICAgICAgICAg ICAnKCg/YSAiYWxsIiBuaWwgX3Nob3ctYWxsCisgICAgICAgICAgICAgICAgICAgICAiZG8g bm90IGlnbm9yZSBlbnRyaWVzIHN0YXJ0aW5nIHdpdGggLiIpCisgICAgICAgICAgICAgICAg IDpwcmVzZXJ2ZS1hcmdzCisgICAgICAgICAgICAgICAgIDpleHRlcm5hbCAibHMiKSkpCisg ICAgICAgICAgICAnKCJscyIgKCIvc29tZS9wYXRoMiIgIi11IikpKSkpKSkKIAogKHByb3Zp ZGUgJ2VzaC1vcHQtdGVzdHMpCiAKLS0gCjIuMjUuMQoK --------------D311FDC71EF8723005F77684-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 25 00:20:04 2022 Received: (at 53517) by debbugs.gnu.org; 25 Jan 2022 05:20:04 +0000 Received: from localhost ([127.0.0.1]:46582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCEFN-0007eV-Gf for submit@debbugs.gnu.org; Tue, 25 Jan 2022 00:20:04 -0500 Received: from mail-pj1-f44.google.com ([209.85.216.44]:37805) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCEFK-0007e9-NM for 53517@debbugs.gnu.org; Tue, 25 Jan 2022 00:20:00 -0500 Received: by mail-pj1-f44.google.com with SMTP id s2-20020a17090ad48200b001b501977b23so1116861pju.2 for <53517@debbugs.gnu.org>; Mon, 24 Jan 2022 21:19:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:from:to:references:message-id:date:mime-version:in-reply-to :content-language; bh=BP98J04/Cq1fq7mBPOlOjuoHjuaib9XvIE5E1ACSVMo=; b=gizKMIf7fEOPe9UJw367wEHukXeYH4/sdalXoPsL+BtCBsOn9U/aVj7XrJamPD9J3d CZe10UvYnkPAAFsTl/i5+Rki6iMb1KbJ/wmGYUXCDcopBZv9W0iEGFVPwvHonVKRMkku mc/BJahHTp6NSKi2AoUg1QEcyC+C0ZjHSVMFIZfH74jiVpbu4YKcNQFz93pes5PjNQCO ntUvTk3uMVvdiyw9My3trgLZOcVh5kns6u94YLTPcZJP3QRLgDVufZ9Jm9cfeshgUkwa He0YtQVdRi6KRpaoCrtCGQTA17powyeFM0TNZsEAUyLscN+yoaMEvSkygQ63sTD6OLd4 v0tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:from:to:references:message-id:date :mime-version:in-reply-to:content-language; bh=BP98J04/Cq1fq7mBPOlOjuoHjuaib9XvIE5E1ACSVMo=; b=e97ch1WAlHf81LHrFOudhsebxZEkKrr6/L830TVtvTqFEcvQ2B7+kkQOtH+lczx19w Q0CAjVmb7Ajwu+dsNpF/I6Z7hMaTW8FmlYT+2icswOkaazBoV9t1ofFTyJMxBEGb3L/o xiQXFEAxfeUTUckya4M+C1TBsafBxodwMaxtYDw47+n+T0usXpGrxmxuBbZF4/jCiqvF 5px2lB5iM0U4/nUgWu+8rapswn/3tfNFdeCYRbenKnbx+2aMLxyJsnpxaO7LBXwAxa2U tlcnzdH0Mw6vn4fodz2itXd5Ge60/oRkJXUOYDkVicFO8dYb8Sln8Wx+jN21y+b2jwm/ tAJA== X-Gm-Message-State: AOAM532S8r17sHAdj+amYbssc/qgYasT3o1z5ZaN+VXYZVnRLbYzHKLH FQjOXW9MIAi5WyoUlVF2SsXuxTv9Lk2vxg== X-Google-Smtp-Source: ABdhPJyNGK0xdjjA2dmOOe4ny3KMTh5lyCaI5IO1EGxiqLS11fVtVlT2VpK2I1LVUjmduto0SQpmzg== X-Received: by 2002:a17:903:11cf:b0:149:a17a:361b with SMTP id q15-20020a17090311cf00b00149a17a361bmr17756026plh.146.1643087992845; Mon, 24 Jan 2022 21:19:52 -0800 (PST) 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 s42sm5911505pfg.146.2022.01.24.21.19.51 for <53517@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Jan 2022 21:19:52 -0800 (PST) Subject: Re: bug#53517: 29.0.50; [PATCH] `eshell-eval-using-options' :preserve-args breaks :external handling in some cases From: Jim Porter To: 53517@debbugs.gnu.org References: <31760ab2-2f47-dacd-0a9f-6a0bddced866@gmail.com> Message-ID: <58d11a94-52ac-9df0-7e1c-7dea7e8cfe58@gmail.com> Date: Mon, 24 Jan 2022 21:19:52 -0800 MIME-Version: 1.0 In-Reply-To: <31760ab2-2f47-dacd-0a9f-6a0bddced866@gmail.com> Content-Type: multipart/mixed; boundary="------------0A9AA694C2327F21B8C6E688" Content-Language: en-US X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 53517 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 (-) This is a multi-part message in MIME format. --------------0A9AA694C2327F21B8C6E688 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 1/24/2022 5:11 PM, Jim Porter wrote: > (It might be nice to fix that too, but I think it's still useful to > keep the original raw args around unchanged. Improving "-" support > could be done later.) Actually, I'll do that now. Doing so fixes an issue I found in the implementation of `eshell/cat'. "cat -" should read from stdin (and the Eshell implementation should use the external /bin/cat to do this), but it was getting parsed as "cat", so it erroneously thought there were *no* input files. Previously, `eshell--process-args' saw the "-" and started to look for short options, found none, and then just shrugged and ignored that token entirely. I also fixed an issue with the first patch where I had some misplaced parens in test/lisp/eshell/esh-opt-tests.el. --------------0A9AA694C2327F21B8C6E688 Content-Type: text/plain; charset=UTF-8; name="0001-Don-t-manipulate-args-in-place-for-eshell-eval-using.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Don-t-manipulate-args-in-place-for-eshell-eval-using.pa"; filename*1="tch" RnJvbSBhMTc2ZGM5NzE3YTgwMWNiNWFkMWQwNjIxYzc1ZGRmNmE3NDIyMjJmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IE1vbiwgMjQgSmFuIDIwMjIgMjE6MDM6NDIgLTA4MDAKU3ViamVjdDogW1BB VENIIDEvMl0gRG9uJ3QgbWFuaXB1bGF0ZSBhcmdzIGluLXBsYWNlIGZvcgogJ2VzaGVsbC1l dmFsLXVzaW5nLW9wdGlvbnMnCgpUaGlzIGlzIG5lY2Vzc2FyeSBmb3IgcHJlc2VydmUgdGhl IG9yaWdpbmFsIGFyZ3VtZW50cyB0byBmb3J3YXJkIG9uIHRvCjpleHRlcm5hbCBjb21tYW5k cy4gIFByZXZpb3VzbHksIHdoZW4gOnByZXNlcnZlLWFyZ3Mgd2FzIGFsc28gc2V0LCB0aGUK b3JpZ2luYWwgYXJndW1lbnQgbGlzdCBjb3VsZCBiZSBhbHRlcmVkLCBjaGFuZ2luZyB0aGUg bWVhbmluZyBvZiB0aGUKY29tbWFuZC4KCiogbGlzcC9lc2hlbGwvZXNoLW9wdC5lbCAoZXNo ZWxsLWV2YWwtdXNpbmctb3B0aW9ucyk6IENvcHkgTUFDUk8tQVJHUwp3aGVuIDpwcmVzZXJ2 ZS1hcmdzIGlzIHNldCwgYW5kIHBhc3MgdGhlIG9yaWdpbmFsIHZhbHVlIHRvCidlc2hlbGwt LWRvLW9wdHMnLgooZXNoZWxsLS1kby1vcHRzKTogVXNlIHRoZSBvcmlnaW5hbCBhcmd1bWVu dHMgd2hlbiBjYWxsaW5nIGFuIGV4dGVybmFsCmNvbW1hbmQuCgoqIGxpc3AvZXNoZWxsL2Vt LXRyYW1wLmVsIChlc2hlbGwvc3UsIGVzaGVsbC9zdWRvKTogRG9uJ3QgY29weSB0aGUKb3Jp Z2luYWwgYXJndW1lbnRzLCBzaW5jZSAnZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9ucycgZG9l cyB0aGlzIGZvcgp1cy4KCiogdGVzdC9saXNwL2VzaGVsbC9lc2gtb3B0LXRlc3RzLmVsIChl c2gtb3B0LXByb2Nlc3MtYXJncy10ZXN0KToKU3BsaXQgdGhpcyB0ZXN0IGludG8uLi4KKGVz aC1vcHQtdGVzdC9wcm9jZXNzLWFyZ3MpCihlc2gtb3B0LXRlc3QvcHJvY2Vzcy1hcmdzLXBh cnNlLWxlYWRpbmctb3B0aW9ucy1vbmx5KQooZXNoLW9wdC10ZXN0L3Byb2Nlc3MtYXJncy1l eHRlcm5hbCk6IC4uLiB0aGVzZS4KKHRlc3QtZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9ucyk6 IFNwbGl0IHRoaXMgdGVzdCBpbnRvLi4uCihlc2gtb3B0LXRlc3QvZXZhbC11c2luZy1vcHRp b25zLXNob3J0KQooZXNoLW9wdC10ZXN0L2V2YWwtdXNpbmctb3B0aW9ucy1sb25nKQooZXNo LW9wdC10ZXN0L2V2YWwtdXNpbmctb3B0aW9ucy1jb25zdGFudCkKKGVzaC1vcHQtdGVzdC9l dmFsLXVzaW5nLW9wdGlvbnMtdXNlci1zcGVjaWZpZWQpCihlc2gtb3B0LXRlc3QvZXZhbC11 c2luZy1vcHRpb25zLXNob3J0LXNpbmdsZS10b2tlbikKKGVzaC1vcHQtdGVzdC9ldmFsLXVz aW5nLW9wdGlvbnMtdGVybWluYXRlLW9wdGlvbnMpCihlc2gtb3B0LXRlc3QvZXZhbC11c2lu Zy1vcHRpb25zLXBhcnNlLWxlYWRpbmctb3B0aW9ucy1vbmx5KQooZXNoLW9wdC10ZXN0L2V2 YWwtdXNpbmctb3B0aW9ucy11bnJlY29nbml6ZWQpOiAuLi4gdGhlc2UuCihlc2gtb3B0LXRl c3QvZXZhbC11c2luZy1vcHRpb25zLWV4dGVybmFsKTogTmV3IHRlc3QuCgoqIHRlc3QvbGlz cC9lc2hlbGwvZW0tdHJhbXAtdGVzdHMuZWw6IE5ldyB0ZXN0cy4KLS0tCiBsaXNwL2VzaGVs bC9lbS10cmFtcC5lbCAgICAgICAgICAgIHwgMTI1ICsrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLS0tCiBsaXNwL2VzaGVsbC9lc2gtb3B0LmVsICAgICAgICAgICAgIHwgICA4ICstCiB0 ZXN0L2xpc3AvZXNoZWxsL2VtLXRyYW1wLXRlc3RzLmVsIHwgIDg1ICsrKysrKysrKysrKysr KysrKysrCiB0ZXN0L2xpc3AvZXNoZWxsL2VzaC1vcHQtdGVzdHMuZWwgIHwgIDkxICsrKysr KysrKysrKysrLS0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCAyMDkgaW5zZXJ0aW9ucygrKSwg MTAwIGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IHRlc3QvbGlzcC9lc2hlbGwv ZW0tdHJhbXAtdGVzdHMuZWwKCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lbS10cmFtcC5l bCBiL2xpc3AvZXNoZWxsL2VtLXRyYW1wLmVsCmluZGV4IGU5MDE4YmRiOTMuLjc5MTQ1ODgy MmQgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VtLXRyYW1wLmVsCisrKyBiL2xpc3AvZXNo ZWxsL2VtLXRyYW1wLmVsCkBAIC01Nyw0MSArNTcsNDIgQEAgZXNoZWxsLXRyYW1wLWluaXRp YWxpemUKIAogKGF1dG9sb2FkICdlc2hlbGwtcGFyc2UtY29tbWFuZCAiZXNoLWNtZCIpCiAK LShkZWZ1biBlc2hlbGwvc3UgKCZyZXN0IGFyZ3MpCisoZGVmdW4gZXNoZWxsL3N1ICgmcmVz dCBhcmd1bWVudHMpCiAgICJBbGlhcyBcInN1XCIgdG8gY2FsbCBUUkFNUC4KIAogVXNlcyB0 aGUgc3lzdGVtIHN1IHRocm91Z2ggVFJBTVAncyBzdSBtZXRob2QuIgotICAoc2V0cSBhcmdz IChlc2hlbGwtc3RyaW5naWZ5LWxpc3QgKGZsYXR0ZW4tdHJlZSBhcmdzKSkpCi0gIChsZXQg KChvcmlnLWFyZ3MgKGNvcHktdHJlZSBhcmdzKSkpCi0gICAgKGVzaGVsbC1ldmFsLXVzaW5n LW9wdGlvbnMKLSAgICAgInN1IiBhcmdzCi0gICAgICcoKD9oICJoZWxwIiBuaWwgbmlsICJz aG93IHRoaXMgdXNhZ2Ugc2NyZWVuIikKLSAgICAgICAoP2wgImxvZ2luIiBuaWwgbG9naW4g InByb3ZpZGUgYSBsb2dpbiBlbnZpcm9ubWVudCIpCi0gICAgICAgKD8gIG5pbCBuaWwgbG9n aW4gInByb3ZpZGUgYSBsb2dpbiBlbnZpcm9ubWVudCIpCi0gICAgICAgOnVzYWdlICJbLSB8 IC1sIHwgLS1sb2dpbl0gW1VTRVJdCisgIChzZXRxIGFyZ3VtZW50cyAoZXNoZWxsLXN0cmlu Z2lmeS1saXN0IChmbGF0dGVuLXRyZWUgYXJndW1lbnRzKSkpCisgIChlc2hlbGwtZXZhbC11 c2luZy1vcHRpb25zCisgICAic3UiIGFyZ3VtZW50cworICAgJygoP2ggImhlbHAiIG5pbCBu aWwgInNob3cgdGhpcyB1c2FnZSBzY3JlZW4iKQorICAgICAoP2wgImxvZ2luIiBuaWwgbG9n aW4gInByb3ZpZGUgYSBsb2dpbiBlbnZpcm9ubWVudCIpCisgICAgICg/ICBuaWwgbmlsIGxv Z2luICJwcm92aWRlIGEgbG9naW4gZW52aXJvbm1lbnQiKQorICAgICA6dXNhZ2UgIlstIHwg LWwgfCAtLWxvZ2luXSBbVVNFUl0KIEJlY29tZSBhbm90aGVyIFVTRVIgZHVyaW5nIGEgbG9n aW4gc2Vzc2lvbi4iKQotICAgICAodGhyb3cgJ2VzaGVsbC1yZXBsYWNlLWNvbW1hbmQKLQkg ICAgKGxldCAoKHVzZXIgInJvb3QiKQotCQkgIChob3N0IChvciAoZmlsZS1yZW1vdGUtcCBk ZWZhdWx0LWRpcmVjdG9yeSAnaG9zdCkKLQkJCSAgICAibG9jYWxob3N0IikpCi0JCSAgKGRp ciAoZmlsZS1sb2NhbC1uYW1lIChleHBhbmQtZmlsZS1uYW1lIGRlZmF1bHQtZGlyZWN0b3J5 KSkpCi0JCSAgKHByZWZpeCAoZmlsZS1yZW1vdGUtcCBkZWZhdWx0LWRpcmVjdG9yeSkpKQot CSAgICAgIChkb2xpc3QgKGFyZyBhcmdzKQotCQkoaWYgKHN0cmluZy1lcXVhbCBhcmcgIi0i KSAoc2V0cSBsb2dpbiB0KSAoc2V0cSB1c2VyIGFyZykpKQotCSAgICAgIDs7IGBlc2hlbGwt ZXZhbC11c2luZy1vcHRpb25zJyBkb2VzIG5vdCBoYW5kbGUgIi0iLgotCSAgICAgIChpZiAo bWVtYmVyICItIiBvcmlnLWFyZ3MpIChzZXRxIGxvZ2luIHQpKQotCSAgICAgIChpZiBsb2dp biAoc2V0cSBkaXIgIn4vIikpCi0JICAgICAgKGlmIChhbmQgcHJlZml4Ci0JCSAgICAgICAo b3IKLQkJCShub3QgKHN0cmluZy1lcXVhbAotCQkJICAgICAgInN1IiAoZmlsZS1yZW1vdGUt cCBkZWZhdWx0LWRpcmVjdG9yeSAnbWV0aG9kKSkpCi0JCQkobm90IChzdHJpbmctZXF1YWwK LQkJCSAgICAgIHVzZXIgKGZpbGUtcmVtb3RlLXAgZGVmYXVsdC1kaXJlY3RvcnkgJ3VzZXIp KSkpKQotCQkgIChlc2hlbGwtcGFyc2UtY29tbWFuZAotCQkgICAiY2QiIChsaXN0IChmb3Jt YXQgIiVzfHN1OiVzQCVzOiVzIgotCQkJCSAgICAgIChzdWJzdHJpbmcgcHJlZml4IDAgLTEp IHVzZXIgaG9zdCBkaXIpKSkKLQkJKGVzaGVsbC1wYXJzZS1jb21tYW5kCi0JCSAiY2QiIChs aXN0IChmb3JtYXQgIi9zdTolc0AlczolcyIgdXNlciBob3N0IGRpcikpKSkpKSkpKQorICAg KHRocm93ICdlc2hlbGwtcmVwbGFjZS1jb21tYW5kCisgICAgICAgICAgKGxldCAoKHVzZXIg InJvb3QiKQorICAgICAgICAgICAgICAgIChob3N0IChvciAoZmlsZS1yZW1vdGUtcCBkZWZh dWx0LWRpcmVjdG9yeSAnaG9zdCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgImxvY2Fs aG9zdCIpKQorICAgICAgICAgICAgICAgIChkaXIgKGZpbGUtbG9jYWwtbmFtZSAoZXhwYW5k LWZpbGUtbmFtZSBkZWZhdWx0LWRpcmVjdG9yeSkpKQorICAgICAgICAgICAgICAgIChwcmVm aXggKGZpbGUtcmVtb3RlLXAgZGVmYXVsdC1kaXJlY3RvcnkpKSkKKyAgICAgICAgICAgIChk b2xpc3QgKGFyZyBhcmdzKQorICAgICAgICAgICAgICAoaWYgKHN0cmluZy1lcXVhbCBhcmcg Ii0iKSAoc2V0cSBsb2dpbiB0KSAoc2V0cSB1c2VyIGFyZykpKQorICAgICAgICAgICAgOzsg YGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMnIHRyaWVzIHRvIGhhbmRsZSAiLSIgYXMgYQor ICAgICAgICAgICAgOzsgc2hvcnQgb3B0aW9uOyBkb3VibGUtY2hlY2sgd2hldGhlciB0aGUg b3JpZ2luYWwKKyAgICAgICAgICAgIDs7IGFyZ3VtZW50cyBpbmNsdWRlIGl0LgorICAgICAg ICAgICAgKHdoZW4gKG1lbWJlciAiLSIgYXJndW1lbnRzKSAoc2V0cSBsb2dpbiB0KSkKKyAg ICAgICAgICAgICh3aGVuIGxvZ2luIChzZXRxIGRpciAifi8iKSkKKyAgICAgICAgICAgIChp ZiAoYW5kIHByZWZpeAorICAgICAgICAgICAgICAgICAgICAgKG9yCisgICAgICAgICAgICAg ICAgICAgICAgKG5vdCAoc3RyaW5nLWVxdWFsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgInN1IiAoZmlsZS1yZW1vdGUtcCBkZWZhdWx0LWRpcmVjdG9yeSAnbWV0aG9kKSkpCisg ICAgICAgICAgICAgICAgICAgICAgKG5vdCAoc3RyaW5nLWVxdWFsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdXNlciAoZmlsZS1yZW1vdGUtcCBkZWZhdWx0LWRpcmVjdG9yeSAn dXNlcikpKSkpCisgICAgICAgICAgICAgICAgKGVzaGVsbC1wYXJzZS1jb21tYW5kCisgICAg ICAgICAgICAgICAgICJjZCIgKGxpc3QgKGZvcm1hdCAiJXN8c3U6JXNAJXM6JXMiCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3Vic3RyaW5nIHByZWZpeCAwIC0x KSB1c2VyIGhvc3QgZGlyKSkpCisgICAgICAgICAgICAgIChlc2hlbGwtcGFyc2UtY29tbWFu ZAorICAgICAgICAgICAgICAgImNkIiAobGlzdCAoZm9ybWF0ICIvc3U6JXNAJXM6JXMiIHVz ZXIgaG9zdCBkaXIpKSkpKSkpKQogCiAocHV0ICdlc2hlbGwvc3UgJ2VzaGVsbC1uby1udW1l cmljLWNvbnZlcnNpb25zIHQpCiAKQEAgLTk5LDQxICsxMDAsMzUgQEAgZXNoZWxsL3N1ZG8K ICAgIkFsaWFzIFwic3Vkb1wiIHRvIGNhbGwgVHJhbXAuCiAKIFVzZXMgdGhlIHN5c3RlbSBz dWRvIHRocm91Z2ggVFJBTVAncyBzdWRvIG1ldGhvZC4iCi0gIChzZXRxIGFyZ3MgKGVzaGVs bC1zdHJpbmdpZnktbGlzdCAoZmxhdHRlbi10cmVlIGFyZ3MpKSkKLSAgKGxldCAoKG9yaWct YXJncyAoY29weS10cmVlIGFyZ3MpKSkKLSAgICAoZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9u cwotICAgICAic3VkbyIgYXJncwotICAgICAnKCg/aCAiaGVscCIgbmlsIG5pbCAic2hvdyB0 aGlzIHVzYWdlIHNjcmVlbiIpCi0gICAgICAgKD91ICJ1c2VyIiB0IHVzZXIgImV4ZWN1dGUg YSBjb21tYW5kIGFzIGFub3RoZXIgVVNFUiIpCi0gICAgICAgOnNob3ctdXNhZ2UKLSAgICAg ICA6cGFyc2UtbGVhZGluZy1vcHRpb25zLW9ubHkKLSAgICAgICA6dXNhZ2UgIlsoLXUgfCAt LXVzZXIpIFVTRVJdIENPTU1BTkQKKyAgKGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMKKyAg ICJzdWRvIiBhcmdzCisgICAnKCg/aCAiaGVscCIgbmlsIG5pbCAic2hvdyB0aGlzIHVzYWdl IHNjcmVlbiIpCisgICAgICg/dSAidXNlciIgdCB1c2VyICJleGVjdXRlIGEgY29tbWFuZCBh cyBhbm90aGVyIFVTRVIiKQorICAgICA6c2hvdy11c2FnZQorICAgICA6cGFyc2UtbGVhZGlu Zy1vcHRpb25zLW9ubHkKKyAgICAgOnVzYWdlICJbKC11IHwgLS11c2VyKSBVU0VSXSBDT01N QU5ECiBFeGVjdXRlIGEgQ09NTUFORCBhcyB0aGUgc3VwZXJ1c2VyIG9yIGFub3RoZXIgVVNF Ui4iKQotICAgICAodGhyb3cgJ2VzaGVsbC1leHRlcm5hbAotCSAgICAobGV0ICgodXNlciAo b3IgdXNlciAicm9vdCIpKQotCQkgIChob3N0IChvciAoZmlsZS1yZW1vdGUtcCBkZWZhdWx0 LWRpcmVjdG9yeSAnaG9zdCkKLQkJCSAgICAibG9jYWxob3N0IikpCi0JCSAgKGRpciAoZmls ZS1sb2NhbC1uYW1lIChleHBhbmQtZmlsZS1uYW1lIGRlZmF1bHQtZGlyZWN0b3J5KSkpCi0J CSAgKHByZWZpeCAoZmlsZS1yZW1vdGUtcCBkZWZhdWx0LWRpcmVjdG9yeSkpKQotCSAgICAg IDs7IGBlc2hlbGwtZXZhbC11c2luZy1vcHRpb25zJyByZWFkcyBvcHRpb25zIG9mIENPTU1B TkQuCi0JICAgICAgKHdoaWxlIChhbmQgKHN0cmluZ3AgKGNhciBvcmlnLWFyZ3MpKQotCQkJ ICAobWVtYmVyIChjYXIgb3JpZy1hcmdzKSAnKCItdSIgIi0tdXNlciIpKSkKLQkJKHNldHEg b3JpZy1hcmdzIChjZGRyIG9yaWctYXJncykpKQotCSAgICAgIChsZXQgKChkZWZhdWx0LWRp cmVjdG9yeQotCQkgICAgICAoaWYgKGFuZCBwcmVmaXgKLQkJCSAgICAgICAob3IKLQkJCQko bm90Ci0JCQkJIChzdHJpbmctZXF1YWwKLQkJCQkgICJzdWRvIgotCQkJCSAgKGZpbGUtcmVt b3RlLXAgZGVmYXVsdC1kaXJlY3RvcnkgJ21ldGhvZCkpKQotCQkJCShub3QKLQkJCQkgKHN0 cmluZy1lcXVhbAotCQkJCSAgdXNlcgotCQkJCSAgKGZpbGUtcmVtb3RlLXAgZGVmYXVsdC1k aXJlY3RvcnkgJ3VzZXIpKSkpKQotCQkJICAoZm9ybWF0ICIlc3xzdWRvOiVzQCVzOiVzIgot CQkJCSAgKHN1YnN0cmluZyBwcmVmaXggMCAtMSkgdXNlciBob3N0IGRpcikKLQkJCShmb3Jt YXQgIi9zdWRvOiVzQCVzOiVzIiB1c2VyIGhvc3QgZGlyKSkpKQotCQkoZXNoZWxsLW5hbWVk LWNvbW1hbmQgKGNhciBvcmlnLWFyZ3MpIChjZHIgb3JpZy1hcmdzKSkpKSkpKSkKKyAgICh0 aHJvdyAnZXNoZWxsLWV4dGVybmFsCisgICAgICAgICAgKGxldCogKCh1c2VyIChvciB1c2Vy ICJyb290IikpCisgICAgICAgICAgICAgICAgIChob3N0IChvciAoZmlsZS1yZW1vdGUtcCBk ZWZhdWx0LWRpcmVjdG9yeSAnaG9zdCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICJs b2NhbGhvc3QiKSkKKyAgICAgICAgICAgICAgICAgKGRpciAoZmlsZS1sb2NhbC1uYW1lIChl eHBhbmQtZmlsZS1uYW1lIGRlZmF1bHQtZGlyZWN0b3J5KSkpCisgICAgICAgICAgICAgICAg IChwcmVmaXggKGZpbGUtcmVtb3RlLXAgZGVmYXVsdC1kaXJlY3RvcnkpKQorICAgICAgICAg ICAgICAgICAoZGVmYXVsdC1kaXJlY3RvcnkKKyAgICAgICAgICAgICAgICAgICAoaWYgKGFu ZCBwcmVmaXgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAob3IKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgKG5vdAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KHN0cmluZy1lcXVhbAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJzdWRvIgor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChmaWxlLXJlbW90ZS1wIGRlZmF1bHQt ZGlyZWN0b3J5ICdtZXRob2QpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG5v dAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1lcXVhbAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHVzZXIKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAoZmlsZS1yZW1vdGUtcCBkZWZhdWx0LWRpcmVjdG9yeSAndXNlcikpKSkpCisg ICAgICAgICAgICAgICAgICAgICAgIChmb3JtYXQgIiVzfHN1ZG86JXNAJXM6JXMiCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN1YnN0cmluZyBwcmVmaXggMCAtMSkgdXNl ciBob3N0IGRpcikKKyAgICAgICAgICAgICAgICAgICAgIChmb3JtYXQgIi9zdWRvOiVzQCVz OiVzIiB1c2VyIGhvc3QgZGlyKSkpKQorICAgICAgICAgICAgKGVzaGVsbC1uYW1lZC1jb21t YW5kIChjYXIgYXJncykgKGNkciBhcmdzKSkpKSkpCiAKIChwdXQgJ2VzaGVsbC9zdWRvICdl c2hlbGwtbm8tbnVtZXJpYy1jb252ZXJzaW9ucyB0KQogCmRpZmYgLS1naXQgYS9saXNwL2Vz aGVsbC9lc2gtb3B0LmVsIGIvbGlzcC9lc2hlbGwvZXNoLW9wdC5lbAppbmRleCBjODAyYmVl M2FmLi44YzI5ZmZmODA5IDEwMDY0NAotLS0gYS9saXNwL2VzaGVsbC9lc2gtb3B0LmVsCisr KyBiL2xpc3AvZXNoZWxsL2VzaC1vcHQuZWwKQEAgLTk3LDEwICs5NywxMCBAQCBlc2hlbGwt ZXZhbC11c2luZy1vcHRpb25zCiAgIChkZWNsYXJlIChkZWJ1ZyAoZm9ybSBmb3JtIHNleHAg Ym9keSkpKQogICBgKGxldCogKCh0ZW1wLWFyZ3MKICAgICAgICAgICAgLChpZiAobWVtcSAn OnByZXNlcnZlLWFyZ3MgKGNhZHIgb3B0aW9ucykpCi0gICAgICAgICAgICAgICAgbWFjcm8t YXJncworICAgICAgICAgICAgICAgIChsaXN0ICdjb3B5LXRyZWUgbWFjcm8tYXJncykKICAg ICAgICAgICAgICAgKGxpc3QgJ2VzaGVsbC1zdHJpbmdpZnktbGlzdAogICAgICAgICAgICAg ICAgICAgICAobGlzdCAnZmxhdHRlbi10cmVlIG1hY3JvLWFyZ3MpKSkpCi0gICAgICAgICAg KHByb2Nlc3NlZC1hcmdzIChlc2hlbGwtLWRvLW9wdHMgLG5hbWUgLG9wdGlvbnMgdGVtcC1h cmdzKSkKKyAgICAgICAgICAocHJvY2Vzc2VkLWFyZ3MgKGVzaGVsbC0tZG8tb3B0cyAsbmFt ZSAsb3B0aW9ucyB0ZW1wLWFyZ3MgLG1hY3JvLWFyZ3MpKQogICAgICAgICAgICxAKGRlbGV0 ZS1kdXBzCiAgICAgICAgICAgICAgKGRlbHEgbmlsIChtYXBjYXIgKGxhbWJkYSAob3B0KQog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGFuZCAobGlzdHAgb3B0KSAobnRo IDMgb3B0KQpAQCAtMTE3LDcgKzExNyw3IEBAIGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMK IDs7IERvY3VtZW50ZWQgcGFydCBvZiB0aGUgaW50ZXJmYWNlOyBzZWUgZXNoZWxsLWV2YWwt dXNpbmctb3B0aW9ucy4KIChkZWZ2YXIgZXNoZWxsLS1hcmdzKQogCi0oZGVmdW4gZXNoZWxs LS1kby1vcHRzIChuYW1lIG9wdGlvbnMgYXJncykKKyhkZWZ1biBlc2hlbGwtLWRvLW9wdHMg KG5hbWUgb3B0aW9ucyBhcmdzIG9yaWctYXJncykKICAgIkhlbHBlciBmdW5jdGlvbiBmb3Ig YGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMnLgogVGhpcyBjb2RlIGRvZXNuJ3QgcmVhbGx5 IG5lZWQgdG8gYmUgbWFjcm8gZXhwYW5kZWQgZXZlcnl3aGVyZS4iCiAgIChyZXF1aXJlICdl c2gtZXh0KQpAQCAtMTM1LDcgKzEzNSw3IEBAIGVzaGVsbC0tZG8tb3B0cwogICAgICAgICAg ICAgICAgKGVycm9yICIlcyIgdXNhZ2UtbXNnKSkpKSkpCiAgICAgKGlmIGV4dC1jb21tYW5k CiAgICAgICAgICh0aHJvdyAnZXNoZWxsLWV4dGVybmFsCi0gICAgICAgICAgICAgICAoZXNo ZWxsLWV4dGVybmFsLWNvbW1hbmQgZXh0LWNvbW1hbmQgYXJncykpCisgICAgICAgICAgICAg ICAoZXNoZWxsLWV4dGVybmFsLWNvbW1hbmQgZXh0LWNvbW1hbmQgb3JpZy1hcmdzKSkKICAg ICAgIGFyZ3MpKSkKIAogKGRlZnVuIGVzaGVsbC1zaG93LXVzYWdlIChuYW1lIG9wdGlvbnMp CmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvZXNoZWxsL2VtLXRyYW1wLXRlc3RzLmVsIGIvdGVz dC9saXNwL2VzaGVsbC9lbS10cmFtcC10ZXN0cy5lbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwLi43ZjA1NGRhNTE0Ci0tLSAvZGV2L251bGwKKysrIGIvdGVzdC9s aXNwL2VzaGVsbC9lbS10cmFtcC10ZXN0cy5lbApAQCAtMCwwICsxLDg1IEBACis7OzsgZW0t dHJhbXAtdGVzdHMuZWwgLS0tIGVtLXRyYW1wIHRlc3Qgc3VpdGUgIC0qLSBsZXhpY2FsLWJp bmRpbmc6dCAtKi0KKworOzsgQ29weXJpZ2h0IChDKSAyMDIyIEZyZWUgU29mdHdhcmUgRm91 bmRhdGlvbiwgSW5jLgorCis7OyBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgRW1hY3MuCisK Kzs7IEdOVSBFbWFjcyBpcyBmcmVlIHNvZnR3YXJlOiB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBp dCBhbmQvb3IgbW9kaWZ5Cis7OyBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5l cmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQorOzsgdGhlIEZyZWUgU29mdHdh cmUgRm91bmRhdGlvbiwgZWl0aGVyIHZlcnNpb24gMyBvZiB0aGUgTGljZW5zZSwgb3IKKzs7 IChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisKKzs7IEdOVSBFbWFjcyBp cyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorOzsg YnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2Fy cmFudHkgb2YKKzs7IE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VM QVIgUFVSUE9TRS4gIFNlZSB0aGUKKzs7IEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZv ciBtb3JlIGRldGFpbHMuCisKKzs7IFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkg b2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCis7OyBhbG9uZyB3aXRoIEdOVSBF bWFjcy4gIElmIG5vdCwgc2VlIDxodHRwczovL3d3dy5nbnUub3JnL2xpY2Vuc2VzLz4uCisK Kzs7OyBDb2RlOgorCisocmVxdWlyZSAnZXJ0KQorKHJlcXVpcmUgJ2VtLXRyYW1wKQorCiso ZXJ0LWRlZnRlc3QgZW0tdHJhbXAtdGVzdC9zdS1kZWZhdWx0ICgpCisgICJUZXN0IEVzaGVs bCBgc3UnIGNvbW1hbmQgd2l0aCBubyBhcmd1bWVudHMuIgorICAoc2hvdWxkIChlcXVhbAor ICAgICAgICAgICAoY2F0Y2ggJ2VzaGVsbC1yZXBsYWNlLWNvbW1hbmQgKGVzaGVsbC9zdSkp CisgICAgICAgICAgIGAoZXNoZWxsLXRyYXAtZXJyb3JzCisgICAgICAgICAgICAgKGVzaGVs bC1uYW1lZC1jb21tYW5kCisgICAgICAgICAgICAgICJjZCIKKyAgICAgICAgICAgICAgKGxp c3QgLChmb3JtYXQgIi9zdTpyb290QGxvY2FsaG9zdDolcyIgZGVmYXVsdC1kaXJlY3Rvcnkp KSkpKSkpCisKKyhlcnQtZGVmdGVzdCBlbS10cmFtcC10ZXN0L3N1LXVzZXIgKCkKKyAgIlRl c3QgRXNoZWxsIGBzdScgY29tbWFuZCB3aXRoIFVTRVIgYXJndW1lbnQuIgorICAoc2hvdWxk IChlcXVhbAorICAgICAgICAgICAoY2F0Y2ggJ2VzaGVsbC1yZXBsYWNlLWNvbW1hbmQgKGVz aGVsbC9zdSAiVVNFUiIpKQorICAgICAgICAgICBgKGVzaGVsbC10cmFwLWVycm9ycworICAg ICAgICAgICAgIChlc2hlbGwtbmFtZWQtY29tbWFuZAorICAgICAgICAgICAgICAiY2QiCisg ICAgICAgICAgICAgIChsaXN0ICwoZm9ybWF0ICIvc3U6VVNFUkBsb2NhbGhvc3Q6JXMiIGRl ZmF1bHQtZGlyZWN0b3J5KSkpKSkpKQorCisoZXJ0LWRlZnRlc3QgZW0tdHJhbXAtdGVzdC9z dS1sb2dpbiAoKQorICAiVGVzdCBFc2hlbGwgYHN1JyBjb21tYW5kIHdpdGggLS8tbC8tLWxv Z2luIG9wdGlvbi4iCisgIChkb2xpc3QgKGFyZ3MgJygoIi0tbG9naW4iKQorICAgICAgICAg ICAgICAgICAgKCItbCIpCisgICAgICAgICAgICAgICAgICAoIi0iKSkpCisgICAgKHNob3Vs ZCAoZXF1YWwKKyAgICAgICAgICAgICAoY2F0Y2ggJ2VzaGVsbC1yZXBsYWNlLWNvbW1hbmQg KGFwcGx5ICMnZXNoZWxsL3N1IGFyZ3MpKQorICAgICAgICAgICAgIGAoZXNoZWxsLXRyYXAt ZXJyb3JzCisgICAgICAgICAgICAgICAoZXNoZWxsLW5hbWVkLWNvbW1hbmQKKyAgICAgICAg ICAgICAgICAiY2QiCisgICAgICAgICAgICAgICAgKGxpc3QgIi9zdTpyb290QGxvY2FsaG9z dDp+LyIpKSkpKSkpCisKKyhkZWZ1biBtb2NrLWVzaGVsbC1uYW1lZC1jb21tYW5kICgmcmVz dCBhcmdzKQorICAiRHVtbXkgZnVuY3Rpb24gdG8gdGVzdCBFc2hlbGwgYHN1ZG8nIGNvbW1h bmQgcmV3cml0aW5nLiIKKyAgKGxpc3QgZGVmYXVsdC1kaXJlY3RvcnkgYXJncykpCisKKyhl cnQtZGVmdGVzdCBlbS10cmFtcC10ZXN0L3N1ZG8tYmFzaWMgKCkKKyAgIlRlc3QgRXNoZWxs IGBzdWRvJyBjb21tYW5kIHdpdGggZGVmYXVsdCB1c2VyLiIKKyAgKGNsLWxldGYgKCgoc3lt Ym9sLWZ1bmN0aW9uICdlc2hlbGwtbmFtZWQtY29tbWFuZCkKKyAgICAgICAgICAgICAjJ21v Y2stZXNoZWxsLW5hbWVkLWNvbW1hbmQpKQorICAgIChzaG91bGQgKGVxdWFsCisgICAgICAg ICAgICAgKGNhdGNoICdlc2hlbGwtZXh0ZXJuYWwgKGVzaGVsbC9zdWRvICJlY2hvIiAiaGki KSkKKyAgICAgICAgICAgICBgKCwoZm9ybWF0ICIvc3Vkbzpyb290QGxvY2FsaG9zdDolcyIg ZGVmYXVsdC1kaXJlY3RvcnkpCisgICAgICAgICAgICAgICAoImVjaG8iICgiaGkiKSkpKSkK KyAgICAoc2hvdWxkIChlcXVhbAorICAgICAgICAgICAgIChjYXRjaCAnZXNoZWxsLWV4dGVy bmFsIChlc2hlbGwvc3VkbyAiZWNobyIgIi11IiAiaGkiKSkKKyAgICAgICAgICAgICBgKCwo Zm9ybWF0ICIvc3Vkbzpyb290QGxvY2FsaG9zdDolcyIgZGVmYXVsdC1kaXJlY3RvcnkpCisg ICAgICAgICAgICAgICAoImVjaG8iICgiLXUiICJoaSIpKSkpKSkpCisKKyhlcnQtZGVmdGVz dCBlbS10cmFtcC10ZXN0L3N1ZG8tdXNlciAoKQorICAiVGVzdCBFc2hlbGwgYHN1ZG8nIGNv bW1hbmQgd2l0aCBzcGVjaWZpZWQgdXNlci4iCisgIChjbC1sZXRmICgoKHN5bWJvbC1mdW5j dGlvbiAnZXNoZWxsLW5hbWVkLWNvbW1hbmQpCisgICAgICAgICAgICAgIydtb2NrLWVzaGVs bC1uYW1lZC1jb21tYW5kKSkKKyAgICAoc2hvdWxkIChlcXVhbAorICAgICAgICAgICAgIChj YXRjaCAnZXNoZWxsLWV4dGVybmFsIChlc2hlbGwvc3VkbyAiLXUiICJVU0VSIiAiZWNobyIg ImhpIikpCisgICAgICAgICAgICAgYCgsKGZvcm1hdCAiL3N1ZG86VVNFUkBsb2NhbGhvc3Q6 JXMiIGRlZmF1bHQtZGlyZWN0b3J5KQorICAgICAgICAgICAgICAgKCJlY2hvIiAoImhpIikp KSkpCisgICAgKHNob3VsZCAoZXF1YWwKKyAgICAgICAgICAgICAoY2F0Y2ggJ2VzaGVsbC1l eHRlcm5hbCAoZXNoZWxsL3N1ZG8gIi11IiAiVVNFUiIgImVjaG8iICItdSIgImhpIikpCisg ICAgICAgICAgICAgYCgsKGZvcm1hdCAiL3N1ZG86VVNFUkBsb2NhbGhvc3Q6JXMiIGRlZmF1 bHQtZGlyZWN0b3J5KQorICAgICAgICAgICAgICAgKCJlY2hvIiAoIi11IiAiaGkiKSkpKSkp KQorCis7OzsgZW0tdHJhbXAtdGVzdHMuZWwgZW5kcyBoZXJlCmRpZmYgLS1naXQgYS90ZXN0 L2xpc3AvZXNoZWxsL2VzaC1vcHQtdGVzdHMuZWwgYi90ZXN0L2xpc3AvZXNoZWxsL2VzaC1v cHQtdGVzdHMuZWwKaW5kZXggYjc2ZWQ4ODY2ZC4uNDMzMWMwMmZmNSAxMDA2NDQKLS0tIGEv dGVzdC9saXNwL2VzaGVsbC9lc2gtb3B0LXRlc3RzLmVsCisrKyBiL3Rlc3QvbGlzcC9lc2hl bGwvZXNoLW9wdC10ZXN0cy5lbApAQCAtMjIsOCArMjIsOCBAQAogKHJlcXVpcmUgJ2VydCkK IChyZXF1aXJlICdlc2gtb3B0KQogCi0oZXJ0LWRlZnRlc3QgZXNoLW9wdC1wcm9jZXNzLWFy Z3MtdGVzdCAoKQotICAiVW5pdCB0ZXN0cyB3aGljaCB2ZXJpZnkgY29ycmVjdCBiZWhhdmlv ciBvZiBgZXNoZWxsLS1wcm9jZXNzLWFyZ3MnLiIKKyhlcnQtZGVmdGVzdCBlc2gtb3B0LXRl c3QvcHJvY2Vzcy1hcmdzICgpCisgICJUZXN0IGJlaGF2aW9yIG9mIGBlc2hlbGwtLXByb2Nl c3MtYXJncycuIgogICAoc2hvdWxkCiAgICAoZXF1YWwgJyh0KQogICAgICAgICAgIChlc2hl bGwtLXByb2Nlc3MtYXJncwpAQCAtMzUsNyArMzUsMTAgQEAgZXNoLW9wdC1wcm9jZXNzLWFy Z3MtdGVzdAogICAgICAgICAgIChlc2hlbGwtLXByb2Nlc3MtYXJncwogICAgICAgICAgICAi c3VkbyIgJygiLXUiICJyb290IiAid29ybGQiKQogICAgICAgICAgICAnKCg/dSAidXNlciIg dCB1c2VyCi0gICAgICAgICAgICAgICAgICJleGVjdXRlIGEgY29tbWFuZCBhcyBhbm90aGVy IFVTRVIiKSkpKSkKKyAgICAgICAgICAgICAgICAgImV4ZWN1dGUgYSBjb21tYW5kIGFzIGFu b3RoZXIgVVNFUiIpKSkpKSkKKworKGVydC1kZWZ0ZXN0IGVzaC1vcHQtdGVzdC9wcm9jZXNz LWFyZ3MtcGFyc2UtbGVhZGluZy1vcHRpb25zLW9ubHkgKCkKKyAgIlRlc3QgYmVoYXZpb3Ig b2YgOnBhcnNlLWxlYWRpbmctb3B0aW9ucy1vbmx5IGluIGBlc2hlbGwtLXByb2Nlc3MtYXJn cycuIgogICAoc2hvdWxkCiAgICAoZXF1YWwgJyhuaWwgImVtZXJnZSIgIi11RE4iICJ3b3Js ZCIpCiAgICAgICAgICAgKGVzaGVsbC0tcHJvY2Vzcy1hcmdzCkBAIC01NSw5ICs1OCwxMCBA QCBlc2gtb3B0LXByb2Nlc3MtYXJncy10ZXN0CiAgICAgICAgICAgKGVzaGVsbC0tcHJvY2Vz cy1hcmdzCiAgICAgICAgICAgICJzdWRvIiAnKCItdSIgInJvb3QiICJlbWVyZ2UiICItdURO IiAid29ybGQiKQogICAgICAgICAgICAnKCg/dSAidXNlciIgdCB1c2VyCi0gICAgICAgICAg ICAgICAgICJleGVjdXRlIGEgY29tbWFuZCBhcyBhbm90aGVyIFVTRVIiKSkpKSkKKyAgICAg ICAgICAgICAgICAgImV4ZWN1dGUgYSBjb21tYW5kIGFzIGFub3RoZXIgVVNFUiIpKSkpKSkK IAotICA7OyBUZXN0IDpleHRlcm5hbC4KKyhlcnQtZGVmdGVzdCBlc2gtb3B0LXRlc3QvcHJv Y2Vzcy1hcmdzLWV4dGVybmFsICgpCisgICJUZXN0IGJlaGF2aW9yIG9mIDpleHRlcm5hbCBp biBgZXNoZWxsLS1wcm9jZXNzLWFyZ3MnLiIKICAgKGNsLWxldGYgKCgoc3ltYm9sLWZ1bmN0 aW9uICdlc2hlbGwtc2VhcmNoLXBhdGgpICMnaWdub3JlKSkKICAgICAoc2hvdWxkCiAgICAg IChlcXVhbCAnKG5pbCAiL3NvbWUvcGF0aCIpCkBAIC04NSw5ICs4OSw4IEBAIGVzaC1vcHQt cHJvY2Vzcy1hcmdzLXRlc3QKICAgICAgICAgOmV4dGVybmFsICJscyIpKQogICAgICA6dHlw ZSAnZXJyb3IpKSkKIAotKGVydC1kZWZ0ZXN0IHRlc3QtZXNoZWxsLWV2YWwtdXNpbmctb3B0 aW9ucyAoKQotICAiVGVzdHMgZm9yIGBlc2hlbGwtZXZhbC11c2luZy1vcHRpb25zJy4iCi0g IDs7IFRlc3Qgc2hvcnQgb3B0aW9ucy4KKyhlcnQtZGVmdGVzdCBlc2gtb3B0LXRlc3QvZXZh bC11c2luZy1vcHRpb25zLXNob3J0ICgpCisgICJUZXN0IGBlc2hlbGwtZXZhbC11c2luZy1v cHRpb25zJyB3aXRoIHNob3J0IG9wdGlvbnMuIgogICAoZXNoZWxsLWV2YWwtdXNpbmctb3B0 aW9ucwogICAgImxzIiAnKCItYSIgIi9zb21lL3BhdGgiKQogICAgJygoP2EgImFsbCIgbmls IHNob3ctYWxsCkBAIC05OSwxNyArMTAyLDE5IEBAIHRlc3QtZXNoZWxsLWV2YWwtdXNpbmct b3B0aW9ucwogICAgJygoP2EgImFsbCIgbmlsIHNob3ctYWxsCiAgICAgICAgICAiZG8gbm90 IGlnbm9yZSBlbnRyaWVzIHN0YXJ0aW5nIHdpdGggLiIpKQogICAgKHNob3VsZCAoZXEgc2hv dy1hbGwgbmlsKSkKLSAgIChzaG91bGQgKGVxdWFsIGFyZ3MgJygiL3NvbWUvcGF0aCIpKSkp CisgICAoc2hvdWxkIChlcXVhbCBhcmdzICcoIi9zb21lL3BhdGgiKSkpKSkKIAotICA7OyBU ZXN0IGxvbmcgb3B0aW9ucy4KKyhlcnQtZGVmdGVzdCBlc2gtb3B0LXRlc3QvZXZhbC11c2lu Zy1vcHRpb25zLWxvbmcgKCkKKyAgIlRlc3QgYGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMn IHdpdGggbG9uZyBvcHRpb25zLiIKICAgKGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMKICAg ICJscyIgJygiLS1hbGwiICIvc29tZS9wYXRoIikKICAgICcoKD9hICJhbGwiIG5pbCBzaG93 LWFsbAogICAgICAgICAgImRvIG5vdCBpZ25vcmUgZW50cmllcyBzdGFydGluZyB3aXRoIC4i KSkKICAgIChzaG91bGQgKGVxIHNob3ctYWxsIHQpKQotICAgKHNob3VsZCAoZXF1YWwgYXJn cyAnKCIvc29tZS9wYXRoIikpKSkKKyAgIChzaG91bGQgKGVxdWFsIGFyZ3MgJygiL3NvbWUv cGF0aCIpKSkpKQogCi0gIDs7IFRlc3Qgb3B0aW9ucyB3aXRoIGNvbnN0YW50IHZhbHVlcy4K KyhlcnQtZGVmdGVzdCBlc2gtb3B0LXRlc3QvZXZhbC11c2luZy1vcHRpb25zLWNvbnN0YW50 ICgpCisgICJUZXN0IGBlc2hlbGwtZXZhbC11c2luZy1vcHRpb25zJyB3aXRoIG9wdGlvbnMg d2l0aCBjb25zdGFudCB2YWx1ZXMuIgogICAoZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9ucwog ICAgImxzIiAnKCIvc29tZS9wYXRoIiAiLWgiKQogICAgJygoP2ggImh1bWFuLXJlYWRhYmxl IiAxMDI0IGh1bWFuLXJlYWRhYmxlCkBAIC0xMjcsOSArMTMyLDEwIEBAIHRlc3QtZXNoZWxs LWV2YWwtdXNpbmctb3B0aW9ucwogICAgJygoP2ggImh1bWFuLXJlYWRhYmxlIiAxMDI0IGh1 bWFuLXJlYWRhYmxlCiAgICAgICAgICAicHJpbnQgc2l6ZXMgaW4gaHVtYW4gcmVhZGFibGUg Zm9ybWF0IikpCiAgICAoc2hvdWxkIChlcSBodW1hbi1yZWFkYWJsZSBuaWwpKQotICAgKHNo b3VsZCAoZXF1YWwgYXJncyAnKCIvc29tZS9wYXRoIikpKSkKKyAgIChzaG91bGQgKGVxdWFs IGFyZ3MgJygiL3NvbWUvcGF0aCIpKSkpKQogCi0gIDs7IFRlc3Qgb3B0aW9ucyB3aXRoIHVz ZXItc3BlY2lmaWVkIHZhbHVlcy4KKyhlcnQtZGVmdGVzdCBlc2gtb3B0LXRlc3QvZXZhbC11 c2luZy1vcHRpb25zLXVzZXItc3BlY2lmaWVkICgpCisgICJUZXN0IGBlc2hlbGwtZXZhbC11 c2luZy1vcHRpb25zJyB3aXRoIG9wdGlvbnMgd2l0aCB1c2VyLXNwZWNpZmllZCB2YWx1ZXMu IgogICAoZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9ucwogICAgImxzIiAnKCItSSIgIioudHh0 IiAiL3NvbWUvcGF0aCIpCiAgICAnKCg/SSAiaWdub3JlIiB0IGlnbm9yZS1wYXR0ZXJuCkBA IC0xNTMsOSArMTU5LDEwIEBAIHRlc3QtZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9ucwogICAg JygoP0kgImlnbm9yZSIgdCBpZ25vcmUtcGF0dGVybgogICAgICAgICAgImRvIG5vdCBsaXN0 IGltcGxpZWQgZW50cmllcyBtYXRjaGluZyBwYXR0ZXJuIikpCiAgICAoc2hvdWxkIChlcXVh bCBpZ25vcmUtcGF0dGVybiAiKi50eHQiKSkKLSAgIChzaG91bGQgKGVxdWFsIGFyZ3MgJygi L3NvbWUvcGF0aCIpKSkpCisgICAoc2hvdWxkIChlcXVhbCBhcmdzICcoIi9zb21lL3BhdGgi KSkpKSkKIAotICA7OyBUZXN0IG11bHRpcGxlIHNob3J0IG9wdGlvbnMgaW4gYSBzaW5nbGUg dG9rZW4uCisoZXJ0LWRlZnRlc3QgZXNoLW9wdC10ZXN0L2V2YWwtdXNpbmctb3B0aW9ucy1z aG9ydC1zaW5nbGUtdG9rZW4gKCkKKyAgIlRlc3QgYGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlv bnMnIHdpdGggbXVsdGlwbGUgc2hvcnQgb3B0aW9ucyBpbiBvbmUgdG9rZW4uIgogICAoZXNo ZWxsLWV2YWwtdXNpbmctb3B0aW9ucwogICAgImxzIiAnKCItYWwiICIvc29tZS9wYXRoIikK ICAgICcoKD9hICJhbGwiIG5pbCBzaG93LWFsbApAQCAtMTczLDkgKzE4MCwxMCBAQCB0ZXN0 LWVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMKICAgICAgICAgICJkbyBub3QgbGlzdCBpbXBs aWVkIGVudHJpZXMgbWF0Y2hpbmcgcGF0dGVybiIpKQogICAgKHNob3VsZCAoZXEgdCBzaG93 LWFsbCkpCiAgICAoc2hvdWxkIChlcXVhbCBpZ25vcmUtcGF0dGVybiAiKi50eHQiKSkKLSAg IChzaG91bGQgKGVxdWFsIGFyZ3MgJygiL3NvbWUvcGF0aCIpKSkpCisgICAoc2hvdWxkIChl cXVhbCBhcmdzICcoIi9zb21lL3BhdGgiKSkpKSkKIAotICA7OyBUZXN0IHRoYXQgIi0tIiB0 ZXJtaW5hdGVzIG9wdGlvbnMuCisoZXJ0LWRlZnRlc3QgZXNoLW9wdC10ZXN0L2V2YWwtdXNp bmctb3B0aW9ucy10ZXJtaW5hdGUtb3B0aW9ucyAoKQorICAiVGVzdCB0aGF0IFwiLS1cIiB0 ZXJtaW5hdGVzIG9wdGlvbnMgaW4gYGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMnLiIKICAg KGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMKICAgICJscyIgJygiLS0iICItYSIpCiAgICAn KCg/YSAiYWxsIiBuaWwgc2hvdy1hbGwKQEAgLTE4Nyw5ICsxOTUsMTAgQEAgdGVzdC1lc2hl bGwtZXZhbC11c2luZy1vcHRpb25zCiAgICAnKCg/YSAiYWxsIiBuaWwgc2hvdy1hbGwKICAg ICAgICAgICJkbyBub3QgaWdub3JlIGVudHJpZXMgc3RhcnRpbmcgd2l0aCAuIikpCiAgICAo c2hvdWxkIChlcSBzaG93LWFsbCBuaWwpKQotICAgKHNob3VsZCAoZXF1YWwgYXJncyAnKCIt LWFsbCIpKSkpCisgICAoc2hvdWxkIChlcXVhbCBhcmdzICcoIi0tYWxsIikpKSkpCiAKLSAg OzsgVGVzdCA6cGFyc2UtbGVhZGluZy1vcHRpb25zLW9ubHkuCisoZXJ0LWRlZnRlc3QgZXNo LW9wdC10ZXN0L2V2YWwtdXNpbmctb3B0aW9ucy1wYXJzZS1sZWFkaW5nLW9wdGlvbnMtb25s eSAoKQorICAiVGVzdCA6cGFyc2UtbGVhZGluZy1vcHRpb25zLW9ubHkgaW4gYGVzaGVsbC1l dmFsLXVzaW5nLW9wdGlvbnMnLiIKICAgKGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMKICAg ICJzdWRvIiAnKCItdSIgInJvb3QiICJ3aG9hbWkiKQogICAgJygoP3UgInVzZXIiIHQgdXNl ciAiZXhlY3V0ZSBhIGNvbW1hbmQgYXMgYW5vdGhlciBVU0VSIikKQEAgLTIxMiwyNyArMjIx LDQ3IEBAIHRlc3QtZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9ucwogICAgJygoP3UgInVzZXIi IHQgdXNlciAiZXhlY3V0ZSBhIGNvbW1hbmQgYXMgYW5vdGhlciBVU0VSIikKICAgICAgOnBh cnNlLWxlYWRpbmctb3B0aW9ucy1vbmx5KQogICAgKHNob3VsZCAoZXEgdXNlciBuaWwpKQot ICAgKHNob3VsZCAoZXF1YWwgYXJncyAnKCJlbWVyZ2UiICItdUROIiAid29ybGQiKSkpKQor ICAgKHNob3VsZCAoZXF1YWwgYXJncyAnKCJlbWVyZ2UiICItdUROIiAid29ybGQiKSkpKSkK IAotICA7OyBUZXN0IHVucmVjb2duaXplZCBvcHRpb25zLgorKGVydC1kZWZ0ZXN0IGVzaC1v cHQtdGVzdC9ldmFsLXVzaW5nLW9wdGlvbnMtdW5yZWNvZ25pemVkICgpCisgICJUZXN0IGBl c2hlbGwtZXZhbC11c2luZy1vcHRpb25zJyB3aXRoIHVucmVjb2duaXplZCBvcHRpb25zLiIK ICAgKHNob3VsZC1lcnJvcgogICAgKGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMKICAgICAi bHMiICcoIi11IiAiL3NvbWUvcGF0aCIpCi0gICAgJygoP2EgImFsbCIgbmlsIHNob3ctYWxs Ci0gICAgICAgICAgImRvIG5vdCBpZ25vcmUgZW50cmllcyBzdGFydGluZyB3aXRoIC4iKSkK LSAgICAoaWdub3JlIHNob3ctYWxsKSkpCisgICAgJygoP2EgImFsbCIgbmlsIF9zaG93LWFs bAorICAgICAgICAgICJkbyBub3QgaWdub3JlIGVudHJpZXMgc3RhcnRpbmcgd2l0aCAuIikp KSkKICAgKHNob3VsZC1lcnJvcgogICAgKGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMKICAg ICAibHMiICcoIi1hdSIgIi9zb21lL3BhdGgiKQotICAgICcoKD9hICJhbGwiIG5pbCBzaG93 LWFsbAotICAgICAgICAgICJkbyBub3QgaWdub3JlIGVudHJpZXMgc3RhcnRpbmcgd2l0aCAu IikpCi0gICAgKGlnbm9yZSBzaG93LWFsbCkpKQorICAgICcoKD9hICJhbGwiIG5pbCBfc2hv dy1hbGwKKyAgICAgICAgICAiZG8gbm90IGlnbm9yZSBlbnRyaWVzIHN0YXJ0aW5nIHdpdGgg LiIpKSkpCiAgIChzaG91bGQtZXJyb3IKICAgIChlc2hlbGwtZXZhbC11c2luZy1vcHRpb25z CiAgICAgImxzIiAnKCItLXVucmVjb2duaXplZCIgIi9zb21lL3BhdGgiKQotICAgICcoKD9h ICJhbGwiIG5pbCBzaG93LWFsbAotICAgICAgICAgICJkbyBub3QgaWdub3JlIGVudHJpZXMg c3RhcnRpbmcgd2l0aCAuIikpCi0gICAgKGlnbm9yZSBzaG93LWFsbCkpKSkKKyAgICAnKCg/ YSAiYWxsIiBuaWwgX3Nob3ctYWxsCisgICAgICAgICAgImRvIG5vdCBpZ25vcmUgZW50cmll cyBzdGFydGluZyB3aXRoIC4iKSkpKSkKKworKGVydC1kZWZ0ZXN0IGVzaC1vcHQtdGVzdC9l dmFsLXVzaW5nLW9wdGlvbnMtZXh0ZXJuYWwgKCkKKyAgIlRlc3QgOmV4dGVybmFsIGluIGBl c2hlbGwtZXZhbC11c2luZy1vcHRpb25zJy4iCisgIChjbC1sZXRmICgoKHN5bWJvbC1mdW5j dGlvbiAnZXNoZWxsLXNlYXJjaC1wYXRoKSAjJ2lkZW50aXR5KQorICAgICAgICAgICAgKChz eW1ib2wtZnVuY3Rpb24gJ2VzaGVsbC1leHRlcm5hbC1jb21tYW5kKSAjJ2xpc3QpKQorICAg IChzaG91bGQKKyAgICAgKGVxdWFsIChjYXRjaCAnZXNoZWxsLWV4dGVybmFsCisgICAgICAg ICAgICAgIChlc2hlbGwtZXZhbC11c2luZy1vcHRpb25zCisgICAgICAgICAgICAgICAibHMi ICcoIi9zb21lL3BhdGgiICItdSIpCisgICAgICAgICAgICAgICAnKCg/YSAiYWxsIiBuaWwg X3Nob3ctYWxsCisgICAgICAgICAgICAgICAgICAgICAiZG8gbm90IGlnbm9yZSBlbnRyaWVz IHN0YXJ0aW5nIHdpdGggLiIpCisgICAgICAgICAgICAgICAgIDpleHRlcm5hbCAibHMiKSkp CisgICAgICAgICAgICAnKCJscyIgKCIvc29tZS9wYXRoIiAiLXUiKSkpKQorICAgIChzaG91 bGQKKyAgICAgKGVxdWFsIChjYXRjaCAnZXNoZWxsLWV4dGVybmFsCisgICAgICAgICAgICAg IChlc2hlbGwtZXZhbC11c2luZy1vcHRpb25zCisgICAgICAgICAgICAgICAibHMiICcoIi9z b21lL3BhdGgyIiAiLXUiKQorICAgICAgICAgICAgICAgJygoP2EgImFsbCIgbmlsIF9zaG93 LWFsbAorICAgICAgICAgICAgICAgICAgICAgImRvIG5vdCBpZ25vcmUgZW50cmllcyBzdGFy dGluZyB3aXRoIC4iKQorICAgICAgICAgICAgICAgICA6cHJlc2VydmUtYXJncworICAgICAg ICAgICAgICAgICA6ZXh0ZXJuYWwgImxzIikpKQorICAgICAgICAgICAgJygibHMiICgiL3Nv bWUvcGF0aDIiICItdSIpKSkpKSkKIAogKHByb3ZpZGUgJ2VzaC1vcHQtdGVzdHMpCiAKLS0g CjIuMjUuMQoK --------------0A9AA694C2327F21B8C6E688 Content-Type: text/plain; charset=UTF-8; name="0002-Treat-as-a-positional-arg-in-eshell-eval-using-optio.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0002-Treat-as-a-positional-arg-in-eshell-eval-using-optio.pa"; filename*1="tch" RnJvbSAyMWQxYjcyNzQxM2U4NjQ5NDM2NDMxODA2ZWM2YTI3MzFjOWZkMjhiIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IE1vbiwgMjQgSmFuIDIwMjIgMjE6MDg6NTAgLTA4MDAKU3ViamVjdDogW1BB VENIIDIvMl0gVHJlYXQgIi0iIGFzIGEgcG9zaXRpb25hbCBhcmcgaW4KICdlc2hlbGwtZXZh bC11c2luZy1vcHRpb25zJwoKKiBsaXNwL2VzaGVsbC9lc2gtb3B0LmVsIChlc2hlbGwtLXBy b2Nlc3MtYXJncyk6IFRyZWF0ICItIiBhcyBhCnBvc2l0aW9uYWwgYXJnLgoKKiBsaXNwL2Vz aGVsbC9lbS10cmFtcC5lbCAoZXNoZWxsL3N1KTogU2ltcGxpZnkgY2hlY2tpbmcgZm9yICIt Ii4KCiogdGVzdC9saXNwL2VzaGVsbC9lc2gtb3B0LXRlc3RzLmVsCihlc2gtb3B0LXRlc3Qv ZXZhbC11c2luZy1vcHRpb25zLXN0ZGluKTogTmV3IHRlc3QuCi0tLQogbGlzcC9lc2hlbGwv ZW0tdHJhbXAuZWwgICAgICAgICAgIHwgIDkgKystLS0tLS0tCiBsaXNwL2VzaGVsbC9lc2gt b3B0LmVsICAgICAgICAgICAgfCAgOSArKysrKystLS0KIHRlc3QvbGlzcC9lc2hlbGwvZXNo LW9wdC10ZXN0cy5lbCB8IDIxICsrKysrKysrKysrKysrKysrKysrKwogMyBmaWxlcyBjaGFu Z2VkLCAyOSBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9s aXNwL2VzaGVsbC9lbS10cmFtcC5lbCBiL2xpc3AvZXNoZWxsL2VtLXRyYW1wLmVsCmluZGV4 IDc5MTQ1ODgyMmQuLjJhZmQ0ZmUwNjYgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VtLXRy YW1wLmVsCisrKyBiL2xpc3AvZXNoZWxsL2VtLXRyYW1wLmVsCkBAIC01NywxMyArNTcsMTIg QEAgZXNoZWxsLXRyYW1wLWluaXRpYWxpemUKIAogKGF1dG9sb2FkICdlc2hlbGwtcGFyc2Ut Y29tbWFuZCAiZXNoLWNtZCIpCiAKLShkZWZ1biBlc2hlbGwvc3UgKCZyZXN0IGFyZ3VtZW50 cykKKyhkZWZ1biBlc2hlbGwvc3UgKCZyZXN0IGFyZ3MpCiAgICJBbGlhcyBcInN1XCIgdG8g Y2FsbCBUUkFNUC4KIAogVXNlcyB0aGUgc3lzdGVtIHN1IHRocm91Z2ggVFJBTVAncyBzdSBt ZXRob2QuIgotICAoc2V0cSBhcmd1bWVudHMgKGVzaGVsbC1zdHJpbmdpZnktbGlzdCAoZmxh dHRlbi10cmVlIGFyZ3VtZW50cykpKQogICAoZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9ucwot ICAgInN1IiBhcmd1bWVudHMKKyAgICJzdSIgYXJncwogICAgJygoP2ggImhlbHAiIG5pbCBu aWwgInNob3cgdGhpcyB1c2FnZSBzY3JlZW4iKQogICAgICAoP2wgImxvZ2luIiBuaWwgbG9n aW4gInByb3ZpZGUgYSBsb2dpbiBlbnZpcm9ubWVudCIpCiAgICAgICg/ICBuaWwgbmlsIGxv Z2luICJwcm92aWRlIGEgbG9naW4gZW52aXJvbm1lbnQiKQpAQCAtNzcsMTAgKzc2LDYgQEAg ZXNoZWxsL3N1CiAgICAgICAgICAgICAgICAgKHByZWZpeCAoZmlsZS1yZW1vdGUtcCBkZWZh dWx0LWRpcmVjdG9yeSkpKQogICAgICAgICAgICAgKGRvbGlzdCAoYXJnIGFyZ3MpCiAgICAg ICAgICAgICAgIChpZiAoc3RyaW5nLWVxdWFsIGFyZyAiLSIpIChzZXRxIGxvZ2luIHQpIChz ZXRxIHVzZXIgYXJnKSkpCi0gICAgICAgICAgICA7OyBgZXNoZWxsLWV2YWwtdXNpbmctb3B0 aW9ucycgdHJpZXMgdG8gaGFuZGxlICItIiBhcyBhCi0gICAgICAgICAgICA7OyBzaG9ydCBv cHRpb247IGRvdWJsZS1jaGVjayB3aGV0aGVyIHRoZSBvcmlnaW5hbAotICAgICAgICAgICAg OzsgYXJndW1lbnRzIGluY2x1ZGUgaXQuCi0gICAgICAgICAgICAod2hlbiAobWVtYmVyICIt IiBhcmd1bWVudHMpIChzZXRxIGxvZ2luIHQpKQogICAgICAgICAgICAgKHdoZW4gbG9naW4g KHNldHEgZGlyICJ+LyIpKQogICAgICAgICAgICAgKGlmIChhbmQgcHJlZml4CiAgICAgICAg ICAgICAgICAgICAgICAob3IKZGlmZiAtLWdpdCBhL2xpc3AvZXNoZWxsL2VzaC1vcHQuZWwg Yi9saXNwL2VzaGVsbC9lc2gtb3B0LmVsCmluZGV4IDhjMjlmZmY4MDkuLjA5NjFlMjE0ZjQg MTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VzaC1vcHQuZWwKKysrIGIvbGlzcC9lc2hlbGwv ZXNoLW9wdC5lbApAQCAtMjgzLDYgKzI4Myw5IEBAIGVzaGVsbC0tcHJvY2Vzcy1hcmdzCiAg ICAgICAgICAgICAgICAgICAgICAgICAgIChtZW1xIDpwYXJzZS1sZWFkaW5nLW9wdGlvbnMt b25seSBvcHRpb25zKSkpKQogICAgICAgKHNldHEgYXJnIChudGggYWkgZXNoZWxsLS1hcmdz KSkKICAgICAgIChpZiAobm90IChhbmQgKHN0cmluZ3AgYXJnKQorICAgICAgICAgICAgICAg ICAgICA7OyBBIHN0cmluZyBvZiBsZW5ndGggMSBjYW4ndCBiZSBhbiBvcHRpb247IChpZgor ICAgICAgICAgICAgICAgICAgICA7OyBpdCdzICItIiwgdGhhdCBnZW5lcmFsbHkgbWVhbnMg c3RkaW4pLgorICAgICAgICAgICAgICAgICAgICAoPiAobGVuZ3RoIGFyZykgMSkKIAkJICAg IChzdHJpbmctbWF0Y2ggIl4tXFwoLVxcKT9cXCguKlxcKSIgYXJnKSkpCiAgICAgICAgICAg OzsgUG9zaXRpb25hbCBhcmd1bWVudCBmb3VuZCwgc2tpcAogCSAgKHNldHEgYWkgKDErIGFp KQpAQCAtMjk1LDkgKzI5OCw5IEBAIGVzaGVsbC0tcHJvY2Vzcy1hcmdzCiAJICAgICAgKGlm ICg+IChsZW5ndGggc3dpdGNoKSAwKQogCQkgIChlc2hlbGwtLXByb2Nlc3Mtb3B0aW9uIG5h bWUgc3dpdGNoIDEgYWkgb3B0aW9ucyBvcHQtdmFscykKIAkJKHNldHEgYWkgKGxlbmd0aCBl c2hlbGwtLWFyZ3MpKSkKLQkgICAgICAod2hpbGUgKD4gKGxlbmd0aCBzd2l0Y2gpIDApCi0J CShzZXRxIHN3aXRjaCAoZXNoZWxsLS1wcm9jZXNzLW9wdGlvbiBuYW1lIHN3aXRjaCAwCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFp IG9wdGlvbnMgb3B0LXZhbHMpKSkpKSkpCisJICAgICh3aGlsZSAoPiAobGVuZ3RoIHN3aXRj aCkgMCkKKwkgICAgICAoc2V0cSBzd2l0Y2ggKGVzaGVsbC0tcHJvY2Vzcy1vcHRpb24gbmFt ZSBzd2l0Y2ggMAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgYWkgb3B0aW9ucyBvcHQtdmFscykpKSkpKSkKICAgICAobmNvbmMgKG1hcGNh ciAjJ2NkciBvcHQtdmFscykgZXNoZWxsLS1hcmdzKSkpCiAKIChwcm92aWRlICdlc2gtb3B0 KQpkaWZmIC0tZ2l0IGEvdGVzdC9saXNwL2VzaGVsbC9lc2gtb3B0LXRlc3RzLmVsIGIvdGVz dC9saXNwL2VzaGVsbC9lc2gtb3B0LXRlc3RzLmVsCmluZGV4IDQzMzFjMDJmZjUuLjViMzBk ZTQxNGEgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9lc2hlbGwvZXNoLW9wdC10ZXN0cy5lbAor KysgYi90ZXN0L2xpc3AvZXNoZWxsL2VzaC1vcHQtdGVzdHMuZWwKQEAgLTE4Miw2ICsxODIs MjcgQEAgZXNoLW9wdC10ZXN0L2V2YWwtdXNpbmctb3B0aW9ucy1zaG9ydC1zaW5nbGUtdG9r ZW4KICAgIChzaG91bGQgKGVxdWFsIGlnbm9yZS1wYXR0ZXJuICIqLnR4dCIpKQogICAgKHNo b3VsZCAoZXF1YWwgYXJncyAnKCIvc29tZS9wYXRoIikpKSkpCiAKKyhlcnQtZGVmdGVzdCBl c2gtb3B0LXRlc3QvZXZhbC11c2luZy1vcHRpb25zLXN0ZGluICgpCisgICJUZXN0IHRoYXQg XCItXCIgaXMgYSBwb3NpdGlvbmFsIGFyZyBpbiBgZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9u cycuIgorICAoZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9ucworICAgImNhdCIgJygiLSIpCisg ICAnKCg/QSAic2hvdy1hbGwiIG5pbCBzaG93LWFsbAorICAgICAgICAgInNob3cgYWxsIGNo YXJhY3RlcnMiKSkKKyAgIChzaG91bGQgKGVxIHNob3ctYWxsIG5pbCkpCisgICAoc2hvdWxk IChlcXVhbCBhcmdzICcoIi0iKSkpKQorICAoZXNoZWxsLWV2YWwtdXNpbmctb3B0aW9ucwor ICAgImNhdCIgJygiLUEiICItIikKKyAgICcoKD9BICJzaG93LWFsbCIgbmlsIHNob3ctYWxs CisgICAgICAgICAic2hvdyBhbGwgY2hhcmFjdGVycyIpKQorICAgKHNob3VsZCAoZXEgc2hv dy1hbGwgdCkpCisgICAoc2hvdWxkIChlcXVhbCBhcmdzICcoIi0iKSkpKQorICAoZXNoZWxs LWV2YWwtdXNpbmctb3B0aW9ucworICAgImNhdCIgJygiLSIgIi1BIikKKyAgICcoKD9BICJz aG93LWFsbCIgbmlsIHNob3ctYWxsCisgICAgICAgICAic2hvdyBhbGwgY2hhcmFjdGVycyIp KQorICAgKHNob3VsZCAoZXEgc2hvdy1hbGwgdCkpCisgICAoc2hvdWxkIChlcXVhbCBhcmdz ICcoIi0iKSkpKSkKKwogKGVydC1kZWZ0ZXN0IGVzaC1vcHQtdGVzdC9ldmFsLXVzaW5nLW9w dGlvbnMtdGVybWluYXRlLW9wdGlvbnMgKCkKICAgIlRlc3QgdGhhdCBcIi0tXCIgdGVybWlu YXRlcyBvcHRpb25zIGluIGBlc2hlbGwtZXZhbC11c2luZy1vcHRpb25zJy4iCiAgIChlc2hl bGwtZXZhbC11c2luZy1vcHRpb25zCi0tIAoyLjI1LjEKCg== --------------0A9AA694C2327F21B8C6E688-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 25 01:29:28 2022 Received: (at 53517) by debbugs.gnu.org; 25 Jan 2022 06:29:28 +0000 Received: from localhost ([127.0.0.1]:46719 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCFKa-0001Da-J5 for submit@debbugs.gnu.org; Tue, 25 Jan 2022 01:29:28 -0500 Received: from mail-pf1-f177.google.com ([209.85.210.177]:36814) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCFKY-0001DN-PF for 53517@debbugs.gnu.org; Tue, 25 Jan 2022 01:29:27 -0500 Received: by mail-pf1-f177.google.com with SMTP id 192so15233687pfz.3 for <53517@debbugs.gnu.org>; Mon, 24 Jan 2022 22:29:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:from:to:references:message-id:date:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=WIjfKoxRBrhCTDqgC9qDnoamU2TAAlcTZZc7/nvUeTo=; b=dLLjRn6IdF+gEyqYRELiHMnGD9Dn1Nl94fhsXQ4jPywyzEtpipcO+p6MZRUeQmQHeY y50OKCs684jaZlEAC20BdHc2Qw9ShybzhvkG9rhFObjqcFjnKh5J1IgSpEAkSheVn57v uERZeEy6R187hhC0yLqFMtLWKn8Htr7A2DAWnWur3E2tFwbpr3GBafS00ifDyD6sO/ir N2V4jyBmSc3d7xOXFq83tH5Jsd+FLLYPFkv3BdDkeRnYnMRgojVMcIJWVoCoGYy+k6Iv vgaIT7kRolQWNth5xJe0ePcC3lb/r142qq8x3wYiDQ4UDCtUDy+Pd2rcjjaK1iY/zdmx 78GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:from:to:references:message-id:date :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=WIjfKoxRBrhCTDqgC9qDnoamU2TAAlcTZZc7/nvUeTo=; b=VAaY9FqXah9e5lgJDzx+5hXXGhaxjmsxB2KMgD9ngNSn65MbpnVJ+d5QY8MKkUaRwI C33xcf11jbz0ysYNBrprqOfmCKIRDG0KcrYBhZWruI8/bK+6vLwcRi1f6mAl4fi6rwOb eI99tEI/sKW6yMc4mFKhWxfiGMo8WKcIupF0TNkM2myWlGi08faW0mZ61VDuJwd8lwk8 bvWu6OC0TH2GojPMtP8sIkoxPmx81Pq09xXKsJY1IrXXXPj8+TzLKlCTUS9mBGodSb3g 4mXH09/es31cBB2soGgTVO4kzAY4Mi2qRNNqH/Ftrt4PnAMko8DM9MOp6i6zS9bFyGYa XjRw== X-Gm-Message-State: AOAM533ux+Vlb83VlRpJb+ihKtwVgCN95Ydfb0MN37cBrjjrejngkqas wE4Sx6pItAxJxqN4Jovfc2QNFKvLcUsxOw== X-Google-Smtp-Source: ABdhPJzOMwrpkP4a07ACNQeaRabvSCj2HZK0PTGzLJf9Hoovtcok2l0N2GnGXwK1yE/lMOLmY+FBIA== X-Received: by 2002:a65:460d:: with SMTP id v13mr14269319pgq.373.1643092160816; Mon, 24 Jan 2022 22:29:20 -0800 (PST) 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 y191sm1486032pfb.114.2022.01.24.22.29.19 for <53517@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Jan 2022 22:29:20 -0800 (PST) Subject: Re: bug#53517: 29.0.50; [PATCH] `eshell-eval-using-options' :preserve-args breaks :external handling in some cases From: Jim Porter To: 53517@debbugs.gnu.org References: <31760ab2-2f47-dacd-0a9f-6a0bddced866@gmail.com> <58d11a94-52ac-9df0-7e1c-7dea7e8cfe58@gmail.com> Message-ID: <55ffc6fb-f109-f849-5533-7ff56b8187cf@gmail.com> Date: Mon, 24 Jan 2022 22:29:20 -0800 MIME-Version: 1.0 In-Reply-To: <58d11a94-52ac-9df0-7e1c-7dea7e8cfe58@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 53517 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 1/24/2022 9:19 PM, Jim Porter wrote: > On 1/24/2022 5:11 PM, Jim Porter wrote: >> (It might be nice to fix that too, but I think it's still useful to >> keep the original raw args around unchanged. Improving "-" support >> could be done later.) > > Actually, I'll do that now. Doing so fixes an issue I found in the > implementation of `eshell/cat'. "cat -" should read from stdin (and the > Eshell implementation should use the external /bin/cat to do this), but > it was getting parsed as "cat", so it erroneously thought there were > *no* input files. Just a note: `cat' with no args *should* read from stdin, but this doesn't actually work in Eshell yet; to read from stdin, you need to explicitly say "cat -" or "*cat". I plan to fix these bits in a separate bug, since I have a WIP patch series to allow piping to Lisp functions in Eshell. That involves rewriting most of `eshell/cat', so I figured I may as well just fix it once (later) instead of twice. From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 25 07:31:03 2022 Received: (at 53517) by debbugs.gnu.org; 25 Jan 2022 12:31:04 +0000 Received: from localhost ([127.0.0.1]:47242 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCKyV-0001ra-7t for submit@debbugs.gnu.org; Tue, 25 Jan 2022 07:31:03 -0500 Received: from quimby.gnus.org ([95.216.78.240]:34542) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCKyR-0001jD-BE for 53517@debbugs.gnu.org; Tue, 25 Jan 2022 07:30:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=q8JL2S2WEVanqILq3MuExX5zYadhI7DVTGh9oIUN338=; b=dQh9v6erhk3DmwCYTnT8o4NBYg iuR1ie3rDLnTKWjbLXut8kkrDpRRB060/lJ1mUqRY8Jvtv7qbMlkbcvTotTrxON57kHuZe4syd2BH LBYI6AeuMrWYYtAWb4c5EkK+FGNbZCeT81tcdsQtwExoIU+7C2c9NBXSbvtFfS/7B2XQ=; Received: from [84.212.220.105] (helo=giant) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nCKyI-0003TM-Qn; Tue, 25 Jan 2022 13:30:53 +0100 From: Lars Ingebrigtsen To: Jim Porter Subject: Re: bug#53517: 29.0.50; [PATCH] `eshell-eval-using-options' :preserve-args breaks :external handling in some cases References: <31760ab2-2f47-dacd-0a9f-6a0bddced866@gmail.com> <58d11a94-52ac-9df0-7e1c-7dea7e8cfe58@gmail.com> X-Now-Playing: David Bowie's _Brilliant Adventure (9): Re:Call 5_: "Buddha Of Suburbia (single version)" Date: Tue, 25 Jan 2022 13:30:50 +0100 In-Reply-To: <58d11a94-52ac-9df0-7e1c-7dea7e8cfe58@gmail.com> (Jim Porter's message of "Mon, 24 Jan 2022 21:19:52 -0800") Message-ID: <87o840xait.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Jim Porter writes: > Actually, I'll do that now. Doing so fixes an issue I found in the > implementation of `eshell/cat'. "cat -" should read from stdin (and > the Eshell implementation should use the external /bin/cat [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53517 Cc: 53517@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Jim Porter writes: > Actually, I'll do that now. Doing so fixes an issue I found in the > implementation of `eshell/cat'. "cat -" should read from stdin (and > the Eshell implementation should use the external /bin/cat to do > this), but it was getting parsed as "cat", so it erroneously thought > there were *no* input files. Previously, `eshell--process-args' saw > the "-" and started to look for short options, found none, and then > just shrugged and ignored that token entirely. > > I also fixed an issue with the first patch where I had some misplaced > parens in test/lisp/eshell/esh-opt-tests.el. Thanks; pushed to Emacs 28. Jim Porter writes: > There's just one remaining issue that I'm not sure how to fix: since I > updated the `eshell-eval-using-options' macro, any file that uses it > needs to be recompiled to get the new version. What's the right way to > tell the build system about this? I just ran `touch lisp/eshell/*.el' > locally, but I'm sure there's a better way so that people can just run > `make' after pulling this patch. We unfortunately don't have any system for handling build issues like this, so people just have to say "make bootstrap" (or touch .el files or delete .elc files) in these cases. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 25 07:31:08 2022 Received: (at control) by debbugs.gnu.org; 25 Jan 2022 12:31:08 +0000 Received: from localhost ([127.0.0.1]:47245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCKyZ-0001vH-Q0 for submit@debbugs.gnu.org; Tue, 25 Jan 2022 07:31:07 -0500 Received: from quimby.gnus.org ([95.216.78.240]:34556) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCKyY-0001pO-3L for control@debbugs.gnu.org; Tue, 25 Jan 2022 07:31:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Subject:From:To:Message-Id:Date:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=IKG+htYfA+G/GvqW5MTa1+EIkWxMGdnOJz9KH09iMj8=; b=E7r92OVMjYWymbCUBCe1a9o7pa O2WHBiuZnrrCeGInwSbK0Xn6QII2N6acfkIECkHc4xJxuWpX/hAfhd2SSnqm4lpyddxteEHLZc8zB JVDWYjdpILGctyRwo0Dp9qebAbVLOmCMMsxZQuBhyc1u7n/I7CyOygBM13pPJSt6touk=; Received: from [84.212.220.105] (helo=giant) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nCKyQ-0003TW-A6 for control@debbugs.gnu.org; Tue, 25 Jan 2022 13:31:00 +0100 Date: Tue, 25 Jan 2022 13:30:56 +0100 Message-Id: <87mtjkxain.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #53517 X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: close 53517 29.1 quit Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) close 53517 29.1 quit From unknown Sat Jun 21 10:40:08 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 23 Feb 2022 12:24:04 +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