From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 522BE3858423 for ; Mon, 22 May 2023 14:22:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 522BE3858423 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 85E481FF61; Mon, 22 May 2023 14:22:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1684765350; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ZIyDEgVG2ziXwCq/jX3500M/NHDimMDmPf381x5550U=; b=TYpWZwlIdq8AyJEd7BrgJERfL90t/A/uMkRjtd3FQr9WeLbK8BZlwKiGnuG0z/Y/gHLvtA k+DIDOZRC4ejvFqBE6YwkhDCL56rPflNMh/Bhb1tbLk3Omjlrij57CKz7+ANT2WpNmTR1F 3CU7Kwz2v2tOhS8+3vXi+03yQlvpsV4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1684765350; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ZIyDEgVG2ziXwCq/jX3500M/NHDimMDmPf381x5550U=; b=YV9fSU6xyQQSJ2k1cxHk8+WZV+oXsXXmK8JI+T7e6yg4bp1r76Jr7WDndg4VPyaPqbkT22 8hM18dKFPpXs8EBg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5D09513336; Mon, 22 May 2023 14:22:30 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 60+YFaZ6a2TsGwAAMHmgww (envelope-from ); Mon, 22 May 2023 14:22:30 +0000 Content-Type: multipart/mixed; boundary="------------6YxYHMSUCNBDWnaILnzKqDmn" Message-ID: <3b41cd80-c438-3cd9-a770-9262771db916@suse.de> Date: Mon, 22 May 2023 16:22:32 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH] [gdb/tui] Add set style tui-status-window Content-Language: en-US To: Eli Zaretskii Cc: gdb-patches@sourceware.org, Tom Tromey References: <20230522131545.12291-1-tdevries@suse.de> <20230522131545.12291-3-tdevries@suse.de> <83sfbopjfu.fsf@gnu.org> From: Tom de Vries In-Reply-To: <83sfbopjfu.fsf@gnu.org> X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This is a multi-part message in MIME format. --------------6YxYHMSUCNBDWnaILnzKqDmn Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 5/22/23 15:47, Eli Zaretskii wrote: >> Cc: Tom Tromey >> Date: Mon, 22 May 2023 15:15:40 +0200 >> From: Tom de Vries via Gdb-patches >> >> --- a/gdb/doc/gdb.texinfo >> +++ b/gdb/doc/gdb.texinfo >> @@ -27300,6 +27300,13 @@ general styling to @value{GDBN}. @xref{TUI Configuration}. >> Control the styling of the active TUI border; that is, the TUI window >> that has the focus. >> >> +@item tui-status-window >> +Control the styling of the TUI status window. Note that, unlike other >> +styling options, the tui-border has a mode rather than an intensity. >> +The values for mode are the same as for @ref{set tui border-mode} and >> +@ref{set tui active-border-mode}. By default, this style's mode is > > This use of @ref is not recommended. It looks better in the HTML > version of the manual, but in Info and in PDF it looks like a typo or > editing error. I suggest to use @pxref instead, like this: > > The values for mode are the same as for tui border-mode (@pxref{set > tui border-mode}) and tui active-border-mode. > > It might look less elegant in HTML, but much better in other formats. > Done. >> +standout, and the foreground and background colors are none. > ^^^^ > "@code{none}", perhaps? > Done. >> +@anchor{set tui border-mode} >> @item set tui border-mode @var{mode} >> @kindex set tui border-mode >> +@anchor{set tui active-border-mode} >> @itemx set tui active-border-mode @var{mode} >> @kindex set tui active-border-mode > > If you go with my suggestion above about @pxref, you don't need the > second one of these @anchor's. > Done. Thanks for the review, updated patch attached. Thanks, - Tom --------------6YxYHMSUCNBDWnaILnzKqDmn Content-Type: text/x-patch; charset=UTF-8; name="0001-gdb-tui-Add-set-style-tui-status-window.patch" Content-Disposition: attachment; filename="0001-gdb-tui-Add-set-style-tui-status-window.patch" Content-Transfer-Encoding: base64 RnJvbSBmNzYwMzI1ZTM1YTRhNTZiYjE2NWI3ZjcwZmIxZWFkNGIxMmRjMjQ3IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBUb20gZGUgVnJpZXMgPHRkZXZyaWVzQHN1c2UuZGU+ CkRhdGU6IFNhdCwgMTMgTWF5IDIwMjMgMjA6NTI6NTUgKzAyMDAKU3ViamVjdDogW1BBVENI XSBbZ2RiL3R1aV0gQWRkIHNldCBzdHlsZSB0dWktc3RhdHVzLXdpbmRvdwoKQ3VycmVudGx5 LCB0aGUgc3RhdHVzIHdpbmRvdyBhdHRyaWJ1dGVzIGFyZSBoYXJkY29kZWQgdG8gc3RhbmRv dXQuCgpBZGQgYSBuZXcgY29tbWFuZCAic2V0IHN0eWxlIHR1aS1zdGF0dXMtd2luZG93IGZv cmVncm91bmQvYmFja2dyb3VuZC9tb2RlIgp0aGF0IGNvbnRyb2xzIHRoZSBmb3JlZ3JvdW5k IGFuZCBiYWNrZ3JvdW5kIGNvbG9ycywgYW5kIHRoZSBhdHRyaWJ1dGVzIGZvciB0aGUKc3Rh dHVzIHdpbmRvdywgd2hlcmUgdGhlIGF0dHJpYnV0ZXMgdXNlIHRoZSBzYW1lIDxtb2RlPiBv cHRpb25zIGFzIHVzZWQKZm9yICJzZXQgdHVpIGJvcmRlci1tb2RlIiBhbmQgInNldCB0dWkg YWN0aXZlLWJvcmRlci1tb2RlIi4KClRoZSBkZWZhdWx0IGlzIG5vbmUvbm9uZS9zdGFuZG91 dCwgc28gdGhlcmUncyBubyBjaGFuZ2UgaW4gYmVoYXZpb3VyLgoKVGVzdGVkIG9uIHg4Nl82 NC1saW51eC4KClJldmlld2VkLUJ5OiBFbGkgWmFyZXRza2lpIDxlbGl6QGdudS5vcmc+Ci0t LQogZ2RiL2NsaS9jbGktc3R5bGUuYyAgICAgICAgICAgICB8IDEyICsrKysrKysKIGdkYi9j bGkvY2xpLXN0eWxlLmggICAgICAgICAgICAgfCAxMCArKysrKysKIGdkYi9kb2MvZ2RiLnRl eGluZm8gICAgICAgICAgICAgfCAgOSArKysrKwogZ2RiL3Rlc3RzdWl0ZS9nZGIudHVpL2Jh c2ljLmV4cCB8ICA1ICsrKwogZ2RiL3R1aS90dWktc3RhY2suYyAgICAgICAgICAgICB8IDE2 ICsrKysrLS0tLQogZ2RiL3R1aS90dWktd2luLmMgICAgICAgICAgICAgICB8IDU4ICsrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKwogZ2RiL3R1aS90dWktd2luLmggICAgICAg ICAgICAgICB8ICAzICsrCiA3IGZpbGVzIGNoYW5nZWQsIDEwNiBpbnNlcnRpb25zKCspLCA3 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dkYi9jbGkvY2xpLXN0eWxlLmMgYi9nZGIv Y2xpL2NsaS1zdHlsZS5jCmluZGV4IGNkNTEwYjQ0MGRiLi4yOWFhMmQ5MmNkMyAxMDA2NDQK LS0tIGEvZ2RiL2NsaS9jbGktc3R5bGUuYworKysgYi9nZGIvY2xpL2NsaS1zdHlsZS5jCkBA IC0xMDEsNiArMTAxLDEwIEBAIGNsaV9zdHlsZV9vcHRpb24gdHVpX2FjdGl2ZV9ib3JkZXJf c3R5bGUgKCJ0dWktYWN0aXZlLWJvcmRlciIsCiAKIC8qIFNlZSBjbGktc3R5bGUuaC4gICov CiAKK2NsaV9zdHlsZV9vcHRpb24gdHVpX3N0YXR1c193aW5kb3dfc3R5bGUgKCJ0dWktc3Rh dHVzLXdpbmRvdyIsIHVpX2ZpbGVfc3R5bGU6Ok5PTkUpOworCisvKiBTZWUgY2xpLXN0eWxl LmguICAqLworCiBjbGlfc3R5bGVfb3B0aW9uIG1ldGFkYXRhX3N0eWxlICgibWV0YWRhdGEi LCB1aV9maWxlX3N0eWxlOjpESU0pOwogCiAvKiBTZWUgY2xpLXN0eWxlLmguICAqLwpAQCAt NDY5LDYgKzQ3MywxNCBAQCBUVUkgd2luZG93IHRoYXQgZG9lcyBoYXZlIHRoZSBmb2N1cy4i KSwKIAkJCQkJCSZzdHlsZV9zaG93X2xpc3QsCiAJCQkJCQl0cnVlKTsKIAorICB0dWlfc3Rh dHVzX3dpbmRvd19zdHlsZS5hZGRfc2V0c2hvd19jb21tYW5kcyAobm9fY2xhc3MsIF8oIlwK K1RVSSBzdGF0dXMgd2luZG93IHN0eWxpbmcuXG5cCitDb25maWd1cmUgVFVJIHN0YXR1cyB3 aW5kb3cgY29sb3JzXG5cCitUaGUgXCJ0dWktc3RhdHVzLXdpbmRvd1wiIHN0eWxlIGlzIHVz ZWQgd2hlbiBHREIgZGlzcGxheXMgdGhlIHN0YXR1cyB3aW5kb3cuIiksCisJCQkJCQkmc3R5 bGVfc2V0X2xpc3QsCisJCQkJCQkmc3R5bGVfc2hvd19saXN0LAorCQkJCQkJdHJ1ZSk7CisK ICAgdmVyc2lvbl9zdHlsZS5hZGRfc2V0c2hvd19jb21tYW5kcyAobm9fY2xhc3MsIF8oIlwK IFZlcnNpb24gc3RyaW5nIGRpc3BsYXkgc3R5bGluZy5cblwKIENvbmZpZ3VyZSBjb2xvcnMg dXNlZCB0byBkaXNwbGF5IHRoZSBHREIgdmVyc2lvbiBzdHJpbmcuIiksCmRpZmYgLS1naXQg YS9nZGIvY2xpL2NsaS1zdHlsZS5oIGIvZ2RiL2NsaS9jbGktc3R5bGUuaAppbmRleCBmMzE1 MjQxY2NiNC4uYjAwYzc5OGNhZWMgMTAwNjQ0Ci0tLSBhL2dkYi9jbGkvY2xpLXN0eWxlLmgK KysrIGIvZ2RiL2NsaS9jbGktc3R5bGUuaApAQCAtNTgsNiArNTgsMTMgQEAgY2xhc3MgY2xp X3N0eWxlX29wdGlvbgogICAvKiBTYW1lIGFzIFNFVF9MSVNUIGJ1dCBmb3IgdGhlIHNob3cg Y29tbWFuZCBsaXN0LiAgKi8KICAgc3RydWN0IGNtZF9saXN0X2VsZW1lbnQgKnNob3dfbGlz dCAoKSB7IHJldHVybiBtX3Nob3dfbGlzdDsgfTsKIAorICAvKiBSZXR1cm4gdGhlICdzZXQg c3R5bGUgTkFNRScgY29tbWFuZCBsaXN0LCB0aGF0IGNhbiBiZSB1c2VkCisgICAgIHRvIGFk ZCBjb21tYW5kcyB0by4gICovCisgIHN0cnVjdCBjbWRfbGlzdF9lbGVtZW50ICoqbW9kaWZp YWJsZV9zZXRfbGlzdCAoKSB7IHJldHVybiAmbV9zZXRfbGlzdDsgfTsKKworICAvKiBTYW1l IGFzIE1PRElGSUFCTEVfU0VUX0xJU1QgYnV0IGZvciB0aGUgc2hvdyBjb21tYW5kIGxpc3Qu ICAqLworICBzdHJ1Y3QgY21kX2xpc3RfZWxlbWVudCAqKm1vZGlmaWFibGVfc2hvd19saXN0 ICgpIHsgcmV0dXJuICZtX3Nob3dfbGlzdDsgfTsKKwogICAvKiBUaGlzIHN0eWxlIGNhbiBi ZSBvYnNlcnZlZCBmb3IgYW55IGNoYW5nZXMuICAqLwogICBnZGI6Om9ic2VydmVyczo6b2Jz ZXJ2YWJsZTw+IGNoYW5nZWQ7CiAKQEAgLTEzOCw2ICsxNDUsOSBAQCBleHRlcm4gY2xpX3N0 eWxlX29wdGlvbiB0dWlfYm9yZGVyX3N0eWxlOwogLyogVGhlIGJvcmRlciBzdHlsZSBvZiBh IFRVSSB3aW5kb3cgdGhhdCBkb2VzIGhhdmUgdGhlIGZvY3VzLiAgKi8KIGV4dGVybiBjbGlf c3R5bGVfb3B0aW9uIHR1aV9hY3RpdmVfYm9yZGVyX3N0eWxlOwogCisvKiBUaGUgc3R5bGUg b2YgYSBUVUkgc3RhdHVzIHdpbmRvdy4gICovCitleHRlcm4gY2xpX3N0eWxlX29wdGlvbiB0 dWlfc3RhdHVzX3dpbmRvd19zdHlsZTsKKwogLyogVGhlIHN0eWxlIHRvIHVzZSBmb3IgdGhl IEdEQiB2ZXJzaW9uIHN0cmluZy4gICovCiBleHRlcm4gY2xpX3N0eWxlX29wdGlvbiB2ZXJz aW9uX3N0eWxlOwogCmRpZmYgLS1naXQgYS9nZGIvZG9jL2dkYi50ZXhpbmZvIGIvZ2RiL2Rv Yy9nZGIudGV4aW5mbwppbmRleCBmMjNiY2M1ZjNmOC4uZDQwMjA3M2EwMGIgMTAwNjQ0Ci0t LSBhL2dkYi9kb2MvZ2RiLnRleGluZm8KKysrIGIvZ2RiL2RvYy9nZGIudGV4aW5mbwpAQCAt MjczMDAsNiArMjczMDAsMTQgQEAgZ2VuZXJhbCBzdHlsaW5nIHRvIEB2YWx1ZXtHREJOfS4g IEB4cmVme1RVSSBDb25maWd1cmF0aW9ufS4KIENvbnRyb2wgdGhlIHN0eWxpbmcgb2YgdGhl IGFjdGl2ZSBUVUkgYm9yZGVyOyB0aGF0IGlzLCB0aGUgVFVJIHdpbmRvdwogdGhhdCBoYXMg dGhlIGZvY3VzLgogCitAaXRlbSB0dWktc3RhdHVzLXdpbmRvdworQ29udHJvbCB0aGUgc3R5 bGluZyBvZiB0aGUgVFVJIHN0YXR1cyB3aW5kb3cuICBOb3RlIHRoYXQsIHVubGlrZSBvdGhl cgorc3R5bGluZyBvcHRpb25zLCB0aGUgdHVpLWJvcmRlciBoYXMgYSBtb2RlIHJhdGhlciB0 aGFuIGFuIGludGVuc2l0eS4KK1RoZSB2YWx1ZXMgZm9yIG1vZGUgYXJlIHRoZSBzYW1lIGFz IGZvciB0dWkgYm9yZGVyLW1vZGUKKyhAcHhyZWZ7c2V0IHR1aSBib3JkZXItbW9kZX0pIGFu ZCB0dWkgYWN0aXZlLWJvcmRlci1tb2RlLgorQnkgZGVmYXVsdCwgdGhpcyBzdHlsZSdzIG1v ZGUgaXMKK3N0YW5kb3V0LCBhbmQgdGhlIGZvcmVncm91bmQgYW5kIGJhY2tncm91bmQgY29s b3JzIGFyZSBAY29kZXtub25lfS4KKwogQGl0ZW0gZGlzYXNzZW1ibGVyIGNvbW1lbnQKIENv bnRyb2wgdGhlIHN0eWxpbmcgb2YgY29tbWVudHMgaW4gdGhlIGRpc2Fzc2VtYmxlciBvdXRw dXQuICBUaGVzZSBhcmUKIG1hbmFnZWQgd2l0aCB0aGUgQGNvZGV7c2V0IHN0eWxlIGRpc2Fz c2VtYmxlciBjb21tZW50fSBmYW1pbHkgb2YKQEAgLTMwMjczLDYgKzMwMjgxLDcgQEAgVXNl IHRoZSBBbHRlcm5hdGUgQ2hhcmFjdGVyIFNldCB0byBkcmF3IHRoZSBib3JkZXIuICBUaGUg Ym9yZGVyIGlzCiBkcmF3biB1c2luZyBjaGFyYWN0ZXIgbGluZSBncmFwaGljcyBpZiB0aGUg dGVybWluYWwgc3VwcG9ydHMgdGhlbS4KIEBlbmQgdGFibGUKIAorQGFuY2hvcntzZXQgdHVp IGJvcmRlci1tb2RlfQogQGl0ZW0gc2V0IHR1aSBib3JkZXItbW9kZSBAdmFye21vZGV9CiBA a2luZGV4IHNldCB0dWkgYm9yZGVyLW1vZGUKIEBpdGVteCBzZXQgdHVpIGFjdGl2ZS1ib3Jk ZXItbW9kZSBAdmFye21vZGV9CmRpZmYgLS1naXQgYS9nZGIvdGVzdHN1aXRlL2dkYi50dWkv YmFzaWMuZXhwIGIvZ2RiL3Rlc3RzdWl0ZS9nZGIudHVpL2Jhc2ljLmV4cAppbmRleCAyYzU1 YzJiOTViYy4uMWJmY2VjMjEyNTYgMTAwNjQ0Ci0tLSBhL2dkYi90ZXN0c3VpdGUvZ2RiLnR1 aS9iYXNpYy5leHAKKysrIGIvZ2RiL3Rlc3RzdWl0ZS9nZGIudHVpL2Jhc2ljLmV4cApAQCAt MTE0LDMgKzExNCw4IEBAIHNldCBzdGF0dXNfd2luZG93X2xpbmUgMTUKIHNldCBzdGF0dXMg W1Rlcm06OmdldF9saW5lX3dpdGhfYXR0cnMgJHN0YXR1c193aW5kb3dfbGluZV0KIGdkYl9h c3NlcnQgeyBbcmVnZXhwICJePHJldmVyc2U6MT4kcmVfbm9hdHRyKjxyZXZlcnNlOjA+JCIg JHN0YXR1c10gPT0gMX0gXAogICAgICJzdGF0dXMgd2luZG93OiByZXZlcnNlIgorCitUZXJt Ojpjb21tYW5kICJzZXQgc3R5bGUgdHVpLXN0YXR1cy13aW5kb3cgbW9kZSBub3JtYWwiCisK K3NldCBzdGF0dXMgW1Rlcm06OmdldF9saW5lX3dpdGhfYXR0cnMgJHN0YXR1c193aW5kb3df bGluZV0KK2dkYl9hc3NlcnQgeyBbcmVnZXhwICJeJHJlX25vYXR0ciokIiAkc3RhdHVzXSA9 PSAxfSAic3RhdHVzIHdpbmRvdzogbm9ybWFsIgpkaWZmIC0tZ2l0IGEvZ2RiL3R1aS90dWkt c3RhY2suYyBiL2dkYi90dWkvdHVpLXN0YWNrLmMKaW5kZXggNzZiOGYwNjZhYmIuLjQ2NTA0 YjkwZjk4IDEwMDY0NAotLS0gYS9nZGIvdHVpL3R1aS1zdGFjay5jCisrKyBiL2dkYi90dWkv dHVpLXN0YWNrLmMKQEAgLTM3LDYgKzM3LDkgQEAKICNpbmNsdWRlICJ0dWkvdHVpLXdpbnNv dXJjZS5oIgogI2luY2x1ZGUgInR1aS90dWktZmlsZS5oIgogI2luY2x1ZGUgInR1aS90dWkt bG9jYXRpb24uaCIKKyNpbmNsdWRlICJ0dWkvdHVpLXdpbi5oIgorI2luY2x1ZGUgInR1aS90 dWktaW8uaCIKKyNpbmNsdWRlICJjbGkvY2xpLXN0eWxlLmgiCiAKICNpbmNsdWRlICJnZGJf Y3Vyc2VzLmgiCiAKQEAgLTIzNCwxNSArMjM3LDE0IEBAIHR1aV9sb2NhdG9yX3dpbmRvdzo6 cmVyZW5kZXIgKCkKICAgc3RkOjpzdHJpbmcgc3RyaW5nID0gbWFrZV9zdGF0dXNfbGluZSAo KTsKICAgc2Nyb2xsb2sgKGhhbmRsZS5nZXQgKCksIEZBTFNFKTsKICAgd21vdmUgKGhhbmRs ZS5nZXQgKCksIDAsIDApOwotICAvKiBXZSBpZ25vcmUgdGhlIHJldHVybiB2YWx1ZSBmcm9t IHdzdGFuZG91dCBhbmQgd3N0YW5kZW5kLCBjYXN0aW5nIHRoZW0KLSAgICAgdG8gdm9pZCBp biBvcmRlciB0byBhdm9pZCBhIGNvbXBpbGVyIHdhcm5pbmcuICBUaGUgd2FybmluZyBpdHNl bGYgd2FzCi0gICAgIGludHJvZHVjZWQgYnkgYSBwYXRjaCB0byBuY3Vyc2VzIDUuNyBkYXRl ZCAyMDA5LTA4LTI5LCBjaGFuZ2luZyB0aGVzZQotICAgICBtYWNybyB0byBleHBhbmQgdG8g Y29kZSB0aGF0IGNhdXNlcyB0aGUgY29tcGlsZXIgdG8gZ2VuZXJhdGUgYW4KLSAgICAgdW51 c2VkLXZhbHVlIHdhcm5pbmcuICAqLwotICAodm9pZCkgd3N0YW5kb3V0IChoYW5kbGUuZ2V0 ICgpKTsKKworICBpZiAoY2xpX3N0eWxpbmcpCisgICAgdHVpX2FwcGx5X3N0eWxlIChoYW5k bGUuZ2V0ICgpLCB0dWlfc3RhdHVzX3dpbmRvd19zdHlsZS5zdHlsZSAoKSk7CisgIHdhdHRy b24gKGhhbmRsZS5nZXQgKCksIHR1aV9zdGF0dXNfd2luZG93X2F0dHJzKTsKICAgd2FkZHN0 ciAoaGFuZGxlLmdldCAoKSwgc3RyaW5nLmNfc3RyICgpKTsKICAgd2NscnRvZW9sIChoYW5k bGUuZ2V0ICgpKTsKLSAgKHZvaWQpIHdzdGFuZGVuZCAoaGFuZGxlLmdldCAoKSk7CisgIHdh dHRyb2ZmIChoYW5kbGUuZ2V0ICgpLCB0dWlfc3RhdHVzX3dpbmRvd19hdHRycyk7CisgIHR1 aV9hcHBseV9zdHlsZSAoaGFuZGxlLmdldCAoKSwgdWlfZmlsZV9zdHlsZSAoKSk7CiAgIHJl ZnJlc2hfd2luZG93ICgpOwogICB3bW92ZSAoaGFuZGxlLmdldCAoKSwgMCwgMCk7CiB9CmRp ZmYgLS1naXQgYS9nZGIvdHVpL3R1aS13aW4uYyBiL2dkYi90dWkvdHVpLXdpbi5jCmluZGV4 IDY3MTBiM2UxN2U1Li44NzUxNDljZDM4YiAxMDA2NDQKLS0tIGEvZ2RiL3R1aS90dWktd2lu LmMKKysrIGIvZ2RiL3R1aS90dWktd2luLmMKQEAgLTM0Niw2ICszNDYsNDIgQEAgdHVpX3Nl dF92YXJfY21kIChjb25zdCBjaGFyICpudWxsX2FyZ3MsCiAgICAgdHVpX3JlaGlnaGxpZ2h0 X2FsbCAoKTsKIH0KIAorLyogVmFsdWUgb2YgInR1aSBzdGF0dXMtd2luZG93LW1vZGUiLiAg Ki8KKworc3RhdGljIGNvbnN0IGNoYXIgKnR1aV9zdGF0dXNfd2luZG93X21vZGUgPSAic3Rh bmRvdXQiOworCisvKiBTZWUgdHVpLXdpbi5oLiAgKi8KKworaW50IHR1aV9zdGF0dXNfd2lu ZG93X2F0dHJzOworCisvKiBTaG93IHZhbHVlIG9mICJ0dWkgc3RhdHVzLXdpbmRvdy1tb2Rl Ii4gICovCisKK3N0YXRpYyB2b2lkCitzaG93X3R1aV9zdGF0dXNfd2luZG93X21vZGUgKHN0 cnVjdCB1aV9maWxlICpmaWxlLAorCQkJICAgICBpbnQgZnJvbV90dHksCisJCQkgICAgIHN0 cnVjdCBjbWRfbGlzdF9lbGVtZW50ICpjLAorCQkJICAgICBjb25zdCBjaGFyICp2YWx1ZSkK K3sKKyAgZ2RiX3ByaW50ZiAoZmlsZSwgXygiXAorVGhlIGF0dHJpYnV0ZSBtb2RlIHRvIHVz ZSBmb3IgdGhlIFRVSSBzdGF0dXMgd2luZG93IGlzIFwiJXNcIi5cbiIpLAorCSAgICAgIHZh bHVlKTsKK30KKworLyogU2V0IHZhbHVlIG9mICJ0dWkgc3RhdHVzLXdpbmRvdy1tb2RlIi4g ICovCisKK3N0YXRpYyB2b2lkCitzZXRfdHVpX3N0YXR1c193aW5kb3dfbW9kZSAoY29uc3Qg Y2hhciAqbnVsbF9hcmdzLAorCQkJICAgIGludCBmcm9tX3R0eSwgc3RydWN0IGNtZF9saXN0 X2VsZW1lbnQgKmMpCit7CisgIHN0cnVjdCB0dWlfdHJhbnNsYXRlICplbnRyeQorICAgID0g dHJhbnNsYXRlICh0dWlfc3RhdHVzX3dpbmRvd19tb2RlLCB0dWlfYm9yZGVyX21vZGVfdHJh bnNsYXRlKTsKKyAgaWYgKHR1aV9zdGF0dXNfd2luZG93X2F0dHJzID09IGVudHJ5LT52YWx1 ZSkKKyAgICByZXR1cm47CisKKyAgdHVpX3N0YXR1c193aW5kb3dfYXR0cnMgPSBlbnRyeS0+ dmFsdWU7CisgIGlmICh0dWlfYWN0aXZlKQorICAgIHR1aV9zaG93X2xvY2F0b3JfY29udGVu dCAoKTsKK30KIAwKIAogLyogVHJ1ZSBpZiBUVUkgcmVzaXplcyBzaG91bGQgcHJpbnQgYSBt ZXNzYWdlLiAgVGhpcyBpcyB1c2VkIGJ5IHRoZQpAQCAtMTI1MSw2ICsxMjg3LDIzIEBAIFRo aXMgdmFyaWFibGUgY29udHJvbHMgdGhlIGF0dHJpYnV0ZXMgdG8gdXNlIGZvciB0aGUgYWN0 aXZlIHdpbmRvdyBib3JkZXI6XG5cCiAJCQlzaG93X3R1aV9hY3RpdmVfYm9yZGVyX21vZGUs CiAJCQkmdHVpX3NldGxpc3QsICZ0dWlfc2hvd2xpc3QpOwogCisgIGFkZF9zZXRzaG93X2Vu dW1fY21kICgibW9kZSIsIG5vX2NsYXNzLCB0dWlfYm9yZGVyX21vZGVfZW51bXMsCisJCQkm dHVpX3N0YXR1c193aW5kb3dfbW9kZSwgXygiXAorU2V0IHRoZSBhdHRyaWJ1dGUgbW9kZSB0 byB1c2UgZm9yIHRoZSBUVUkgc3RhdHVzIHdpbmRvdy4iKSwgXygiXAorU2hvdyB0aGUgYXR0 cmlidXRlIG1vZGUgdG8gdXNlIGZvciB0aGUgVFVJIHN0YXR1cyB3aW5kb3cuIiksIF8oIlwK K1RoaXMgdmFyaWFibGUgY29udHJvbHMgdGhlIGF0dHJpYnV0ZXMgdG8gdXNlIGZvciB0aGUg c3RhdHVzIHdpbmRvdzpcblwKKyAgIG5vcm1hbCAgICAgICAgICBub3JtYWwgZGlzcGxheVxu XAorICAgc3RhbmRvdXQgICAgICAgIHVzZSBoaWdobGlnaHQgbW9kZSBvZiB0ZXJtaW5hbFxu XAorICAgcmV2ZXJzZSAgICAgICAgIHVzZSByZXZlcnNlIHZpZGVvIG1vZGVcblwKKyAgIGhh bGYgICAgICAgICAgICB1c2UgaGFsZiBicmlnaHRcblwKKyAgIGhhbGYtc3RhbmRvdXQgICB1 c2UgaGFsZiBicmlnaHQgYW5kIHN0YW5kb3V0IG1vZGVcblwKKyAgIGJvbGQgICAgICAgICAg ICB1c2UgZXh0cmEgYnJpZ2h0IG9yIGJvbGRcblwKKyAgIGJvbGQtc3RhbmRvdXQgICB1c2Ug ZXh0cmEgYnJpZ2h0IG9yIGJvbGQgd2l0aCBzdGFuZG91dCBtb2RlIiksCisJCQlzZXRfdHVp X3N0YXR1c193aW5kb3dfbW9kZSwKKwkJCXNob3dfdHVpX3N0YXR1c193aW5kb3dfbW9kZSwK KwkJCXR1aV9zdGF0dXNfd2luZG93X3N0eWxlLm1vZGlmaWFibGVfc2V0X2xpc3QgKCksCisJ CQl0dWlfc3RhdHVzX3dpbmRvd19zdHlsZS5tb2RpZmlhYmxlX3Nob3dfbGlzdCAoKSk7CisK ICAgYWRkX3NldHNob3dfenVpbnRlZ2VyX2NtZCAoInRhYi13aWR0aCIsIG5vX2NsYXNzLAog CQkJICAgICAmaW50ZXJuYWxfdGFiX3dpZHRoLCBfKCJcCiBTZXQgdGhlIHRhYiB3aWR0aCwg aW4gY2hhcmFjdGVycywgZm9yIHRoZSBUVUkuIiksIF8oIlwKQEAgLTEzMDUsNCArMTM1OCw5 IEBAIFdoZW4gZW5hYmxlZCwgdGhlIGxlZnQgbWFyZ2luIHdpbGwgdXNlICdfJyBhbmQgJzAn IGluc3RlYWQgb2Ygc3BhY2VzLiIpLAogCiAgIHR1aV9ib3JkZXJfc3R5bGUuY2hhbmdlZC5h dHRhY2ggKHR1aV9yZWhpZ2hsaWdodF9hbGwsICJ0dWktd2luIik7CiAgIHR1aV9hY3RpdmVf Ym9yZGVyX3N0eWxlLmNoYW5nZWQuYXR0YWNoICh0dWlfcmVoaWdobGlnaHRfYWxsLCAidHVp LXdpbiIpOworICB0dWlfc3RhdHVzX3dpbmRvd19zdHlsZS5jaGFuZ2VkLmF0dGFjaCAodHVp X3Nob3dfbG9jYXRvcl9jb250ZW50LCAidHVpLXdpbiIpOworCisgIC8qIEFzc2lnbiBkZWZh dWx0IHZhbHVlLiAgKi8KKyAgdHVpX3N0YXR1c193aW5kb3dfYXR0cnMKKyAgICA9IHRyYW5z bGF0ZSAodHVpX3N0YXR1c193aW5kb3dfbW9kZSwgdHVpX2JvcmRlcl9tb2RlX3RyYW5zbGF0 ZSktPnZhbHVlOwogfQpkaWZmIC0tZ2l0IGEvZ2RiL3R1aS90dWktd2luLmggYi9nZGIvdHVp L3R1aS13aW4uaAppbmRleCAzZDM1ZjFkZmI3Zi4uNWFjZTgzYTc0MmEgMTAwNjQ0Ci0tLSBh L2dkYi90dWkvdHVpLXdpbi5oCisrKyBiL2dkYi90dWkvdHVpLXdpbi5oCkBAIC0zOCw2ICsz OCw5IEBAIGV4dGVybiBjaHR5cGUgdHVpX2JvcmRlcl9obGluZTsKIGV4dGVybiBpbnQgdHVp X2JvcmRlcl9hdHRyczsKIGV4dGVybiBpbnQgdHVpX2FjdGl2ZV9ib3JkZXJfYXR0cnM7CiAK Ky8qIEF0dHJpYnV0ZXMgZm9yIHRoZSBjb250ZW50cyBvZiB0aGUgc3RhdHVzIHdpbmRvdy4g ICovCitleHRlcm4gaW50IHR1aV9zdGF0dXNfd2luZG93X2F0dHJzOworCiBleHRlcm4gYm9v bCB0dWlfdXBkYXRlX3ZhcmlhYmxlcyAoKTsKIAogZXh0ZXJuIHZvaWQgdHVpX2luaXRpYWxp emVfd2luICh2b2lkKTsKCmJhc2UtY29tbWl0OiA3YThhNmY1N2VjZWQ5YThjMjdhOTNjYjVj NTk3N2EzM2JlN2IxZjcyCi0tIAoyLjM1LjMKCg== --------------6YxYHMSUCNBDWnaILnzKqDmn--