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#61310: Eshell modifying and running output regression Date: Tue, 7 Feb 2023 15:37:59 -0800 Message-ID: <06107bfa-21a6-00b5-0e3b-441cde343513@gmail.com> References: <8ab1105d-539a-d268-f891-268f18890aa1@gmail.com> <91f958e5-1f95-647a-2524-1cd87aa10e46@gmail.com> <87ttzxs5fy.fsf@miha-pc> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------AQmqSvjCYLi6vM6yyXaQbDtJ" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="31923"; mail-complaints-to="usenet@ciao.gmane.io" To: miha@kamnitnik.top, Morgan Smith , 61310@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Feb 08 00:39:19 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 1pPXYV-0008BI-Ln for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 08 Feb 2023 00:39:19 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPXYI-0004gf-LV; Tue, 07 Feb 2023 18:39:06 -0500 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 1pPXYH-0004gV-13 for bug-gnu-emacs@gnu.org; Tue, 07 Feb 2023 18:39:05 -0500 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 1pPXYE-0002uA-Cw for bug-gnu-emacs@gnu.org; Tue, 07 Feb 2023 18:39:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pPXYD-0000wa-UE for bug-gnu-emacs@gnu.org; Tue, 07 Feb 2023 18:39:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 07 Feb 2023 23:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61310 X-GNU-PR-Package: emacs Original-Received: via spool by 61310-submit@debbugs.gnu.org id=B61310.16758130893563 (code B ref 61310); Tue, 07 Feb 2023 23:39:01 +0000 Original-Received: (at 61310) by debbugs.gnu.org; 7 Feb 2023 23:38:09 +0000 Original-Received: from localhost ([127.0.0.1]:54241 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPXXM-0000vN-KX for submit@debbugs.gnu.org; Tue, 07 Feb 2023 18:38:09 -0500 Original-Received: from mail-pj1-f48.google.com ([209.85.216.48]:55860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPXXL-0000uy-02 for 61310@debbugs.gnu.org; Tue, 07 Feb 2023 18:38:07 -0500 Original-Received: by mail-pj1-f48.google.com with SMTP id d2so12978551pjd.5 for <61310@debbugs.gnu.org>; Tue, 07 Feb 2023 15:38:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:from:references:to:content-language:subject :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=+yFREh6jyR0Tk4hpSjpdy+Yq2FSkWZ7jWpZCopMH6YQ=; b=PRnd1SrLesuuQU7Iltf90higiFDfEtBOzNIxty6yKAlGEqu5+QR40I8IJaqBFnCdYo 9cnV/h58EMoYnPLnvSgn5d3+Sacv8KmoLVwYf+k2kcOLSrbU+Ino+ZjRYbyGZOYxL8e6 5jC6xOJ9dbfFKEG1PxBBmCIdp2nsOxZzBOl1og3LLX1nN5p+z87TYe79zthLD4WLDWKX 2qbyCukHetiGpYHKgSTW3fOe50uVYVDeDswCRSduI8p5DCyXeoH7d9CS05JXGQiIpNvo vB5SjWXcBpKJxB5anlAetUgLDmYScwRcKKqM1TeDnjzQfXx5kkGdfxCCH7XP8/Ry9alW ulnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:from:references:to:content-language:subject :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=+yFREh6jyR0Tk4hpSjpdy+Yq2FSkWZ7jWpZCopMH6YQ=; b=31MBd5UEkw/Hf3oNK09HjDZ6A0zLCw6m/R0qpPpzOh0HJ7B3Vfqfub0Yd+QLYT3yKM MEfgNHyMvPlElFWiHCcZuDOQg76voEIe3D/ZPVmQkEKJRR75HHVl3T+wxUpkWkfaVPHu rVPKQigQx8daCEdHBgz1mjNkXOUocp3wqfS9Fk7ERVWocD9sUWTxZgtMfDITRQt9AqGW 2FbqKCnxiKFHR7uuY8POIei0ya3VRLmmAkJB6sYHg/rG+D9DMQeQi26mvwRpETQijOgZ GdORukTwsIYXxnkiv8/OHVu26RJK6uibttrSJ2vMRls9lF25LARC031xWpE7RxVb6bm7 REVg== X-Gm-Message-State: AO0yUKU9We9yqeKAlKFPOALTh8ZHy8RgRDPl5DEIs9ceButLFh3UfT2o 4QUuyzl2gB3gNaCjUTdXSSQ= X-Google-Smtp-Source: AK7set9YMlh3enpRzZ2sFz2YJRS7ouTkqj+6KbV8OJNufOZ89Qh1Q9FVmSFO76OmBjgx0PdZ/hfVXg== X-Received: by 2002:a17:902:e292:b0:199:3549:ed57 with SMTP id o18-20020a170902e29200b001993549ed57mr2459437plc.4.1675813081142; Tue, 07 Feb 2023 15:38:01 -0800 (PST) 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 b19-20020a170902ed1300b001963bc7bdb8sm9330875pld.274.2023.02.07.15.38.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 07 Feb 2023 15:38:00 -0800 (PST) Content-Language: en-US In-Reply-To: <87ttzxs5fy.fsf@miha-pc> 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:255086 Archived-At: This is a multi-part message in MIME format. --------------AQmqSvjCYLi6vM6yyXaQbDtJ Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/7/2023 10:20 AM, miha--- via Bug reports for GNU Emacs, the Swiss army knife of text editors wrote: > You might also be interested in how comint deals with this. It can > handle the case when the user yanks something in the middle of output as > well. See function comint--mark-as-output, bug#3735 and bug#18135 for > more details. Good call. Here's a patch that (mostly) copies those comint functions over to Eshell. --------------AQmqSvjCYLi6vM6yyXaQbDtJ Content-Type: text/plain; charset=UTF-8; name="0001-Ensure-that-Eshell-users-can-run-lines-of-command-ou.patch" Content-Disposition: attachment; filename*0="0001-Ensure-that-Eshell-users-can-run-lines-of-command-ou.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSBiZDNiYzkzZTAwMDU2MjQxOTY4Y2M2NzEwZTA4NjRlYWZlOGQ3MDlhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFN1biwgNSBGZWIgMjAyMyAyMTozNzowOCAtMDgwMApTdWJqZWN0OiBbUEFU Q0hdIEVuc3VyZSB0aGF0IEVzaGVsbCB1c2VycyBjYW4gcnVuIGxpbmVzIG9mIGNvbW1hbmQg b3V0cHV0IGFzCiBpbnB1dAoKUHJldmlvdXNseSwgdGhpcyBmYWlsZWQgdG8gd29yayBwcm9w ZXJseSBiZWNhdXNlIGFueSBhZGRpdGlvbmFsIGlucHV0CnRoZSB1c2VyIGVudGVyZWQgd291 bGQgaGF2ZSBubyAnZmllbGQnIHByb3BlcnR5LCBjb25mdXNpbmcKJ2VzaGVsbC1nZXQtb2xk LWlucHV0Jy4gIFRvIGZpeCB0aGlzLCB3ZSBzaW1wbHkgZW5zdXJlIHRoYXQgYW55CnVzZXIt ZW50ZXJlZCB0ZXh0IGluIHRoZSBvdXRwdXQgZmllbGQgcmV0YWlucyBzYWlkIG91dHB1dCBm aWVsZAooYnVnIzYxMzEwKS4KCiogbGlzcC9lc2hlbGwvZXNoLXV0aWwuZWwgKGVzaGVsbC1j b21tYW5kLW91dHB1dC1wcm9wZXJ0aWVzKTogTmV3CnZhcmlhYmxlLgooZXNoZWxsLS1tYXJr LWFzLW91dHB1dCwgZXNoZWxsLS1tYXJrLXlhbmtlZC1hcy1vdXRwdXQpOiBOZXcKZnVuY3Rp b25zLCBtb3N0bHkgY29waWVkIGZyb20gY29taW50LgoKKiBsaXNwL2VzaGVsbC9lc2gtcHJv Yy5lbCAoZXNoZWxsLWludGVyYWN0aXZlLXByb2Nlc3MtZmlsdGVyKToKKiBsaXNwL2VzaGVs bC9lc2gtbW9kZS5lbCAoZXNoZWxsLWludGVyYWN0aXZlLXByaW50KTogQ2FsbAonZXNoZWxs LS1tYXJrLWFzLW91dHB1dCcuCihlc2hlbGwtZ2V0LW9sZC1pbnB1dCk6IFJlbW92ZSBwcm9w ZXJ0aWVzIGZyb20gdGhlIHJldHVybmVkIHN0cmluZwpqdXN0IHRvIGJlIHNhZmUuCgoqIHRl c3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLmVsIChlc2hlbGwtdGVzdC12YWx1ZSk6IE5l dyB2YXJpYWJsZS4KKGVzaGVsbC10ZXN0L2dldC1vbGQtaW5wdXQvcmVydW4tY29tbWFuZCkK KGVzaGVsbC10ZXN0L2dldC1vbGQtaW5wdXQvcnVuLW91dHB1dCk6IE5ldyB0ZXN0cy4KCiog dGVzdC9saXNwL2VzaGVsbC9lbS1wcm9tcHQtdGVzdHMuZWwKKGVtLXByb21wdC10ZXN0L2Zp ZWxkLXByb3BlcnRpZXMpCihlbS1wcm9tcHQtdGVzdC9maWVsZC1wcm9wZXJ0aWVzL25vLWhp Z2hsaWdodCk6IFVzZQonZXNoZWxsLWNvbW1hbmQtb3V0cHV0LXByb3BlcnRpZXMnLgotLS0K IGxpc3AvZXNoZWxsL2VzaC1tb2RlLmVsICAgICAgICAgICAgIHwgIDYgKystLS0KIGxpc3Av ZXNoZWxsL2VzaC1wcm9jLmVsICAgICAgICAgICAgIHwgIDUgKystLS0KIGxpc3AvZXNoZWxs L2VzaC11dGlsLmVsICAgICAgICAgICAgIHwgMzQgKysrKysrKysrKysrKysrKysrKysrKysr KysrKysKIHRlc3QvbGlzcC9lc2hlbGwvZW0tcHJvbXB0LXRlc3RzLmVsIHwgIDggKysrLS0t LQogdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwgICAgfCAyOCArKysrKysrKysr KysrKysrKysrKysrKysKIDUgZmlsZXMgY2hhbmdlZCwgNzAgaW5zZXJ0aW9ucygrKSwgMTEg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9lc2hlbGwvZXNoLW1vZGUuZWwgYi9s aXNwL2VzaGVsbC9lc2gtbW9kZS5lbAppbmRleCA1MDNkOWJhMWI2My4uNjU0ZTI2Nzc3ZTAg MTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VzaC1tb2RlLmVsCisrKyBiL2xpc3AvZXNoZWxs L2VzaC1tb2RlLmVsCkBAIC01MjUsOSArNTI1LDcgQEAgZXNoZWxsLWdvdG8taW5wdXQtc3Rh cnQKIChkZWZ1biBlc2hlbGwtaW50ZXJhY3RpdmUtcHJpbnQgKHN0cmluZykKICAgIlByaW50 IFNUUklORyB0byB0aGUgZXNoZWxsIGRpc3BsYXkgYnVmZmVyLiIKICAgKHdoZW4gc3RyaW5n Ci0gICAgKGFkZC10ZXh0LXByb3BlcnRpZXMgMCAobGVuZ3RoIHN0cmluZykKLSAgICAgICAg ICAgICAgICAgICAgICAgICAnKGZpZWxkIGNvbW1hbmQtb3V0cHV0IHJlYXItbm9uc3RpY2t5 IChmaWVsZCkpCi0gICAgICAgICAgICAgICAgICAgICAgICAgc3RyaW5nKQorICAgIChlc2hl bGwtLW1hcmstYXMtb3V0cHV0IDAgKGxlbmd0aCBzdHJpbmcpIHN0cmluZykKICAgICAoZXNo ZWxsLWludGVyYWN0aXZlLWZpbHRlciBuaWwgc3RyaW5nKSkpCiAKIChkZWZzdWJzdCBlc2hl bGwtYmVnaW4tb24tbmV3LWxpbmUgKCkKQEAgLTg5MSw3ICs4ODksNyBAQCBlc2hlbGwtZ2V0 LW9sZC1pbnB1dAogICAgICAgKGxldCAoKGluaGliaXQtZmllbGQtdGV4dC1tb3Rpb24pCiAg ICAgICAgICAgICAoZW5kIChwb2ludCkpKQogICAgICAgICAoYmVnaW5uaW5nLW9mLWxpbmUp Ci0gICAgICAgIChidWZmZXItc3Vic3RyaW5nIChwb2ludCkgZW5kKSkpKSkKKyAgICAgICAg KGJ1ZmZlci1zdWJzdHJpbmctbm8tcHJvcGVydGllcyAocG9pbnQpIGVuZCkpKSkpCiAKIChk ZWZ1biBlc2hlbGwtY29weS1vbGQtaW5wdXQgKCkKICAgIkluc2VydCBhZnRlciBwcm9tcHQg b2xkIGlucHV0IGF0IHBvaW50IGFzIG5ldyBpbnB1dCB0byBiZSBlZGl0ZWQuIgpkaWZmIC0t Z2l0IGEvbGlzcC9lc2hlbGwvZXNoLXByb2MuZWwgYi9saXNwL2VzaGVsbC9lc2gtcHJvYy5l bAppbmRleCAyN2NkNTIxZTgyZS4uYTg2ZTc1MDI3OTUgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNo ZWxsL2VzaC1wcm9jLmVsCisrKyBiL2xpc3AvZXNoZWxsL2VzaC1wcm9jLmVsCkBAIC0yNCw2 ICsyNCw3IEBACiA7OzsgQ29kZToKIAogKHJlcXVpcmUgJ2VzaC1pbykKKyhyZXF1aXJlICdl c2gtdXRpbCkKIAogKGRlZmdyb3VwIGVzaGVsbC1wcm9jIG5pbAogICAiV2hlbiBFc2hlbGwg aW52b2tlcyBleHRlcm5hbCBjb21tYW5kcywgaXQgYWx3YXlzIGRvZXMgc28KQEAgLTQxMSw5 ICs0MTIsNyBAQCBlc2hlbGwtaW50ZXJhY3RpdmUtcHJvY2Vzcy1maWx0ZXIKICAgIlNlbmQg dGhlIG91dHB1dCBmcm9tIFBST0NFU1MgKFNUUklORykgdG8gdGhlIGludGVyYWN0aXZlIGRp c3BsYXkuCiBUaGlzIGlzIGRvbmUgYWZ0ZXIgYWxsIG5lY2Vzc2FyeSBmaWx0ZXJpbmcgaGFz IGJlZW4gZG9uZS4iCiAgICh3aGVuIHN0cmluZwotICAgIChhZGQtdGV4dC1wcm9wZXJ0aWVz IDAgKGxlbmd0aCBzdHJpbmcpCi0gICAgICAgICAgICAgICAgICAgICAgICAgJyhmaWVsZCBj b21tYW5kLW91dHB1dCByZWFyLW5vbnN0aWNreSAoZmllbGQpKQotICAgICAgICAgICAgICAg ICAgICAgICAgIHN0cmluZykKKyAgICAoZXNoZWxsLS1tYXJrLWFzLW91dHB1dCAwIChsZW5n dGggc3RyaW5nKSBzdHJpbmcpCiAgICAgKHJlcXVpcmUgJ2VzaC1tb2RlKQogICAgIChkZWNs YXJlLWZ1bmN0aW9uIGVzaGVsbC1pbnRlcmFjdGl2ZS1maWx0ZXIgImVzaC1tb2RlIiAoYnVm ZmVyIHN0cmluZykpCiAgICAgKGVzaGVsbC1pbnRlcmFjdGl2ZS1maWx0ZXIgKGlmIHByb2Nl c3MgKHByb2Nlc3MtYnVmZmVyIHByb2Nlc3MpCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9l c2gtdXRpbC5lbCBiL2xpc3AvZXNoZWxsL2VzaC11dGlsLmVsCmluZGV4IDk1NDllN2YxYTEw Li5jMDY4NTc1Nzc4OSAxMDA2NDQKLS0tIGEvbGlzcC9lc2hlbGwvZXNoLXV0aWwuZWwKKysr IGIvbGlzcC9lc2hlbGwvZXNoLXV0aWwuZWwKQEAgLTEzMiw2ICsxMzIsMTkgQEAgZXNoZWxs LXVzZXItbmFtZXMKIChkZWZ2YXIgZXNoZWxsLXVzZXItdGltZXN0YW1wIG5pbAogICAiQSB0 aW1lc3RhbXAgb2Ygd2hlbiB0aGUgdXNlciBmaWxlIHdhcyByZWFkLiIpCiAKKyhkZWZ2YXIg ZXNoZWxsLWNvbW1hbmQtb3V0cHV0LXByb3BlcnRpZXMKKyAgYCggZmllbGQgY29tbWFuZC1v dXRwdXQKKyAgICAgZnJvbnQtc3RpY2t5IChmaWVsZCkKKyAgICAgcmVhci1ub25zdGlja3kg KGZpZWxkKQorICAgICA7OyBUZXh0IGluc2VydGVkIGJ5IGEgdXNlciBpbiB0aGUgbWlkZGxl IG9mIHByb2Nlc3Mgb3V0cHV0CisgICAgIDs7IHNob3VsZCBiZSBtYXJrZWQgYXMgb3V0cHV0 LiAgVGhpcyBpcyBuZWVkZWQgZm9yIGNvbW1hbmRzCisgICAgIDs7IHN1Y2ggYXMgYHlhbmsn IG9yIGBqdXN0LW9uZS1zcGFjZScgd2hpY2ggZG9uJ3QgdXNlCisgICAgIDs7IGBpbnNlcnQt YW5kLWluaGVyaXQnIGFuZCB0aHVzIGJ5cGFzcyBkZWZhdWx0IHRleHQgcHJvcGVydHkKKyAg ICAgOzsgaW5oZXJpdGFuY2UuCisgICAgIGluc2VydC1pbi1mcm9udC1ob29rcyAoLCMnZXNo ZWxsLS1tYXJrLWFzLW91dHB1dAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICwjJ2Vz aGVsbC0tbWFyay15YW5rZWQtYXMtb3V0cHV0KSkKKyAgIkEgbGlzdCBvZiB0ZXh0IHByb3Bl cnRpZXMgdG8gYXBwbHkgdG8gY29tbWFuZCBvdXRwdXQuIikKKwogOzs7IE9ic29sZXRlIHZh cmlhYmxlczoKIAogKGRlZmluZS1vYnNvbGV0ZS12YXJpYWJsZS1hbGlhcyAnZXNoZWxsLWhv c3QtbmFtZXMKQEAgLTE1Nyw2ICsxNzAsMjcgQEAgZXNoZWxsLWNvbmRpdGlvbi1jYXNlCiAJ ICxAaGFuZGxlcnMpCiAgICAgZm9ybSkpCiAKKyhkZWZ1biBlc2hlbGwtLW1hcmstYXMtb3V0 cHV0IChzdGFydCBlbmQgJm9wdGlvbmFsIG9iamVjdCkKKyAgIk1hcmsgdGhlIHRleHQgZnJv bSBTVEFSVCB0byBFTkQgYXMgRXNoZWxsIG91dHB1dC4KK09CSkVDVCBjYW4gYmUgYSBidWZm ZXIgb3Igc3RyaW5nLiAgSWYgbmlsLCBtYXJrIHRoZSB0ZXh0IGluIHRoZQorY3VycmVudCBi dWZmZXIuIgorICAod2l0aC1zaWxlbnQtbW9kaWZpY2F0aW9ucworICAgIChhZGQtdGV4dC1w cm9wZXJ0aWVzIHN0YXJ0IGVuZCBlc2hlbGwtY29tbWFuZC1vdXRwdXQtcHJvcGVydGllcwor ICAgICAgICAgICAgICAgICAgICAgICAgIG9iamVjdCkpKQorCisoZGVmdW4gZXNoZWxsLS1t YXJrLXlhbmtlZC1hcy1vdXRwdXQgKHN0YXJ0IGVuZCkKKyAgIk1hcmsgeWFua2VkIHRleHQg ZnJvbSBTVEFSVCB0byBFTkQgYXMgRXNoZWxsIG91dHB1dC4iCisgIDs7IGB5YW5rJyByZW1v dmVzIHRoZSBmaWVsZCB0ZXh0IHByb3BlcnR5IGZyb20gdGhlIHRleHQgaXQgaW5zZXJ0cwor ICA7OyBkdWUgdG8gYHlhbmstZXhjbHVkZWQtcHJvcGVydGllcycsIHNvIGFycmFuZ2UgZm9y IHRoaXMgdGV4dAorICA7OyBwcm9wZXJ0eSB0byBiZSByZWFwcGxpZWQgaW4gdGhlIGBhZnRl ci1jaGFuZ2UtZnVuY3Rpb25zJy4KKyAgKGxldHJlYyAoKGhvb2sKKyAgICAgICAgICAgIChs YW1iZGEgKHN0YXJ0MSBlbmQxIF9sZW4xKQorICAgICAgICAgICAgICAocmVtb3ZlLWhvb2sg J2FmdGVyLWNoYW5nZS1mdW5jdGlvbnMgaG9vayB0KQorICAgICAgICAgICAgICAod2hlbiAo YW5kICg9IHN0YXJ0IHN0YXJ0MSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAoPSBlbmQg ZW5kMSkpCisgICAgICAgICAgICAgICAgKGVzaGVsbC0tbWFyay1hcy1vdXRwdXQgc3RhcnQx IGVuZDEpKSkpKQorICAgIChhZGQtaG9vayAnYWZ0ZXItY2hhbmdlLWZ1bmN0aW9ucyBob29r IG5pbCB0KSkpCisKIChkZWZ1biBlc2hlbGwtZmluZC1kZWxpbWl0ZXIKICAgKG9wZW4gY2xv c2UgJm9wdGlvbmFsIGJvdW5kIHJldmVyc2UtcCBiYWNrc2xhc2gtcCkKICAgIkZyb20gcG9p bnQsIGZpbmQgdGhlIENMT1NFIGRlbGltaXRlciBjb3JyZXNwb25kaW5nIHRvIE9QRU4uCmRp ZmYgLS1naXQgYS90ZXN0L2xpc3AvZXNoZWxsL2VtLXByb21wdC10ZXN0cy5lbCBiL3Rlc3Qv bGlzcC9lc2hlbGwvZW0tcHJvbXB0LXRlc3RzLmVsCmluZGV4IGRiNDVlMmFlM2E3Li4yNTc1 NDllNDBmYiAxMDA2NDQKLS0tIGEvdGVzdC9saXNwL2VzaGVsbC9lbS1wcm9tcHQtdGVzdHMu ZWwKKysrIGIvdGVzdC9saXNwL2VzaGVsbC9lbS1wcm9tcHQtdGVzdHMuZWwKQEAgLTU0LDgg KzU0LDggQEAgZW0tcHJvbXB0LXRlc3QvZmllbGQtcHJvcGVydGllcwogICAgICAoc2hvdWxk IChlcXVhbCBsYXN0LWlucHV0ICJlY2hvIGhlbGxvXG4iKSkKICAgICAgKHNob3VsZCAoZXF1 YWwtaW5jbHVkaW5nLXByb3BlcnRpZXMKICAgICAgICAgICAgICAgbGFzdC1vdXRwdXQKLSAg ICAgICAgICAgICAgKHByb3BlcnRpemUgImhlbGxvXG4iICdyZWFyLW5vbnN0aWNreSAnKGZp ZWxkKQotICAgICAgICAgICAgICAgICAgICAgICAgICAnZmllbGQgJ2NvbW1hbmQtb3V0cHV0 KSkpKSkpCisgICAgICAgICAgICAgIChhcHBseSAjJ3Byb3BlcnRpemUgImhlbGxvXG4iCisg ICAgICAgICAgICAgICAgICAgICBlc2hlbGwtY29tbWFuZC1vdXRwdXQtcHJvcGVydGllcykp KSkpKQogCiAoZXJ0LWRlZnRlc3QgZW0tcHJvbXB0LXRlc3QvZmllbGQtcHJvcGVydGllcy9u by1oaWdobGlnaHQgKCkKICAgIkNoZWNrIHRoYXQgZmllbGQgcHJvcGVydGllcyBhcmUgcHJv cGVybHkgc2V0IG9uIEVzaGVsbCBvdXRwdXQvcHJvbXB0cy4KQEAgLTc3LDggKzc3LDggQEAg ZW0tcHJvbXB0LXRlc3QvZmllbGQtcHJvcGVydGllcy9uby1oaWdobGlnaHQKICAgICAgICAo c2hvdWxkIChlcXVhbCBsYXN0LWlucHV0ICJlY2hvIGhlbGxvXG4iKSkKICAgICAgICAoc2hv dWxkIChlcXVhbC1pbmNsdWRpbmctcHJvcGVydGllcwogICAgICAgICAgICAgICAgIGxhc3Qt b3V0cHV0Ci0gICAgICAgICAgICAgICAgKHByb3BlcnRpemUgImhlbGxvXG4iICdyZWFyLW5v bnN0aWNreSAnKGZpZWxkKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICdmaWVsZCAn Y29tbWFuZC1vdXRwdXQpKSkpKSkpCisgICAgICAgICAgICAgICAgKGFwcGx5ICMncHJvcGVy dGl6ZSAiaGVsbG9cbiIKKyAgICAgICAgICAgICAgICAgICAgICAgZXNoZWxsLWNvbW1hbmQt b3V0cHV0LXByb3BlcnRpZXMpKSkpKSkpCiAKIChlcnQtZGVmdGVzdCBlbS1wcm9tcHQtdGVz dC9uZXh0LXByZXZpb3VzLXByb21wdCAoKQogICAiQ2hlY2sgdGhhdCBuYXZpZ2F0aW5nIGZv cndhcmQvYmFja3dhcmQgdGhyb3VnaCBvbGQgcHJvbXB0cyB3b3JrcyBjb3JyZWN0bHkuIgpk aWZmIC0tZ2l0IGEvdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwgYi90ZXN0L2xp c3AvZXNoZWxsL2VzaGVsbC10ZXN0cy5lbAppbmRleCA3NzZjZmI5YjkyZi4uNzQzY2MyOGI5 YjUgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLmVsCisrKyBi L3Rlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLmVsCkBAIC0zNCw2ICszNCw4IEBACiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAoZmlsZS1uYW1lLWRpcmVjdG9yeSAob3IgbG9h ZC1maWxlLW5hbWUKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBkZWZhdWx0LWRpcmVjdG9yeSkpKSkKIAorKGRlZnZhciBlc2hlbGwtdGVz dC12YWx1ZSBuaWwpCisKIDs7OyBUZXN0czoKIAogKGVydC1kZWZ0ZXN0IGVzaGVsbC10ZXN0 L3BpcGUtaGVhZHByb2MgKCkKQEAgLTE2MCw2ICsxNjIsMzIgQEAgZXNoZWxsLXRlc3QvZ2V0 LW9sZC1pbnB1dAogICAgICAoYmVnaW5uaW5nLW9mLWxpbmUpKQogICAgKHNob3VsZCAoc3Ry aW5nPSAoZXNoZWxsLWdldC1vbGQtaW5wdXQpICJlY2hvIGFscGhhIikpKSkKIAorKGVydC1k ZWZ0ZXN0IGVzaGVsbC10ZXN0L2dldC1vbGQtaW5wdXQvcmVydW4tY29tbWFuZCAoKQorICAi VGVzdCB0aGF0IHdlIGNhbiByZXJ1biBhbiBvbGQgY29tbWFuZCB3aGVuIHBvaW50IGlzIG9u IGl0LiIKKyAgKHdpdGgtdGVtcC1lc2hlbGwKKyAgIChsZXQgKChlc2hlbGwtdGVzdC12YWx1 ZSAiZmlyc3QiKSkKKyAgICAgKGVzaGVsbC1tYXRjaC1jb21tYW5kLW91dHB1dCAiZWNobyAk ZXNoZWxsLXRlc3QtdmFsdWUiICJmaXJzdCIpKQorICAgOzsgR28gdG8gdGhlIHByZXZpb3Vz IHByb21wdC4KKyAgIChmb3J3YXJkLWxpbmUgLTIpCisgICAobGV0ICgoaW5oaWJpdC1maWVs ZC10ZXh0LW1vdGlvbiB0KSkKKyAgICAgKGVuZC1vZi1saW5lKSkKKyAgIDs7IFJlcnVuIHRo ZSBjb21tYW5kLCBidXQgd2l0aCBhIGRpZmZlcmVudCB2YXJpYWJsZSB2YWx1ZS4KKyAgIChs ZXQgKChlc2hlbGwtdGVzdC12YWx1ZSAic2Vjb25kIikpCisgICAgIChlc2hlbGwtc2VuZC1p bnB1dCkpCisgICAoZXNoZWxsLW1hdGNoLW91dHB1dCAic2Vjb25kIikpKQorCisoZXJ0LWRl ZnRlc3QgZXNoZWxsLXRlc3QvZ2V0LW9sZC1pbnB1dC9ydW4tb3V0cHV0ICgpCisgICJUZXN0 IHRoYXQgd2UgY2FuIHJ1biBhIGxpbmUgb2Ygb3V0cHV0IGFzIGEgY29tbWFuZCB3aGVuIHBv aW50IGlzIG9uIGl0LiIKKyAgKHdpdGgtdGVtcC1lc2hlbGwKKyAgIChlc2hlbGwtbWF0Y2gt Y29tbWFuZC1vdXRwdXQgImVjaG8gXCJlY2hvIHRoZXJlXCIiICJlY2hvIHRoZXJlIikKKyAg IDs7IEdvIHRvIHRoZSBvdXRwdXQsIGFuZCBpbnNlcnQgImhlbGxvIiBhZnRlciAiZWNobyIu CisgICAoZm9yd2FyZC1saW5lIC0xKQorICAgKGZvcndhcmQtd29yZCkKKyAgIChpbnNlcnQg IiBoZWxsbyIpCisgICA7OyBSdW4gdGhlIGxpbmUgYXMgYSBjb21tYW5kLgorICAgKGVzaGVs bC1zZW5kLWlucHV0KQorICAgKGVzaGVsbC1tYXRjaC1vdXRwdXQgIihcImhlbGxvXCIgXCJ0 aGVyZVwiKSIpKSkKKwogKHByb3ZpZGUgJ2VzaGVsbC10ZXN0cykKIAogOzs7IGVzaGVsbC10 ZXN0cy5lbCBlbmRzIGhlcmUKLS0gCjIuMjUuMQoK --------------AQmqSvjCYLi6vM6yyXaQbDtJ--