From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: martin rudalics via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#68235: 29.1.90; Switching tabs stops following process output in selected window Date: Tue, 6 Feb 2024 11:34:54 +0100 Message-ID: <39fe71c5-db40-49d1-b22b-37b52ed13865@gmx.at> References: <86v885je23.fsf@mail.linkov.net> <868r4ymn7x.fsf@mail.linkov.net> <86h6jlqh2i.fsf@mail.linkov.net> <5e438b04-6fb7-4114-a5a8-61db9809b297@gmx.at> <86cyu7m4kc.fsf@mail.linkov.net> <2f80855c-3bf9-4973-a484-059cdef3b8c7@gmx.at> <669371d8-7c65-4c5f-99a9-0d8298808d23@gmx.at> <86cyu5cc0p.fsf@mail.linkov.net> <868r4reoh3.fsf@mail.linkov.net> <0634c46f-db93-4492-be69-5ac6ca0102a8@gmx.at> <865xzuvdgu.fsf@mail.linkov.net> <86a5p5qv61.fsf@mail.linkov.net> <86edeg2ige.fsf@mail.linkov.net> <21dcf921-acc4-4f94-b383-8ad6d0a57c59@gmx.at> <86v87qpow0.fsf@mail.linkov.net> <4bc98faf-5ebe-4c22-8c9f-04755785fde5@gmx.at> <86wmrjl8m3.fsf@mail.linkov.net> Reply-To: martin rudalics Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------hys38LS9BQejc30NIWcM9Lk2" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="31473"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla Thunderbird Cc: 68235@debbugs.gnu.org To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Feb 06 11:36:06 2024 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 1rXIo9-0007vR-Oo for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 06 Feb 2024 11:36:05 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rXInz-0005MW-Dz; Tue, 06 Feb 2024 05:35:55 -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 1rXInt-0005M6-EI for bug-gnu-emacs@gnu.org; Tue, 06 Feb 2024 05:35:49 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rXInt-000186-1s for bug-gnu-emacs@gnu.org; Tue, 06 Feb 2024 05:35:49 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rXIo5-0008WG-SS for bug-gnu-emacs@gnu.org; Tue, 06 Feb 2024 05:36:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: martin rudalics Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 06 Feb 2024 10:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68235 X-GNU-PR-Package: emacs Original-Received: via spool by 68235-submit@debbugs.gnu.org id=B68235.170721572132702 (code B ref 68235); Tue, 06 Feb 2024 10:36:01 +0000 Original-Received: (at 68235) by debbugs.gnu.org; 6 Feb 2024 10:35:21 +0000 Original-Received: from localhost ([127.0.0.1]:53257 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rXInQ-0008VM-0p for submit@debbugs.gnu.org; Tue, 06 Feb 2024 05:35:21 -0500 Original-Received: from mout.gmx.net ([212.227.17.20]:41495) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rXInL-0008V0-AB for 68235@debbugs.gnu.org; Tue, 06 Feb 2024 05:35:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.at; s=s31663417; t=1707215695; x=1707820495; i=rudalics@gmx.at; bh=BmbkTMMQ933+PogHjRfCCvbuoLUZJa0z48/JMk6b+cM=; h=X-UI-Sender-Class:Date:Subject:To:Cc:References:From: In-Reply-To; b=KhoqBvpQQCcX42vELHtsiasaP4bZaf0fGwYI5w159UZitVpVV2NCicxt77eCHjcc nEYWLA63pkTRB+1SPdFDEKnKOasLADuZsV9UsYa8pBm+DmtZtDnusNz2KGgblvJPr UhAjJwmwzR1lasaA0jkGdU1bYsjLLNCmf3QyVNvshdMpSCSsv76jxKzL6BXC62ep6 S7g1OHtvY24C7Uu/tsArxDTejANeIMhtHHdqC3mVeXygPSMDgha7PTGlek6w7U72S I6SDnHKu7vilmRAsrfyvJzJxvAle5ptyM5jHAHPN2Cv/iOflZ9N9Lq7DQkN2Hbrfu L9IUC98WZ8EDDmaLEg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from [192.168.31.113] ([213.142.96.143]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MuDXp-1qkHVC1OUn-00uc7Q; Tue, 06 Feb 2024 11:34:55 +0100 Content-Language: en-US In-Reply-To: <86wmrjl8m3.fsf@mail.linkov.net> X-Provags-ID: V03:K1:hCHKBFpmH6pUKAHPKfbRCOcC9Yql1Aky+AMQHPqbEr4AwiHKTnQ oGdLOUm6FVuu2N6dFGj1JvtKYQB4HqUibUrq11FpSDMYB+RR4iFDOJkwj/QtyXIcXjnZB6f 4HryLGNLqqL9SIAW4cHYxzXnd1PqpGIU1bI+3GO3toAdCP3Z6b1+QebhM9Qt+YlgGXXbOlZ 5ip3VJrjPiyB/cQmK+Oiw== UI-OutboundReport: notjunk:1;M01:P0:eZEpp0VWlEQ=;5on2/ofjSsidpNgsHTSYZJAVdPH JBmBzGK/EV4doCy/8Ejs9WgHGrBj7qBC8l+vgWDaU86CBQKlJaDEoYooraOLq1O23i+c45yFs GcLWwGghuMN7cLCrpTyPLvF667zOr2GBKp2BfL963QVy+SNjEfJnUXd92mxb42amdafSFI5Qj 5mI0upJKZ/CmsigLRk9ss9CKMXHHN0wBLlTryRrXB4j9vwLnuV+AIx04NgkH2tsyoV1ST2PIo dLmUS2WZ8fuyeaOgDjRrejBZqb7p688ERm99S0z/ZMC5rtZQ+bL4rxKmXHfnR6T7dct1jbs28 iqNohQIai1T6lrqeuPoUTp8IX1hDTZ6kYQYZfkd65SfyR/HTDKqA6XWKIWr1DAOkIKbvcSgt0 nhk9xdi5W7hXNPjATqlv/VcK32DC+vzXgKftAGGTWSj7EfeMJwOnxrEuQzfqd8znDnvUdO0Pc Mw0CiitufrTXdVFyxEDYGA9tjt4uFhwbQpJR9J4ntF6EAsffMSQPrwvQjCQge6eNtkCS5PZJc ZRXDNwOA2u5AvtVOEe5WFwwQUoF+JvUnhXKPHycpuZu6rzwt8WHv0xfIIK2RAmDLJjzDDatlS oM4chWUjAxlegAW/F8qicZ7Ekw28qfknOLPOtntij4r/IAM2nH3YMcHAc2pyu0372R7GphDxg 1LlnTNWlzNaTckK91AsskI7dk7XBTMXKV2VJdCOtaFjfnXmeQfmbB+jNAtswRkXoR5PJvyIwO ry08qLL6IdSuv37VvzFiRrfIfs2QpqK33Vt2pOkPrVK5c6V6tZ9zNUFCYTCbwfnVtGdXUJ4q 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:279482 Archived-At: This is a multi-part message in MIME format. --------------hys38LS9BQejc30NIWcM9Lk2 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit > Is 'keep-windows' doable for 'window-state-put' as well? I attach a patch that adds a fourth argument to 'window-state-put'. It and a new 'set-window-configuration' now use a new function I called 'marker-last-position' that returns the last position of a marker even after its buffer was killed. The patch also fixes a bug in 'window--state-put-2' that can be reproduced with the following simple scenario (let ((buffer (get-buffer-create "*foo*")) state) (pop-to-buffer buffer) (setq state (window-state-get)) (kill-buffer buffer) (window-state-put state)) Did you never see it? > So maybe the same option 'keep-windows' could call the same hook > 'post-set-window-configuration-functions' from 'window-state-put' too? I added a new hook called 'window-state-put-keep-window-functions' with the same arguments as 'post-set-window-configuration-functions'. Maybe people wanted to keep them apart. If you think the hook should be also run when there are no "kept" windows, we can do that as well. I tested it here with (defun foo (frame windows) (while windows (let* ((quad (car windows)) (window (car quad)) (buffer (find-file-noselect (buffer-file-name (nth 1 quad))))) (when buffer (set-window-buffer window buffer) (set-window-point window (nth 3 quad)) (set-window-start window (nth 2 quad) t))) (setq windows (cdr windows)))) (add-hook 'window-state-put-keep-window-functions 'foo) (let ((window (selected-window)) (buffer (pop-to-buffer (find-file-noselect "..."))) (window-1 (split-window)) (window-2 (split-window nil nil t)) state) (set-window-point window-1 5000) (set-window-point window-2 10000) (setq state (window-state-get)) (y-or-n-p "State saved ...") (delete-other-windows window) (kill-buffer buffer) (y-or-n-p "State reset ...") (window-state-put state nil nil t) (message "State restored")) martin --------------hys38LS9BQejc30NIWcM9Lk2 Content-Type: text/x-patch; charset=UTF-8; name="keep-windows-2.diff" Content-Disposition: attachment; filename="keep-windows-2.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2xpc3Avd2luZG93LmVsIGIvbGlzcC93aW5kb3cuZWwKaW5kZXggZTEw MGYyNTUyNmIuLjNmYTA2YjA3MDhjIDEwMDY0NAotLS0gYS9saXNwL3dpbmRvdy5lbAorKysg Yi9saXNwL3dpbmRvdy5lbApAQCAtNjE2OCwxMiArNjE2OCwyNSBAQCB3aW5kb3ctc3RhdGUt Z2V0CiAgICAgIChtaW4tcGl4ZWwtd2lkdGgtc2FmZSAgICAuICwod2luZG93LW1pbi1zaXpl IHdpbmRvdyB0ICdzYWZlIHQpKSkKICAgICh3aW5kb3ctLXN0YXRlLWdldC0xIHdpbmRvdyB3 cml0YWJsZSkpKQogCisoZGVmdmFyIHdpbmRvdy1zdGF0ZS1wdXQta2VlcC13aW5kb3ctZnVu Y3Rpb25zIG5pbAorICAiTGlzdCBvZiBmdW5jdGlvbnMgcnVuIGJ5IGB3aW5kb3ctc3RhdGUt cHV0JyBmb3Igd2luZG93cyB0byBrZWVwLgorVGhlc2UgZnVuY3Rpb25zIGFyZSBjYWxsZWQg d2hlbiBgd2luZG93LXN0YXRlLXB1dCcgaGFzIGJlZW4KK2ludm9rZWQgd2l0aCBLRUVQLVdJ TkRPV1Mgbm9uLW5pbC4gIGB3aW5kb3ctc3RhdGUtcHV0JyBydW5zIHRoZW0KK2FmdGVyIGl0 IGhhcyByZXN0b3JlZCBTVEFURSwgZm9yIGVhY2ggd2luZG93IHdob3NlIGJ1ZmZlciBoYXMK K2JlZW4gZGVsZXRlZCBzaW5jZSBTVEFURSB3YXMgc2F2ZWQuICBFYWNoIGZ1bmN0aW9uIGlz IGNhbGxlZCB3aXRoCit0d28gYXJndW1lbnRzLiAgVGhlIGZyYW1lIG9uIHdoaWNoIHRoZSB3 aW5kb3cgd2FzIHJlc3RvcmVkIGFuZCBhCitxdWFkcnVwbGUgb2YgZm91ciBlbnRyaWVzIC0g dGhlIHdpbmRvdywgaXRzIG9sZCBidWZmZXIgYW5kIHRoYXQKK2J1ZmZlcidzIHN0YXJ0IGFu ZCBwb2ludCBwb3NpdGlvbnMuIikKKwogKGRlZnZhciB3aW5kb3ctc3RhdGUtcHV0LWxpc3Qg bmlsCiAgICJIZWxwZXIgdmFyaWFibGUgZm9yIGB3aW5kb3ctc3RhdGUtcHV0Jy4iKQogCiAo ZGVmdmFyIHdpbmRvdy1zdGF0ZS1wdXQtc3RhbGUtd2luZG93cyBuaWwKICAgIkhlbHBlciB2 YXJpYWJsZSBmb3IgYHdpbmRvdy1zdGF0ZS1wdXQnLiIpCiAKKyhkZWZ2YXIgd2luZG93LXN0 YXRlLXB1dC1rZXB0LXdpbmRvd3MgbmlsCisgICJIZWxwZXIgdmFyaWFibGUgZm9yIGB3aW5k b3ctc3RhdGUtcHV0Jy4iKQorCiAoZGVmdW4gd2luZG93LS1zdGF0ZS1wdXQtMSAoc3RhdGUg Jm9wdGlvbmFsIHdpbmRvdyBpZ25vcmUgdG90YWxzIHBpeGVsd2lzZSkKICAgIkhlbHBlciBm dW5jdGlvbiBmb3IgYHdpbmRvdy1zdGF0ZS1wdXQnLiIKICAgKGxldCAoKHR5cGUgKGNhciBz dGF0ZSkpKQpAQCAtNjI1OCw3ICs2MjcxLDcgQEAgd2luZG93LS1zdGF0ZS1wdXQtMQogCSAg ICA7OyBDb250aW51ZSB3aXRoIHRoZSBsYXN0IHdpbmRvdyBzcGxpdCBvZmYuCiAJICAgIChz ZXRxIHdpbmRvdyBuZXcpKSkpKSkpKQogCi0oZGVmdW4gd2luZG93LS1zdGF0ZS1wdXQtMiAo aWdub3JlIHBpeGVsd2lzZSkKKyhkZWZ1biB3aW5kb3ctLXN0YXRlLXB1dC0yIChpZ25vcmUg cGl4ZWx3aXNlIGtlZXAtd2luZG93cykKICAgIkhlbHBlciBmdW5jdGlvbiBmb3IgYHdpbmRv dy1zdGF0ZS1wdXQnLiIKICAgKGRvbGlzdCAoaXRlbSB3aW5kb3ctc3RhdGUtcHV0LWxpc3Qp CiAgICAgKGxldCAoKHdpbmRvdyAoY2FyIGl0ZW0pKQpAQCAtNjI3OCw5ICs2MjkxLDEwIEBA IHdpbmRvdy0tc3RhdGUtcHV0LTIKIAkgIChzZXQtd2luZG93LXBhcmFtZXRlciB3aW5kb3cg KGNhciBwYXJhbWV0ZXIpIChjZHIgcGFyYW1ldGVyKSkpKQogICAgICAgOzsgUHJvY2VzcyBi dWZmZXIgcmVsYXRlZCBzdGF0ZS4KICAgICAgICh3aGVuIHN0YXRlCi0JKGxldCAoKGJ1ZmZl ciAoZ2V0LWJ1ZmZlciAoY2FyIHN0YXRlKSkpCi0JICAgICAgKHN0YXRlIChjZHIgc3RhdGUp KSkKLQkgIChpZiBidWZmZXIKKwkobGV0KiAoKG9sZC1idWZmZXItb3ItbmFtZSAoY2FyIHN0 YXRlKSkKKwkgICAgICAgKGJ1ZmZlciAoZ2V0LWJ1ZmZlciBvbGQtYnVmZmVyLW9yLW5hbWUp KQorCSAgICAgICAoc3RhdGUgKGNkciBzdGF0ZSkpKQorCSAgKGlmIChidWZmZXItbGl2ZS1w IGJ1ZmZlcikKIAkgICAgICAod2l0aC1jdXJyZW50LWJ1ZmZlciBidWZmZXIKIAkJKHNldC13 aW5kb3ctYnVmZmVyIHdpbmRvdyBidWZmZXIpCiAJCShzZXQtd2luZG93LWhzY3JvbGwgd2lu ZG93IChjZHIgKGFzc3EgJ2hzY3JvbGwgc3RhdGUpKSkKQEAgLTYzNzUsOSArNjM4OSwyMiBA QCB3aW5kb3ctLXN0YXRlLXB1dC0yCiAJICAgIDs7IHNhdmUgdGhlIHdpbmRvdyB3aXRoIHRo ZSBpbnRlbnRpb24gb2YgZGVsZXRpbmcgaXQgbGF0ZXIKIAkgICAgOzsgaWYgcG9zc2libGUu CiAJICAgIChzd2l0Y2gtdG8tcHJldi1idWZmZXIgd2luZG93KQotCSAgICAocHVzaCB3aW5k b3cgd2luZG93LXN0YXRlLXB1dC1zdGFsZS13aW5kb3dzKSkpKSkpKQotCi0oZGVmdW4gd2lu ZG93LXN0YXRlLXB1dCAoc3RhdGUgJm9wdGlvbmFsIHdpbmRvdyBpZ25vcmUpCisJICAgIChp ZiBrZWVwLXdpbmRvd3MKKwkJKGxldCogKChzdGFydCAoY2RyIChhc3NxICdzdGFydCBzdGF0 ZSkpKQorCQkgICAgICAgOzsgSGFuZGxlIGJvdGggLSBtYXJrZXIgcG9zaXRpb25zIGZyb20g d3JpdGFibGUKKwkJICAgICAgIDs7IHN0YXRlcyBhbmQgbWFya2VycyBmcm9tIG5vbi13cml0 YWJsZSBzdGF0ZXMuCisJCSAgICAgICAoc3RhcnQtcG9zIChpZiAobWFya2VycCBzdGFydCkK KwkJCQkgICAgICAobWFya2VyLWxhc3QtcG9zaXRpb24gc3RhcnQpCisJCQkJICAgIHN0YXJ0 KSkKKwkJICAgICAgIChwb2ludCAoY2RyIChhc3NxICdwb2ludCBzdGF0ZSkpKQorCQkgICAg ICAgKHBvaW50LXBvcyAoaWYgKG1hcmtlcnAgcG9pbnQpCisJCQkJICAgICAgKG1hcmtlci1s YXN0LXBvc2l0aW9uIHBvaW50KQorCQkJCSAgICBwb2ludCkpKQorCQkgIChwdXNoIChsaXN0 IHdpbmRvdyBvbGQtYnVmZmVyLW9yLW5hbWUgc3RhcnQtcG9zIHBvaW50LXBvcykKKwkJCXdp bmRvdy1zdGF0ZS1wdXQta2VwdC13aW5kb3dzKSkKKwkgICAgICAocHVzaCB3aW5kb3cgd2lu ZG93LXN0YXRlLXB1dC1zdGFsZS13aW5kb3dzKSkpKSkpKSkKKworKGRlZnVuIHdpbmRvdy1z dGF0ZS1wdXQgKHN0YXRlICZvcHRpb25hbCB3aW5kb3cgaWdub3JlIGtlZXAtd2luZG93cykK ICAgIlB1dCB3aW5kb3cgc3RhdGUgU1RBVEUgaW50byBXSU5ET1cuCiBTVEFURSBzaG91bGQg YmUgdGhlIHN0YXRlIG9mIGEgd2luZG93IHJldHVybmVkIGJ5IGFuIGVhcmxpZXIKIGludm9j YXRpb24gb2YgYHdpbmRvdy1zdGF0ZS1nZXQnLiAgT3B0aW9uYWwgYXJndW1lbnQgV0lORE9X IG11c3QKQEAgLTYzODgsOCArNjQxNSwxOSBAQCB3aW5kb3ctc3RhdGUtcHV0CiBPcHRpb25h bCBhcmd1bWVudCBJR05PUkUgbm9uLW5pbCBtZWFucyBpZ25vcmUgbWluaW11bSB3aW5kb3cK IHNpemVzIGFuZCBmaXhlZCBzaXplIHJlc3RyaWN0aW9ucy4gIElHTk9SRSBlcXVhbCBgc2Fm ZScgbWVhbnMKIHdpbmRvd3MgY2FuIGdldCBhcyBzbWFsbCBhcyBgd2luZG93LXNhZmUtbWlu LWhlaWdodCcgYW5kCi1gd2luZG93LXNhZmUtbWluLXdpZHRoJy4iCitgd2luZG93LXNhZmUt bWluLXdpZHRoJy4KKworT3B0aW9uYWwgYXJndW1lbnQgS0VFUC1XSU5ET1dTIG5vbi1uaWwg bWVhbnMgdG8gbmV2ZXIgZGVsZXRlIGFueQord2luZG93cyBzYXZlZCBieSBTVEFURSB3aG9z ZSBidWZmZXJzIHdlcmUgZGVsZXRlZCBzaW5jZSBTVEFURSB3YXMKK3NhdmVkLiAgYHdpbmRv dy1zdGF0ZS1wdXQnIHJlY29yZHMgc3VjaCB3aW5kb3dzIGluIGEgbGlzdCBhbmQKK2NhbGxz IHRoZSBmdW5jdGlvbnMgaW4gYHdpbmRvdy1zdGF0ZS1wdXQta2VlcC13aW5kb3ctZnVuY3Rp b25zJword2l0aCBhIGxpc3Qgb2YgdHdvIGFyZ3VtZW50czogdGhlIGZyYW1lIHdoZXJlIFNU QVRFIHdhcyBwdXQgYW5kIGEKK2xpc3Qgb2YgZW50cmllcyBmb3IgZWFjaCBzdWNoIHdpbmRv dy4gIEVhY2ggZW50cnkgY29udGFpbnMgZm91cgorZWxlbWVudHMgLSB0aGUgd2luZG93LCBp dHMgb2xkIGJ1ZmZlciBhbmQgdGhlIGxhc3QgcG9zaXRpb25zIG9mCitgd2luZG93LXN0YXJ0 JyBhbmQgYHdpbmRvdy1wb2ludCcgZm9yIHRoZSBidWZmZXIgaW4gdGhhdCB3aW5kb3cuCitL RUVQLVdJTkRPV1MgbmlsIG1lYW5zIHN1Y2ggd2luZG93cyBhcmUgZGVsZXRlZCwgaWYgcG9z c2libGUuIgogICAoc2V0cSB3aW5kb3ctc3RhdGUtcHV0LXN0YWxlLXdpbmRvd3MgbmlsKQor ICAoc2V0cSB3aW5kb3ctc3RhdGUtcHV0LWtlcHQtd2luZG93cyBuaWwpCiAKICAgOzsgV2hl biBXSU5ET1cgaXMgaW50ZXJuYWwgb3IgbmlsLCByZWR1Y2UgaXQgdG8gYSBsaXZlIG9uZSwK ICAgOzsgdGhlbiBjcmVhdGUgYSBuZXcgd2luZG93IG9uIHRoZSBzYW1lIGZyYW1lIHRvIHB1 dCBTVEFURSBpbnRvLgpAQCAtNjQ4OSwxNSArNjUyNywyMSBAQCB3aW5kb3ctc3RhdGUtcHV0 CiAgICAgICAod2l0aC10ZW1wLWJ1ZmZlcgogCShzZXQtd2luZG93LWJ1ZmZlciB3aW5kb3cg KGN1cnJlbnQtYnVmZmVyKSkKIAkod2luZG93LS1zdGF0ZS1wdXQtMSBzdGF0ZSB3aW5kb3cg bmlsIHRvdGFscyBwaXhlbHdpc2UpCi0JKHdpbmRvdy0tc3RhdGUtcHV0LTIgaWdub3JlIHBp eGVsd2lzZSkpCisJKHdpbmRvdy0tc3RhdGUtcHV0LTIgaWdub3JlIHBpeGVsd2lzZSBrZWVw LXdpbmRvd3MpKQogICAgICAgKHdoaWxlIHdpbmRvdy1zdGF0ZS1wdXQtc3RhbGUtd2luZG93 cwogCShsZXQgKCh3aW5kb3cgKHBvcCB3aW5kb3ctc3RhdGUtcHV0LXN0YWxlLXdpbmRvd3Mp KSkKLSAgICAgICAgICA7OyBBdm9pZCB0aGF0ICd3aW5kb3ctZGVsZXRhYmxlLXAnIHRocm93 cyBhbiBlcnJvciBpZiB3aW5kb3cKKwkgIDs7IEF2b2lkIHRoYXQgJ3dpbmRvdy1kZWxldGFi bGUtcCcgdGhyb3dzIGFuIGVycm9yIGlmIHdpbmRvdwogICAgICAgICAgIDs7IHdhcyBhbHJl YWR5IGRlbGV0ZWQgd2hlbiBleGl0aW5nICd3aXRoLXRlbXAtYnVmZmVyJyBhYm92ZQogICAg ICAgICAgIDs7IChCdWcjNTQwMjgpLgogCSAgKHdoZW4gKGFuZCAod2luZG93LXZhbGlkLXAg d2luZG93KQogICAgICAgICAgICAgICAgICAgICAgKGVxICh3aW5kb3ctZGVsZXRhYmxlLXAg d2luZG93KSB0KSkKIAkgICAgKGRlbGV0ZS13aW5kb3cgd2luZG93KSkpKQorICAgICAgKHdo ZW4gd2luZG93LXN0YXRlLXB1dC1rZXB0LXdpbmRvd3MKKwkod2hlbiB3aW5kb3ctc3RhdGUt cHV0LWtlZXAtd2luZG93LWZ1bmN0aW9ucworCSAgKHJ1bi1ob29rLXdpdGgtYXJncworCSAg ICd3aW5kb3ctc3RhdGUtcHV0LWtlZXAtd2luZG93LWZ1bmN0aW9ucworCSAgIGZyYW1lIHdp bmRvdy1zdGF0ZS1wdXQta2VwdC13aW5kb3dzKSkKKwkoc2V0cSB3aW5kb3ctc3RhdGUtcHV0 LWtlcHQtd2luZG93cyBuaWwpKQogICAgICAgKHdpbmRvdy0tY2hlY2sgZnJhbWUpKSkpCiAK IChkZWZ1biB3aW5kb3ctc3RhdGUtYnVmZmVycyAoc3RhdGUpCmRpZmYgLS1naXQgYS9zcmMv a2V5Ym9hcmQuYyBiL3NyYy9rZXlib2FyZC5jCmluZGV4IGUxZDczOGRkNmVmLi5iNmJhM2M1 N2ZmOCAxMDA2NDQKLS0tIGEvc3JjL2tleWJvYXJkLmMKKysrIGIvc3JjL2tleWJvYXJkLmMK QEAgLTIyODEsNyArMjI4MSw3IEBAIHJlYWRfY2hhcl9oZWxwX2Zvcm1fdW53aW5kICh2b2lk KQogICBMaXNwX09iamVjdCB3aW5kb3dfY29uZmlnID0gWENBUiAoaGVscF9mb3JtX3NhdmVk X3dpbmRvd19jb25maWdzKTsKICAgaGVscF9mb3JtX3NhdmVkX3dpbmRvd19jb25maWdzID0g WENEUiAoaGVscF9mb3JtX3NhdmVkX3dpbmRvd19jb25maWdzKTsKICAgaWYgKCFOSUxQICh3 aW5kb3dfY29uZmlnKSkKLSAgICBGc2V0X3dpbmRvd19jb25maWd1cmF0aW9uICh3aW5kb3df Y29uZmlnLCBRbmlsLCBRbmlsKTsKKyAgICBGc2V0X3dpbmRvd19jb25maWd1cmF0aW9uICh3 aW5kb3dfY29uZmlnLCBRbmlsLCBRbmlsLCBRbmlsKTsKIH0KIAogI2RlZmluZSBTVE9QX1BP TExJTkcJCQkJCVwKZGlmZiAtLWdpdCBhL3NyYy9tYXJrZXIuYyBiL3NyYy9tYXJrZXIuYwpp bmRleCAzNzdmNmZiZThkYi4uMTRiOWY2M2YwY2QgMTAwNjQ0Ci0tLSBhL3NyYy9tYXJrZXIu YworKysgYi9zcmMvbWFya2VyLmMKQEAgLTQ1OCw2ICs0NTgsMTggQEAgREVGVU4gKCJtYXJr ZXItcG9zaXRpb24iLCBGbWFya2VyX3Bvc2l0aW9uLCBTbWFya2VyX3Bvc2l0aW9uLCAxLCAx LCAwLAogICByZXR1cm4gUW5pbDsKIH0KIAorREVGVU4gKCJtYXJrZXItbGFzdC1wb3NpdGlv biIsIEZtYXJrZXJfbGFzdF9wb3NpdGlvbiwgU21hcmtlcl9sYXN0X3Bvc2l0aW9uLCAxLCAx LCAwLAorICAgICAgIGRvYzogLyogUmV0dXJuIGxhc3QgcG9zaXRpb24gb2YgTUFSS0VSIGlu IGl0cyBidWZmZXIuCitUaGlzIGlzIGxpa2UgYG1hcmtlci1wb3NpdGlvbicgd2l0aCBvbmUg ZXhjZXB0aW9uOiAgSWYgdGhlIGJ1ZmZlciBvZgorTUFSS0VSIGlzIGRlYWQsIGl0IHJldHVy bnMgdGhlIGxhc3QgcG9zaXRpb24gb2YgTUFSS0VSIGluIHRoYXQgYnVmZmVyCitiZWZvcmUg aXQgd2FzIGtpbGxlZC4gICovKQorICAoTGlzcF9PYmplY3QgbWFya2VyKQoreworICBDSEVD S19NQVJLRVIgKG1hcmtlcik7CisKKyAgcmV0dXJuIG1ha2VfZml4bnVtIChYTUFSS0VSICht YXJrZXIpLT5jaGFycG9zKTsKK30KKwogLyogQ2hhbmdlIE0gc28gaXQgcG9pbnRzIHRvIEIg YXQgQ0hBUlBPUyBhbmQgQllURVBPUy4gICovCiAKIHN0YXRpYyB2b2lkCkBAIC04MjUsNiAr ODM3LDcgQEAgdmVyaWZ5X2J5dGVwb3MgKHB0cmRpZmZfdCBjaGFycG9zKQogc3ltc19vZl9t YXJrZXIgKHZvaWQpCiB7CiAgIGRlZnN1YnIgKCZTbWFya2VyX3Bvc2l0aW9uKTsKKyAgZGVm c3ViciAoJlNtYXJrZXJfbGFzdF9wb3NpdGlvbik7CiAgIGRlZnN1YnIgKCZTbWFya2VyX2J1 ZmZlcik7CiAgIGRlZnN1YnIgKCZTc2V0X21hcmtlcik7CiAgIGRlZnN1YnIgKCZTY29weV9t YXJrZXIpOwpkaWZmIC0tZ2l0IGEvc3JjL3dpbmRvdy5jIGIvc3JjL3dpbmRvdy5jCmluZGV4 IDNhNTRmN2NlN2IxLi5jYjM3OTgzYjY0OCAxMDA2NDQKLS0tIGEvc3JjL3dpbmRvdy5jCisr KyBiL3NyYy93aW5kb3cuYwpAQCAtNzA3OSw3ICs3MDc5LDcgQEAgREVGVU4gKCJ3aW5kb3ct Y29uZmlndXJhdGlvbi1mcmFtZSIsIEZ3aW5kb3dfY29uZmlndXJhdGlvbl9mcmFtZSwgU3dp bmRvd19jb25maWcKIH0KIAogREVGVU4gKCJzZXQtd2luZG93LWNvbmZpZ3VyYXRpb24iLCBG c2V0X3dpbmRvd19jb25maWd1cmF0aW9uLAotICAgICAgIFNzZXRfd2luZG93X2NvbmZpZ3Vy YXRpb24sIDEsIDMsIDAsCisgICAgICAgU3NldF93aW5kb3dfY29uZmlndXJhdGlvbiwgMSwg NCwgMCwKICAgICAgICBkb2M6IC8qIFNldCB0aGUgY29uZmlndXJhdGlvbiBvZiB3aW5kb3dz IGFuZCBidWZmZXJzIGFzIHNwZWNpZmllZCBieSBDT05GSUdVUkFUSU9OLgogQ09ORklHVVJB VElPTiBtdXN0IGJlIGEgdmFsdWUgcHJldmlvdXNseSByZXR1cm5lZAogYnkgYGN1cnJlbnQt d2luZG93LWNvbmZpZ3VyYXRpb24nICh3aGljaCBzZWUpLgpAQCAtNzA5MCwxNiArNzA5MCwz NSBAQCBERUZVTiAoInNldC13aW5kb3ctY29uZmlndXJhdGlvbiIsIEZzZXRfd2luZG93X2Nv bmZpZ3VyYXRpb24sCiB0aGUgbWluaS13aW5kb3cgb2YgdGhlIGZyYW1lIGRvZXNuJ3QgZ2V0 IHNldCB0byB0aGUgY29ycmVzcG9uZGluZyBlbGVtZW50CiBvZiBDT05GSUdVUkFUSU9OLgog CitOb3JtYWxseSwgdGhpcyBmdW5jdGlvbiB3aWxsIHRyeSB0byBkZWxldGUgYW55IGRlYWQg d2luZG93IGluCitDT05GSUdVUkFUSU9OIHdob3NlIGJ1ZmZlciBoYXMgYmVlbiBkZWxldGVk IHNpbmNlIENPTkZJR1VSQVRJT04gd2FzCittYWRlLiAgSG93ZXZlciwgaWYgS0VFUC1XSU5E T1dTIGlzIG5vbi1uaWwsIGl0IHdpbGwgcHJlc2VydmUgc3VjaCBhCit3aW5kb3cgaW4gdGhl IHJlc3RvcmVkIGxheW91dCBhbmQgc2hvdyBhbm90aGVyIGJ1ZmZlciBpbiBpdC4KKworQWZ0 ZXIgcmVzdG9yaW5nIHRoZSBmcmFtZSBsYXlvdXQsIHRoaXMgZnVuY3Rpb24gcnVucyB0aGUg YWJub3JtYWwgaG9vaworJ3Bvc3Qtc2V0LXdpbmRvdy1jb25maWd1cmF0aW9uLWZ1bmN0aW9u cycgd2l0aCB0d28gYXJndW1lbnRzIC0gdGhlIGZyYW1lCit3aG9zZSBsYXlvdXQgaXMgaGFz IHJlc3RvcmVkIGFuZCwgcHJvdmlkZWQgS0VFUC1XSU5ET1dTIGlzIG5vbi1uaWwsIGEKK2xp c3Qgb2YgZW50cmllcyBmb3IgZWFjaCB3aW5kb3cgd2hvc2UgYnVmZmVyIGhhcyBiZWVuIGZv dW5kIGRlYWQgd2hlbiBpdAordHJpZWQgdG8gcmVzdG9yZSBDT05GSUdVUkFUSU9OOiBFYWNo IGVudHJ5IGlzIGEgbGlzdCBvZiBmb3VyIGVsZW1lbnRzCis8d2luZG93LCBidWZmZXIsIHN0 YXJ0LCBwb2ludD4gd2hlcmUgYHdpbmRvdycgZGVub3RlcyB0aGUgd2luZG93IHdob3NlCiti dWZmZXIgd2FzIGZvdW5kIGRlYWQsIGBidWZmZXInIGRlbm90ZXMgdGhlIGRlYWQgYnVmZmVy LCBhbmQgYHN0YXJ0JyBhbmQKK2Bwb2ludCcgZGVub3RlIHRoZSBwb3NpdGlvbnMgb2YgYHdp bmRvdy1zdGFydCcgYW5kIGB3aW5kb3ctcG9pbnQnIG9mCit0aGF0IHdpbmRvdyBhdCB0aGUg dGltZSBDT05GSUdVUkFUSU9OIHdhcyBtYWRlLiBOb3RlIHRoYXQgdGhlc2UKK3Bvc2l0aW9u cyBhcmUgbm8gbWFya2VycyBhbmQgbWF5IGJlIG5vIG1vcmUgYWNjdXJhdGUgaWYgdGhlIGJ1 ZmZlciBoYXMKK2JlZW4gbW9kaWZpZWQgYWZ0ZXJ3YXJkcy4gIElmIEtFRVAtV0lORE9XUyBp cyBuaWwsIHRoZSBzZWNvbmQgYXJndW1lbnQKK2lzIG5pbC4KKwogSWYgQ09ORklHVVJBVElP TiB3YXMgbWFkZSBmcm9tIGEgZnJhbWUgdGhhdCBpcyBub3cgZGVsZXRlZCwKIG9ubHkgZnJh bWUtaW5kZXBlbmRlbnQgdmFsdWVzIGNhbiBiZSByZXN0b3JlZC4gIEluIHRoaXMgY2FzZSwK IHRoZSByZXR1cm4gdmFsdWUgaXMgbmlsLiAgT3RoZXJ3aXNlIHRoZSB2YWx1ZSBpcyB0LiAg Ki8pCiAgIChMaXNwX09iamVjdCBjb25maWd1cmF0aW9uLCBMaXNwX09iamVjdCBkb250X3Nl dF9mcmFtZSwKLSAgIExpc3BfT2JqZWN0IGRvbnRfc2V0X21pbml3aW5kb3cpCisgICBMaXNw X09iamVjdCBkb250X3NldF9taW5pd2luZG93LCBMaXNwX09iamVjdCBrZWVwX3dpbmRvd3Mp CiB7CiAgIHJlZ2lzdGVyIHN0cnVjdCBzYXZlX3dpbmRvd19kYXRhICpkYXRhOwogICBzdHJ1 Y3QgTGlzcF9WZWN0b3IgKnNhdmVkX3dpbmRvd3M7CiAgIExpc3BfT2JqZWN0IG5ld19jdXJy ZW50X2J1ZmZlcjsKICAgTGlzcF9PYmplY3QgZnJhbWU7CisgIExpc3BfT2JqZWN0IGtlcHRf d2luZG93cyA9IFFuaWw7CiAgIExpc3BfT2JqZWN0IG9sZF9mcmFtZSA9IHNlbGVjdGVkX2Zy YW1lOwogICBzdHJ1Y3QgZnJhbWUgKmY7CiAgIHB0cmRpZmZfdCBvbGRfcG9pbnQgPSAtMTsK QEAgLTczNDAsNiArNzM1OSwxMSBAQCBERUZVTiAoInNldC13aW5kb3ctY29uZmlndXJhdGlv biIsIEZzZXRfd2luZG93X2NvbmZpZ3VyYXRpb24sCiAJCSAgIEJVRl9QVCAoWEJVRkZFUiAo dy0+Y29udGVudHMpKSwKIAkJICAgQlVGX1BUX0JZVEUgKFhCVUZGRVIgKHctPmNvbnRlbnRz KSkpOwogCSAgICAgIHctPnN0YXJ0X2F0X2xpbmVfYmVnID0gdHJ1ZTsKKwkgICAgICBpZiAo IU5JTFAgKGtlZXBfd2luZG93cykpCisJCWtlcHRfd2luZG93cyA9IEZjb25zIChsaXN0NCAo d2luZG93LCBwLT5idWZmZXIsCisJCQkJCSAgICAgRm1hcmtlcl9sYXN0X3Bvc2l0aW9uIChw LT5zdGFydCksCisJCQkJCSAgICAgRm1hcmtlcl9sYXN0X3Bvc2l0aW9uIChwLT5wb2ludG0p KSwKKwkJCQkgICAgICBrZXB0X3dpbmRvd3MpOwogCSAgICB9CiAJICBlbHNlIGlmICghTklM UCAody0+c3RhcnQpKQogCSAgICAvKiBMZWFmIHdpbmRvdyBoYXMgbm8gbGl2ZSBidWZmZXIs IGdldCBvbmUuICAqLwpAQCAtNzM2MCw2ICs3Mzg0LDExIEBAIERFRlVOICgic2V0LXdpbmRv dy1jb25maWd1cmF0aW9uIiwgRnNldF93aW5kb3dfY29uZmlndXJhdGlvbiwKIAkJZGVhZF93 aW5kb3dzID0gRmNvbnMgKHdpbmRvdywgZGVhZF93aW5kb3dzKTsKIAkgICAgICAvKiBNYWtl IHN1cmUgd2luZG93IGlzIG5vIG1vcmUgZGVkaWNhdGVkLiAgKi8KIAkgICAgICB3c2V0X2Rl ZGljYXRlZCAodywgUW5pbCk7CisJICAgICAgaWYgKCFOSUxQIChrZWVwX3dpbmRvd3MpKQor CQlrZXB0X3dpbmRvd3MgPSBGY29ucyAobGlzdDQgKHdpbmRvdywgcC0+YnVmZmVyLAorCQkJ CQkgICAgIEZtYXJrZXJfbGFzdF9wb3NpdGlvbiAocC0+c3RhcnQpLAorCQkJCQkgICAgIEZt YXJrZXJfbGFzdF9wb3NpdGlvbiAocC0+cG9pbnRtKSksCisJCQkJICAgICAga2VwdF93aW5k b3dzKTsKIAkgICAgfQogCX0KIApAQCAtNzQxMSwxMiArNzQ0MCwxMyBAQCBERUZVTiAoInNl dC13aW5kb3ctY29uZmlndXJhdGlvbiIsIEZzZXRfd2luZG93X2NvbmZpZ3VyYXRpb24sCiAg ICAgICB1bmJsb2NrX2lucHV0ICgpOwogCiAgICAgICAvKiBTY2FuIGRlYWQgYnVmZmVyIHdp bmRvd3MuICAqLwotICAgICAgZm9yICg7IENPTlNQIChkZWFkX3dpbmRvd3MpOyBkZWFkX3dp bmRvd3MgPSBYQ0RSIChkZWFkX3dpbmRvd3MpKQotCXsKLQkgIHdpbmRvdyA9IFhDQVIgKGRl YWRfd2luZG93cyk7Ci0JICBpZiAoV0lORE9XX0xJVkVfUCAod2luZG93KSAmJiAhRVEgKHdp bmRvdywgRlJBTUVfUk9PVF9XSU5ET1cgKGYpKSkKLQkgICAgZGVsZXRlX2RlbGV0YWJsZV93 aW5kb3cgKHdpbmRvdyk7Ci0JfQorICAgICAgaWYgKE5JTFAgKGtlZXBfd2luZG93cykpCisJ Zm9yICg7IENPTlNQIChkZWFkX3dpbmRvd3MpOyBkZWFkX3dpbmRvd3MgPSBYQ0RSIChkZWFk X3dpbmRvd3MpKQorCSAgeworCSAgICB3aW5kb3cgPSBYQ0FSIChkZWFkX3dpbmRvd3MpOwor CSAgICBpZiAoV0lORE9XX0xJVkVfUCAod2luZG93KSAmJiAhRVEgKHdpbmRvdywgRlJBTUVf Uk9PVF9XSU5ET1cgKGYpKSkKKwkgICAgICBkZWxldGVfZGVsZXRhYmxlX3dpbmRvdyAod2lu ZG93KTsKKwkgIH0KIAogICAgICAgLyogUmVjb3JkIHRoZSBzZWxlY3RlZCB3aW5kb3cncyBi dWZmZXIgaGVyZS4gIFRoZSB3aW5kb3cgc2hvdWxkCiAJIGFscmVhZHkgYmUgdGhlIHNlbGVj dGVkIG9uZSBmcm9tIHRoZSBjYWxsIGFib3ZlLiAgKi8KQEAgLTc0NjMsNiArNzQ5MywxMSBA QCBERUZVTiAoInNldC13aW5kb3ctY29uZmlndXJhdGlvbiIsIEZzZXRfd2luZG93X2NvbmZp Z3VyYXRpb24sCiAgIG1pbmlidWZfc2VsZWN0ZWRfd2luZG93ID0gZGF0YS0+bWluaWJ1Zl9z ZWxlY3RlZF93aW5kb3c7CiAKICAgU0FGRV9GUkVFICgpOworCisgIGlmICghTklMUCAoVnJ1 bl9ob29rcykgJiYgIU5JTFAgKFZwb3N0X3NldF93aW5kb3dfY29uZmlndXJhdGlvbl9mdW5j dGlvbnMpKQorICAgIHJ1bl9ob29rX3dpdGhfYXJnc18yIChRcG9zdF9zZXRfd2luZG93X2Nv bmZpZ3VyYXRpb25fZnVuY3Rpb25zLCBmcmFtZSwKKwkJCSAga2VwdF93aW5kb3dzKTsKKwog ICByZXR1cm4gRlJBTUVfTElWRV9QIChmKSA/IFF0IDogUW5pbDsKIH0KIApAQCAtNzQ3Miwx MiArNzUwNywxMiBAQCByZXN0b3JlX3dpbmRvd19jb25maWd1cmF0aW9uIChMaXNwX09iamVj dCBjb25maWd1cmF0aW9uKQogICBpZiAoQ09OU1AgKGNvbmZpZ3VyYXRpb24pKQogICAgIEZz ZXRfd2luZG93X2NvbmZpZ3VyYXRpb24gKFhDQVIgKGNvbmZpZ3VyYXRpb24pLAogCQkJICAg ICAgIEZjYXJfc2FmZSAoWENEUiAoY29uZmlndXJhdGlvbikpLAotCQkJICAgICAgIEZjYXJf c2FmZSAoRmNkcl9zYWZlIChYQ0RSIChjb25maWd1cmF0aW9uKSkpKTsKKwkJCSAgICAgICBG Y2FyX3NhZmUgKEZjZHJfc2FmZSAoWENEUiAoY29uZmlndXJhdGlvbikpKSwKKwkJCSAgICAg ICBRbmlsKTsKICAgZWxzZQotICAgIEZzZXRfd2luZG93X2NvbmZpZ3VyYXRpb24gKGNvbmZp Z3VyYXRpb24sIFFuaWwsIFFuaWwpOworICAgIEZzZXRfd2luZG93X2NvbmZpZ3VyYXRpb24g KGNvbmZpZ3VyYXRpb24sIFFuaWwsIFFuaWwsIFFuaWwpOwogfQogCi0KIC8qIElmIFdJTkRP VyBpcyBhbiBpbnRlcm5hbCB3aW5kb3csIHJlY3Vyc2l2ZWx5IGRlbGV0ZSBhbGwgY2hpbGQg d2luZG93cwogICAgcmVhY2hhYmxlIHZpYSB0aGUgbmV4dCBhbmQgY29udGVudHMgc2xvdHMg b2YgV0lORE9XLiAgT3RoZXJ3aXNlIHNldHVwCiAgICBXSU5ET1cgdG8gbm90IHNob3cgYW55 IGJ1ZmZlci4gICovCkBAIC03NjkwLDYgKzc3MjUsNyBAQCBzYXZlX3dpbmRvd19zYXZlIChM aXNwX09iamVjdCB3aW5kb3csIHN0cnVjdCBMaXNwX1ZlY3RvciAqdmVjdG9yLCBwdHJkaWZm X3QgaSkKIAkJCQkgICAgICBCVUZfUFRfQllURSAoWEJVRkZFUiAody0+Y29udGVudHMpKSk7 CiAJICBlbHNlCiAJICAgIHAtPnBvaW50bSA9IEZjb3B5X21hcmtlciAody0+cG9pbnRtLCBR bmlsKTsKKwogCSAgcC0+b2xkX3BvaW50bSA9IEZjb3B5X21hcmtlciAody0+b2xkX3BvaW50 bSwgUW5pbCk7CiAJICBYTUFSS0VSIChwLT5wb2ludG0pLT5pbnNlcnRpb25fdHlwZSA9IHdp bmRvd19wb2ludF9pbnNlcnRpb25fdHlwZTsKIAkgIFhNQVJLRVIgKHAtPm9sZF9wb2ludG0p LT5pbnNlcnRpb25fdHlwZSA9IHdpbmRvd19wb2ludF9pbnNlcnRpb25fdHlwZTsKQEAgLTg0 NjAsNiArODQ5Niw4IEBAIHN5bXNfb2Zfd2luZG93ICh2b2lkKQogICBERUZTWU0gKFFoZWFk ZXJfbGluZV9mb3JtYXQsICJoZWFkZXItbGluZS1mb3JtYXQiKTsKICAgREVGU1lNIChRdGFi X2xpbmVfZm9ybWF0LCAidGFiLWxpbmUtZm9ybWF0Iik7CiAgIERFRlNZTSAoUW5vX290aGVy X3dpbmRvdywgIm5vLW90aGVyLXdpbmRvdyIpOworICBERUZTWU0gKFFwb3N0X3NldF93aW5k b3dfY29uZmlndXJhdGlvbl9mdW5jdGlvbnMsCisJICAicG9zdC1zZXQtd2luZG93LWNvbmZp Z3VyYXRpb24tZnVuY3Rpb25zIik7CiAKICAgREVGVkFSX0xJU1AgKCJ0ZW1wLWJ1ZmZlci1z aG93LWZ1bmN0aW9uIiwgVnRlbXBfYnVmZmVyX3Nob3dfZnVuY3Rpb24sCiAJICAgICAgIGRv YzogLyogTm9uLW5pbCBtZWFucyBjYWxsIGFzIGZ1bmN0aW9uIHRvIGRpc3BsYXkgYSBoZWxw IGJ1ZmZlci4KQEAgLTg2MTcsNiArODY1NSwyMSBAQCBzeW1zX29mX3dpbmRvdyAodm9pZCkK IGNhbGwgaXMgcGVyZm9ybWVkIHdpdGggdGhlIGZyYW1lIHRlbXBvcmFyaWx5IHNlbGVjdGVk LiAgKi8pOwogICBWd2luZG93X2NvbmZpZ3VyYXRpb25fY2hhbmdlX2hvb2sgPSBRbmlsOwog CisgIERFRlZBUl9MSVNQICgicG9zdC1zZXQtd2luZG93LWNvbmZpZ3VyYXRpb24tZnVuY3Rp b25zIiwKKwkgICAgICAgVnBvc3Rfc2V0X3dpbmRvd19jb25maWd1cmF0aW9uX2Z1bmN0aW9u cywKKwkgICAgICAgZG9jOiAvKiBGdW5jdGlvbnMgY2FsbGVkIGFmdGVyIHJlc3RvcmluZyBh IHdpbmRvdyBjb25maWd1cmF0aW9uLgorVGhlIHZhbHVlIHNob3VsZCBiZSBhIGxpc3Qgb2Yg ZnVuY3Rpb25zIHRoYXQgdGFrZSB0d28gYXJndW1lbnRzLgorCitUaGlzIGZ1bmN0aW9uIGlz IGNhbGxlZCBieSBgc2V0LXdpbmRvdy1jb25maWd1cmF0aW9uJyBhZnRlciBpdCBoYXMKK3Jl c3RvcmVkIHRoZSBsYXlvdXQgb2YgYSBmcmFtZS4gIFRoZSBmaXJzdCBhcmd1bWVudCBzcGVj aWZpZXMgdGhlIGZyYW1lCit3aG9zZSBjb25maWd1cmF0aW9uIGhhcyBiZWVuIHJlc3RvcmVk LiAgVGhlIHNlY29uZCBhcmd1bWVudCwgaWYgbm9uLW5pbCwKK3NwZWNpZmllcyBhIGxpc3Qg b2YgZW50cmllcyBmb3IgZWFjaCB3aW5kb3cgd2hvc2UgYnVmZmVyIGhhcyBiZWVuIGZvdW5k CitkZWFkIGF0IHRoZSB0aW1lICdzZXQtd2luZG93LWNvbmZpZ3VyYXRpb24nIHRyaWVkIHRv IHJlc3RvcmUgaXQgaW4gdGhhdAord2luZG93LiAgRWFjaCBlbnRyeSBpcyBhIGxpc3Qgb2Yg Zm91ciB2YWx1ZXMgLSB0aGUgd2luZG93IHdob3NlIGJ1ZmZlcgord2FzIGZvdW5kIGRlYWQs IHRoZSBkZWFkIGJ1ZmZlciwgYW5kIHRoZSBwb3NpdGlvbnMgb2Ygc3RhcnQgYW5kIHBvaW50 IG9mCit0aGUgYnVmZmVyIGluIHRoYXQgd2luZG93LiAgKi8pOworICBWcG9zdF9zZXRfd2lu ZG93X2NvbmZpZ3VyYXRpb25fZnVuY3Rpb25zID0gUW5pbDsKKwogICBERUZWQVJfTElTUCAo InJlY2VudGVyLXJlZGlzcGxheSIsIFZyZWNlbnRlcl9yZWRpc3BsYXksCiAJICAgICAgIGRv YzogLyogTm9uLW5pbCBtZWFucyBgcmVjZW50ZXInIHJlZHJhd3MgZW50aXJlIGZyYW1lLgog SWYgdGhpcyBvcHRpb24gaXMgbm9uLW5pbCwgdGhlbiB0aGUgYHJlY2VudGVyJyBjb21tYW5k IHdpdGggYSBuaWwK --------------hys38LS9BQejc30NIWcM9Lk2--