From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15805 invoked by alias); 20 Jul 2011 22:01:26 -0000 Received: (qmail 15796 invoked by uid 22791); 20 Jul 2011 22:01:24 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from mail-yw0-f41.google.com (HELO mail-yw0-f41.google.com) (209.85.213.41) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 20 Jul 2011 22:01:11 +0000 Received: by ywm39 with SMTP id 39so365865ywm.0 for ; Wed, 20 Jul 2011 15:01:10 -0700 (PDT) MIME-Version: 1.0 Received: by 10.236.161.197 with SMTP id w45mr12109151yhk.389.1311199270335; Wed, 20 Jul 2011 15:01:10 -0700 (PDT) Received: by 10.236.109.131 with HTTP; Wed, 20 Jul 2011 15:01:10 -0700 (PDT) In-Reply-To: <83oc0ovq7p.fsf@gnu.org> References: <83oc0ovq7p.fsf@gnu.org> Date: Thu, 21 Jul 2011 06:47:00 -0000 Message-ID: Subject: Re: [patch] PR 12999 info macros command. From: Matt Rice To: Eli Zaretskii Cc: gdb-patches@sourceware.org Content-Type: multipart/mixed; boundary=20cf30563f4dbcf32704a8875e67 X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2011-07/txt/msg00568.txt.bz2 --20cf30563f4dbcf32704a8875e67 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-length: 1633 On Wed, Jul 20, 2011 at 10:04 AM, Eli Zaretskii wrote: >> Date: Mon, 18 Jul 2011 23:57:25 -0700 >> From: Matt Rice >> >> this patch adds 2 commands, >> info macros LINESPEC >> info definitions MACRO > > Thanks. =A0A few minor comments and a question. > >> +@cindex definition, showing a macro's > > That sounds awkward. =A0Suggest "@cindex definition of a macro, showing" > instead. This actually came from the existing 'info macro'. command, I updated that. >> +@item info macros @var{linespec} >> +Show all macro definitions at the location of @var{linespec}, and descr= ibe the > > Suggest a slight rewording: > > =A0Show all macro definitions that are in effect at the location > =A0specified by @var{linespec}, and describe ... k. >> +@cindex definition, showing a macro's > > It's not useful to have identical index entries so close to one > another. =A0I suggest to remove the second one. ahh, I see. >> +Show all definitions of the macro named @var{macro}, in the current sco= pe, > > It might be better to say "... definitions of the named @var{macro} ...". k. > Also, what is the "scope" of a macro? to answer your question scope of a macro is all lines between #define and #undef, not extending beyond the boundry of a compilation unit. Its the wrong word though, and not what 'info definitions' does, neither was my second patch correct. because 'info definitions' looks throughout a compilation unit. Updated the docs, and the 'help' command text for 'info definitions'. I added @cindex macros, from debug info so it would be near the existing @cindex macros, user-defined --20cf30563f4dbcf32704a8875e67 Content-Type: application/octet-stream; name="foo.diff" Content-Disposition: attachment; filename="foo.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gqct5gso0 Content-length: 13685 ZGlmZiAtLWdpdCBhL2dkYi9kb2MvZ2RiLnRleGluZm8gYi9nZGIvZG9jL2dk Yi50ZXhpbmZvCmluZGV4IDNhM2E5ZmIuLjQ5YjQ2N2QgMTAwNjQ0Ci0tLSBh L2dkYi9kb2MvZ2RiLnRleGluZm8KKysrIGIvZ2RiL2RvYy9nZGIudGV4aW5m bwpAQCAtOTU4OCwxMSArOTU4OCwyNCBAQCBjYW4gYmUgYW55IHN0cmluZyBv ZiB0b2tlbnMuCiAKIEBraW5kZXggaW5mbyBtYWNybwogQGNpbmRleCBtYWNy byBkZWZpbml0aW9uLCBzaG93aW5nCi1AY2luZGV4IGRlZmluaXRpb24sIHNo b3dpbmcgYSBtYWNybydzCitAY2luZGV4IGRlZmluaXRpb24gb2YgYSBtYWNy bywgc2hvd2luZworQGNpbmRleCBtYWNyb3MsIGZyb20gZGVidWcgaW5mbwog QGl0ZW0gaW5mbyBtYWNybyBAdmFye21hY3JvfQotU2hvdyB0aGUgZGVmaW5p dGlvbiBvZiB0aGUgbWFjcm8gbmFtZWQgQHZhcnttYWNyb30sIGFuZCBkZXNj cmliZSB0aGUKK1Nob3cgdGhlIGN1cnJlbnQgZGVmaW5pdGlvbiBvZiB0aGUg bmFtZWQgQHZhcnttYWNyb30sIGFuZCBkZXNjcmliZSB0aGUKIHNvdXJjZSBs b2NhdGlvbiBvciBjb21waWxlciBjb21tYW5kLWxpbmUgd2hlcmUgdGhhdCBk ZWZpbml0aW9uIHdhcyBlc3RhYmxpc2hlZC4KIAorQGtpbmRleCBpbmZvIG1h Y3JvcworQGl0ZW0gaW5mbyBtYWNyb3MgQHZhcntsaW5lc3BlY30KK1Nob3cg YWxsIG1hY3JvIGRlZmluaXRpb25zIHRoYXQgYXJlIGluIGVmZmVjdCBhdCB0 aGUgbG9jYXRpb24gc3BlY2lmaWVkCitieSBAdmFye2xpbmVzcGVjfSwgIGFu ZCBkZXNjcmliZSB0aGUgc291cmNlIGxvY2F0aW9uIG9yIGNvbXBpbGVyCitj b21tYW5kLWxpbmUgd2hlcmUgdGhvc2UgZGVmaW5pdGlvbnMgd2VyZSBlc3Rh Ymxpc2hlZC4KKworQGtpbmRleCBpbmZvIGRlZmluaXRpb25zCitAaXRlbSBp bmZvIGRlZmluaXRpb25zIEB2YXJ7bWFjcm99CitTaG93IGFsbCBkZWZpbml0 aW9ucyBvZiB0aGUgbmFtZWQgQHZhcnttYWNyb30gdGhhdCBhcmUgZGVmaW5l ZCBpbiB0aGUgY3VycmVudAorY29tcGlsYXRpb24gdW5pdCwgYW5kIGRlc2Ny aWJlIHRoZSBzb3VyY2UgbG9jYXRpb24gb3IgY29tcGlsZXIgY29tbWFuZC1s aW5lCit3aGVyZSB0aG9zZSBkZWZpbml0aW9ucyB3ZXJlIGVzdGFibGlzaGVk LgorCiBAa2luZGV4IG1hY3JvIGRlZmluZQogQGNpbmRleCB1c2VyLWRlZmlu ZWQgbWFjcm9zCiBAY2luZGV4IGRlZmluaW5nIG1hY3JvcyBpbnRlcmFjdGl2 ZWx5CmRpZmYgLS1naXQgYS9nZGIvbWFjcm9jbWQuYyBiL2dkYi9tYWNyb2Nt ZC5jCmluZGV4IGM3NzE1NmEuLmI4ZjI3NDYgMTAwNjQ0Ci0tLSBhL2dkYi9t YWNyb2NtZC5jCisrKyBiL2dkYi9tYWNyb2NtZC5jCkBAIC0xMTcsNyArMTE3 LDEwIEBAIG1hY3JvX2V4cGFuZF9vbmNlX2NvbW1hbmQgKGNoYXIgKmV4cCwg aW50IGZyb21fdHR5KQogICByZXR1cm47CiB9CiAKKy8qICBPdXRwdXRzIHRo ZSBpbmNsdWRlIHBhdGggb2YgYSBtYWNybyBzdGFydGluZyBhdCBGSUxFIGFu ZCBMSU5FIHRvIFNUUkVBTS4KIAorICAgIENhcmUgc2hvdWxkIGJlIHRha2Vu IHRoYXQgdGhpcyBmdW5jdGlvbiBkb2VzIG5vdCBjYXVzZSBhbnkgbG9va3Vw cyBpbnRvCisgICAgdGhlIHNwbGF5IHRyZWUgc28gdGhhdCBpdCBjYW4gYmUg c2FmZWx5IHVzZWQgd2hpbGUgaXRlcmF0aW5nLiAgKi8KIHN0YXRpYyB2b2lk CiBzaG93X3BwX3NvdXJjZV9wb3MgKHN0cnVjdCB1aV9maWxlICpzdHJlYW0s CiAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCBtYWNyb19zb3VyY2VfZmls ZSAqZmlsZSwKQEAgLTEzNCwzNiArMTM3LDI3IEBAIHNob3dfcHBfc291cmNl X3BvcyAoc3RydWN0IHVpX2ZpbGUgKnN0cmVhbSwKICAgICB9CiB9CiAKKy8q IE91dHB1dHMgYSBtYWNybyBmb3IgaHVtYW4gY29uc3VtcHRpb24sIGRldGFp bGluZyB0aGUgaW5jbHVkZSBwYXRoCisgICBhbmQgbWFjcm8gZGVmaW5pdGlv bi4gIE5BTUUgaXMgdGhlIG5hbWUgb2YgdGhlIG1hY3JvLgorICAgRCB0aGUg ZGVmaW5pdGlvbi4gIEZJTEUgdGhlIHN0YXJ0IG9mIHRoZSBpbmNsdWRlIHBh dGgsIGFuZCBMSU5FIHRoZQorICAgbGluZSBudW1iZXIgaW4gRklMRS4KIAor ICAgQ2FyZSBzaG91bGQgYmUgdGFrZW4gdGhhdCB0aGlzIGZ1bmN0aW9uIGRv ZXMgbm90IGNhdXNlIGFueSBsb29rdXBzIGludG8KKyAgIHRoZSBzcGxheSB0 cmVlIHNvIHRoYXQgaXQgY2FuIGJlIHNhZmVseSB1c2VkIHdoaWxlIGl0ZXJh dGluZy4gICovCiBzdGF0aWMgdm9pZAotaW5mb19tYWNyb19jb21tYW5kIChj aGFyICpuYW1lLCBpbnQgZnJvbV90dHkpCitwcmludF9tYWNyb19kZWZpbml0 aW9uIChjb25zdCBjaGFyICpuYW1lLAorCQkJY29uc3Qgc3RydWN0IG1hY3Jv X2RlZmluaXRpb24gKmQsCisJCQlzdHJ1Y3QgbWFjcm9fc291cmNlX2ZpbGUg KmZpbGUsCisJCQlpbnQgbGluZSkKIHsKLSAgc3RydWN0IG1hY3JvX3Njb3Bl ICptcyA9IE5VTEw7Ci0gIHN0cnVjdCBjbGVhbnVwICpjbGVhbnVwX2NoYWlu ID0gbWFrZV9jbGVhbnVwIChmcmVlX2N1cnJlbnRfY29udGVudHMsICZtcyk7 Ci0gIHN0cnVjdCBtYWNyb19kZWZpbml0aW9uICpkOwotICAKLSAgaWYgKCEg bmFtZSB8fCAhICpuYW1lKQotICAgIGVycm9yIChfKCJZb3UgbXVzdCBmb2xs b3cgdGhlIGBpbmZvIG1hY3JvJyBjb21tYW5kIHdpdGggdGhlIG5hbWUiCi0g ICAgICAgICAgICIgb2YgdGhlIG1hY3JvXG4iCi0gICAgICAgICAgICJ3aG9z ZSBkZWZpbml0aW9uIHlvdSB3YW50IHRvIHNlZS4iKSk7Ci0KLSAgbXMgPSBk ZWZhdWx0X21hY3JvX3Njb3BlICgpOwotICBpZiAoISBtcykKLSAgICBlcnJv ciAoXygiR0RCIGhhcyBubyBwcmVwcm9jZXNzb3IgbWFjcm8gaW5mb3JtYXRp b24gZm9yIHRoYXQgY29kZS4iKSk7Ci0KLSAgZCA9IG1hY3JvX2xvb2t1cF9k ZWZpbml0aW9uIChtcy0+ZmlsZSwgbXMtPmxpbmUsIG5hbWUpOwotICBpZiAo ZCkKLSAgICB7Ci0gICAgICBpbnQgbGluZTsKLSAgICAgIHN0cnVjdCBtYWNy b19zb3VyY2VfZmlsZSAqZmlsZQotICAgICAgICA9IG1hY3JvX2RlZmluaXRp b25fbG9jYXRpb24gKG1zLT5maWxlLCBtcy0+bGluZSwgbmFtZSwgJmxpbmUp OwotCiAgICAgICBmcHJpbnRmX2ZpbHRlcmVkIChnZGJfc3Rkb3V0LCAiRGVm aW5lZCBhdCAiKTsKICAgICAgIHNob3dfcHBfc291cmNlX3BvcyAoZ2RiX3N0 ZG91dCwgZmlsZSwgbGluZSk7CisKICAgICAgIGlmIChsaW5lICE9IDApCiAJ ZnByaW50Zl9maWx0ZXJlZCAoZ2RiX3N0ZG91dCwgIiNkZWZpbmUgJXMiLCBu YW1lKTsKICAgICAgIGVsc2UKIAlmcHJpbnRmX2ZpbHRlcmVkIChnZGJfc3Rk b3V0LCAiLUQlcyIsIG5hbWUpOworCiAgICAgICBpZiAoZC0+a2luZCA9PSBt YWNyb19mdW5jdGlvbl9saWtlKQogICAgICAgICB7CiAgICAgICAgICAgaW50 IGk7CkBAIC0xNzcsMTAgKzE3MSwzNyBAQCBpbmZvX21hY3JvX2NvbW1hbmQg KGNoYXIgKm5hbWUsIGludCBmcm9tX3R0eSkKICAgICAgICAgICAgIH0KICAg ICAgICAgICBmcHV0c19maWx0ZXJlZCAoIikiLCBnZGJfc3Rkb3V0KTsKICAg ICAgICAgfQorCiAgICAgICBpZiAobGluZSAhPSAwKQogCWZwcmludGZfZmls dGVyZWQgKGdkYl9zdGRvdXQsICIgJXNcbiIsIGQtPnJlcGxhY2VtZW50KTsK ICAgICAgIGVsc2UKIAlmcHJpbnRmX2ZpbHRlcmVkIChnZGJfc3Rkb3V0LCAi PSVzXG4iLCBkLT5yZXBsYWNlbWVudCk7Cit9CisKK3N0YXRpYyB2b2lkCitp bmZvX21hY3JvX2NvbW1hbmQgKGNoYXIgKm5hbWUsIGludCBmcm9tX3R0eSkK K3sKKyAgc3RydWN0IG1hY3JvX3Njb3BlICptcyA9IE5VTEw7CisgIHN0cnVj dCBjbGVhbnVwICpjbGVhbnVwX2NoYWluID0gbWFrZV9jbGVhbnVwIChmcmVl X2N1cnJlbnRfY29udGVudHMsICZtcyk7CisgIHN0cnVjdCBtYWNyb19kZWZp bml0aW9uICpkOworCisgIGlmICghIG5hbWUgfHwgISAqbmFtZSkKKyAgICBl cnJvciAoXygiWW91IG11c3QgZm9sbG93IHRoZSBgaW5mbyBtYWNybycgY29t bWFuZCB3aXRoIHRoZSBuYW1lIgorICAgICAgICAgICAiIG9mIHRoZSBtYWNy b1xuIgorICAgICAgICAgICAid2hvc2UgZGVmaW5pdGlvbiB5b3Ugd2FudCB0 byBzZWUuIikpOworCisgIG1zID0gZGVmYXVsdF9tYWNyb19zY29wZSAoKTsK KyAgaWYgKCEgbXMpCisgICAgZXJyb3IgKF8oIkdEQiBoYXMgbm8gcHJlcHJv Y2Vzc29yIG1hY3JvIGluZm9ybWF0aW9uIGZvciB0aGF0IGNvZGUuIikpOwor CisgIGQgPSBtYWNyb19sb29rdXBfZGVmaW5pdGlvbiAobXMtPmZpbGUsIG1z LT5saW5lLCBuYW1lKTsKKyAgaWYgKGQpCisgICAgeworICAgICAgaW50IGxp bmU7CisgICAgICBzdHJ1Y3QgbWFjcm9fc291cmNlX2ZpbGUgKmZpbGUKKyAg ICAgICAgPSBtYWNyb19kZWZpbml0aW9uX2xvY2F0aW9uIChtcy0+ZmlsZSwg bXMtPmxpbmUsIG5hbWUsICZsaW5lKTsKKworICAgICAgcHJpbnRfbWFjcm9f ZGVmaW5pdGlvbiAobmFtZSwgZCwgZmlsZSwgbGluZSk7CiAgICAgfQogICBl bHNlCiAgICAgewpAQCAtMTk0LDYgKzIxNSw2NCBAQCBpbmZvX21hY3JvX2Nv bW1hbmQgKGNoYXIgKm5hbWUsIGludCBmcm9tX3R0eSkKICAgZG9fY2xlYW51 cHMgKGNsZWFudXBfY2hhaW4pOwogfQogCisvKiBBIGNhbGxiYWNrIGZ1bmN0 aW9uIGZvciB1c2FnZSB3aXRoIG1hY3JvX2Zvcl9lYWNoIGFuZCBmcmllbmRz LgorICAgSWYgVVNFUl9EQVRBIGlzIG51bGwgYWxsIG1hY3JvcyB3aWxsIGJl IHByaW50ZWQuCisgICBPdGhlcndpc2UgVVNFUl9EQVRBIGlzIGNvbnNpZGVy ZWQgdG8gYmUgYSBzdHJpbmcsIHByaW50aW5nCisgICBvbmx5IG1hY3JvcyB3 aG8ncyBOQU1FIG1hdGNoZXMgVVNFUl9EQVRBLiAgT3RoZXIgYXJndW1lbnRz IGFyZQorICAgcm91dGVkIHRvIHByaW50X21hY3JvX2RlZmluaXRpb24uICAq Lworc3RhdGljIHZvaWQKK3ByaW50X21hY3JvX2NhbGxiYWNrIChjb25zdCBj aGFyICpuYW1lLCBjb25zdCBzdHJ1Y3QgbWFjcm9fZGVmaW5pdGlvbiAqbWFj cm8sCisJCSAgIHN0cnVjdCBtYWNyb19zb3VyY2VfZmlsZSAqc291cmNlLCBp bnQgbGluZSwKKwkJICAgdm9pZCAqdXNlcl9kYXRhKQoreworICBpZiAoISB1 c2VyX2RhdGEgfHwgc3RyY21wICh1c2VyX2RhdGEsIG5hbWUpID09IDApCisg ICAgcHJpbnRfbWFjcm9fZGVmaW5pdGlvbiAobmFtZSwgbWFjcm8sIHNvdXJj ZSwgbGluZSk7Cit9CisKKy8qIEltcGxlbWVudGF0aW9uIG9mIHRoZSAiaW5m byBkZWZpbml0aW9ucyIgY29tbWFuZC4gKi8KK3N0YXRpYyB2b2lkCitpbmZv X2RlZmluaXRpb25zX2NvbW1hbmQgKGNoYXIgKm5hbWUsIGludCBmcm9tX3R0 eSkKK3sKKyAgc3RydWN0IG1hY3JvX3Njb3BlICptcyA9IE5VTEw7CisgIHN0 cnVjdCBjbGVhbnVwICpjbGVhbnVwX2NoYWluID0gbWFrZV9jbGVhbnVwIChm cmVlX2N1cnJlbnRfY29udGVudHMsICZtcyk7CisKKyAgaWYgKCEgbmFtZSB8 fCAhICpuYW1lKQorICAgIGVycm9yIChfKCJUaGUgYGluZm8gZGVmaW5pdGlv bnMnIGNvbW1hbmQgcmVxdWlyZXMgYSBtYWNybyBuYW1lIGFzIGFuIFwKK2Fy Z3VtZW50LlxuIgorICAgICAgICAgICAiVXNhZ2U6IGluZm8gZGVmaW5pdGlv bnMgTUFDUk9cbiIpKTsKKworICBtcyA9IGRlZmF1bHRfbWFjcm9fc2NvcGUg KCk7CisKKyAgaWYgKCEgbXMgfHwgISBtcy0+ZmlsZSB8fCAhIG1zLT5maWxl LT50YWJsZSkKKyAgICBlcnJvciAoXygiR0RCIGhhcyBubyBwcmVwcm9jZXNz b3IgbWFjcm8gaW5mb3JtYXRpb24gZm9yIHRoYXQgY29kZS4iKSk7CisKKyAg bWFjcm9fZm9yX2VhY2ggKG1zLT5maWxlLT50YWJsZSwgcHJpbnRfbWFjcm9f Y2FsbGJhY2ssIG5hbWUpOworICBkb19jbGVhbnVwcyAoY2xlYW51cF9jaGFp bik7Cit9CisKKy8qIEltcGxlbWVudGF0aW9uIG9mIHRoZSAiaW5mbyBtYWNy b3MiIGNvbW1hbmQuICovCitzdGF0aWMgdm9pZAoraW5mb19tYWNyb3NfY29t bWFuZCAoY2hhciAqYXJncywgaW50IGZyb21fdHR5KQoreworICBzdHJ1Y3Qg bWFjcm9fc2NvcGUgKm1zID0gTlVMTDsKKyAgc3RydWN0IGNsZWFudXAgKmNs ZWFudXBfY2hhaW4gPSBtYWtlX2NsZWFudXAgKGZyZWVfY3VycmVudF9jb250 ZW50cywgJm1zKTsKKworICBpZiAoYXJncyA9PSBOVUxMKQorICAgIG1zID0g ZGVmYXVsdF9tYWNyb19zY29wZSAoKTsKKyAgZWxzZQorICAgIHsKKyAgICAg IHN0cnVjdCBzeW10YWJzX2FuZF9saW5lcyBzYWxzID0gZGVjb2RlX2xpbmVf c3BlYyAoYXJncywgMCk7CisKKyAgICAgIGlmIChzYWxzLm5lbHRzKQorICAg ICAgICBtcyA9IHNhbF9tYWNyb19zY29wZSAoc2Fscy5zYWxzWzBdKTsKKyAg ICB9CisKKyAgaWYgKCEgbXMgfHwgISBtcy0+ZmlsZSB8fCAhIG1zLT5maWxl LT50YWJsZSkKKyAgICBlcnJvciAoXygiR0RCIGhhcyBubyBwcmVwcm9jZXNz b3IgbWFjcm8gaW5mb3JtYXRpb24gZm9yIHRoYXQgY29kZS4iKSk7CisKKyAg bWFjcm9fZm9yX2VhY2hfaW5fc2NvcGUgKG1zLT5maWxlLCBtcy0+bGluZSwg cHJpbnRfbWFjcm9fY2FsbGJhY2ssIE5VTEwpOworICBkb19jbGVhbnVwcyAo Y2xlYW51cF9jaGFpbik7Cit9CiAKIAwKIC8qIFVzZXItZGVmaW5lZCBtYWNy b3MuICAqLwpAQCAtMzU5LDYgKzQzOCw3IEBAIG1hY3JvX3VuZGVmX2NvbW1h bmQgKGNoYXIgKmV4cCwgaW50IGZyb21fdHR5KQogCiBzdGF0aWMgdm9pZAog cHJpbnRfb25lX21hY3JvIChjb25zdCBjaGFyICpuYW1lLCBjb25zdCBzdHJ1 Y3QgbWFjcm9fZGVmaW5pdGlvbiAqbWFjcm8sCisJCSBzdHJ1Y3QgbWFjcm9f c291cmNlX2ZpbGUgKnNvdXJjZSwgaW50IGxpbmUsCiAJCSB2b2lkICppZ25v cmUpCiB7CiAgIGZwcmludGZfZmlsdGVyZWQgKGdkYl9zdGRvdXQsICJtYWNy byBkZWZpbmUgJXMiLCBuYW1lKTsKQEAgLTM4Miw3ICs0NjIsNiBAQCBtYWNy b19saXN0X2NvbW1hbmQgKGNoYXIgKmV4cCwgaW50IGZyb21fdHR5KQogICBt YWNyb19mb3JfZWFjaCAobWFjcm9fdXNlcl9tYWNyb3MsIHByaW50X29uZV9t YWNybywgTlVMTCk7CiB9CiAKLQogDAogLyogSW5pdGlhbGl6aW5nIHRoZSBg bWFjcm9jbWQnIG1vZHVsZS4gICovCiAKQEAgLTQyMCw2ICs0OTksMTggQEAg ZXhwcmVzc2lvbiB3b3JrIHRvZ2V0aGVyIHRvIHlpZWxkIGEgcHJlLXByb2Nl c3NlZCBleHByZXNzaW9uLiIpLAogCSAgIF8oIlNob3cgdGhlIGRlZmluaXRp b24gb2YgTUFDUk8sIGFuZCBpdHMgc291cmNlIGxvY2F0aW9uLiIpLAogCSAg ICZpbmZvbGlzdCk7CiAKKyAgYWRkX2NtZCAoIm1hY3JvcyIsIG5vX2NsYXNz LCBpbmZvX21hY3Jvc19jb21tYW5kLAorCSAgIF8oIlNob3cgdGhlIGRlZmlu aXRpb25zIG9mIGFsbCBtYWNyb3MgYXQgTElORVNQRUMsIG9yIHRoZSBjdXJy ZW50IFwKK3NvdXJjZSBsb2NhdGlvbi5cblwKK1VzYWdlOiBpbmZvIHNvdXJj ZSBbTElORVNQRUNdIiksCisJICAgJmluZm9saXN0KTsKKworICBhZGRfY21k ICgiZGVmaW5pdGlvbnMiLCBub19jbGFzcywgaW5mb19kZWZpbml0aW9uc19j b21tYW5kLAorCSAgIF8oIlNob3cgYWxsIGRlZmluaXRpb25zIG9mIE1BQ1JP IGRlZmluZWQgaW50IHRoZSBjdXJyZW50IFwKKyBjb21waWxhdGlvbiB1bml0 LlxuXAorVXNhZ2U6IGluZm8gZGVmaW5pdGlvbnMgTUFDUk8iKSwKKwkgICAm aW5mb2xpc3QpOworCiAgIGFkZF9jbWQgKCJkZWZpbmUiLCBub19jbGFzcywg bWFjcm9fZGVmaW5lX2NvbW1hbmQsIF8oIlwKIERlZmluZSBhIG5ldyBDL0Mr KyBwcmVwcm9jZXNzb3IgbWFjcm8uXG5cCiBUaGUgR0RCIGNvbW1hbmQgYG1h Y3JvIGRlZmluZSBERUZJTklUSU9OJyBpcyBlcXVpdmFsZW50IHRvIHBsYWNp bmcgYVxuXApkaWZmIC0tZ2l0IGEvZ2RiL21hY3JvdGFiLmMgYi9nZGIvbWFj cm90YWIuYwppbmRleCBjYmEyODVkLi5lZmNmODM1IDEwMDY0NAotLS0gYS9n ZGIvbWFjcm90YWIuYworKysgYi9nZGIvbWFjcm90YWIuYwpAQCAtOTEzLDcg KzkxMyw4IEBAIGZvcmVhY2hfbWFjcm8gKHNwbGF5X3RyZWVfbm9kZSBub2Rl LCB2b2lkICphcmcpCiAgIHN0cnVjdCBtYWNyb19rZXkgKmtleSA9IChzdHJ1 Y3QgbWFjcm9fa2V5ICopIG5vZGUtPmtleTsKICAgc3RydWN0IG1hY3JvX2Rl ZmluaXRpb24gKmRlZiA9IChzdHJ1Y3QgbWFjcm9fZGVmaW5pdGlvbiAqKSBu b2RlLT52YWx1ZTsKIAotICAoKmRhdHVtLT5mbikgKGtleS0+bmFtZSwgZGVm LCBkYXR1bS0+dXNlcl9kYXRhKTsKKyAgKCpkYXR1bS0+Zm4pIChrZXktPm5h bWUsIGRlZiwga2V5LT5zdGFydF9maWxlLCBrZXktPnN0YXJ0X2xpbmUsCisJ CWRhdHVtLT51c2VyX2RhdGEpOwogICByZXR1cm4gMDsKIH0KIApAQCAtOTQ1 LDcgKzk0Niw4IEBAIGZvcmVhY2hfbWFjcm9faW5fc2NvcGUgKHNwbGF5X3Ry ZWVfbm9kZSBub2RlLCB2b2lkICppbmZvKQogICAgICAgJiYgKCFrZXktPmVu ZF9maWxlCiAJICB8fCBjb21wYXJlX2xvY2F0aW9ucyAoa2V5LT5lbmRfZmls ZSwga2V5LT5lbmRfbGluZSwKIAkJCQlkYXR1bS0+ZmlsZSwgZGF0dW0tPmxp bmUpID49IDApKQotICAgICgqZGF0dW0tPmZuKSAoa2V5LT5uYW1lLCBkZWYs IGRhdHVtLT51c2VyX2RhdGEpOworICAgICgqZGF0dW0tPmZuKSAoa2V5LT5u YW1lLCBkZWYsIGtleS0+c3RhcnRfZmlsZSwga2V5LT5zdGFydF9saW5lLAor CQkgIGRhdHVtLT51c2VyX2RhdGEpOwogICByZXR1cm4gMDsKIH0KIApkaWZm IC0tZ2l0IGEvZ2RiL21hY3JvdGFiLmggYi9nZGIvbWFjcm90YWIuaAppbmRl eCBkMmIyYjYzLi5hMTAzNTFhIDEwMDY0NAotLS0gYS9nZGIvbWFjcm90YWIu aAorKysgYi9nZGIvbWFjcm90YWIuaApAQCAtMzA2LDExICszMDYsMTQgQEAg c3RydWN0IG1hY3JvX3NvdXJjZV9maWxlICoobWFjcm9fZGVmaW5pdGlvbl9s b2NhdGlvbgogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCAqZGVm aW5pdGlvbl9saW5lKSk7CiAKIC8qIENhbGxiYWNrIGZ1bmN0aW9uIHdoZW4g d2Fsa2luZyBhIG1hY3JvIHRhYmxlLiAgTkFNRSBpcyB0aGUgbmFtZSBvZgot ICAgdGhlIG1hY3JvLCBhbmQgREVGSU5JVElPTiBpcyB0aGUgZGVmaW5pdGlv bi4gIFVTRVJfREFUQSBpcyBhbgotICAgYXJiaXRyYXJ5IHBvaW50ZXIgd2hp Y2ggaXMgcGFzc2VkIGJ5IHRoZSBjYWxsZXIgdG8gbWFjcm9fZm9yX2VhY2gK LSAgIG9yIG1hY3JvX2Zvcl9lYWNoX2luX3Njb3BlLiAgKi8KKyAgIHRoZSBt YWNybywgYW5kIERFRklOSVRJT04gaXMgdGhlIGRlZmluaXRpb24uICBTT1VS Q0UgaXMgdGhlIGZpbGUgYXQgdGhlCisgICBzdGFydCBvZiB0aGUgaW5jbHVk ZSBwYXRoLCBhbmQgTElORSBpcyB0aGUgbGluZSBudW1iZXIgb2YgdGhlIFNP VVJDRSBmaWxlCisgICB3aGVyZSB0aGUgbWFjcm8gd2FzIGRlZmluZWQuICBV U0VSX0RBVEEgaXMgYW4gYXJiaXRyYXJ5IHBvaW50ZXIgd2hpY2ggaXMKKyAg IHBhc3NlZCBieSB0aGUgY2FsbGVyIHRvIG1hY3JvX2Zvcl9lYWNoIG9yIG1h Y3JvX2Zvcl9lYWNoX2luX3Njb3BlLiAgKi8KIHR5cGVkZWYgdm9pZCAoKm1h Y3JvX2NhbGxiYWNrX2ZuKSAoY29uc3QgY2hhciAqbmFtZSwKIAkJCQkgICBj b25zdCBzdHJ1Y3QgbWFjcm9fZGVmaW5pdGlvbiAqZGVmaW5pdGlvbiwKKwkJ CQkgICBzdHJ1Y3QgbWFjcm9fc291cmNlX2ZpbGUgKnNvdXJjZSwKKwkJCQkg ICBpbnQgbGluZSwKIAkJCQkgICB2b2lkICp1c2VyX2RhdGEpOwogCiAvKiBD YWxsIHRoZSBmdW5jdGlvbiBGTiBmb3IgZWFjaCBtYWNybyBpbiB0aGUgbWFj cm8gdGFibGUgVEFCTEUuCmRpZmYgLS1naXQgYS9nZGIvc3ltdGFiLmMgYi9n ZGIvc3ltdGFiLmMKaW5kZXggYjc5MjA4MS4uOTQ0N2JkOSAxMDA2NDQKLS0t IGEvZ2RiL3N5bXRhYi5jCisrKyBiL2dkYi9zeW10YWIuYwpAQCAtMzc3MSw2 ICszNzcxLDcgQEAgc3RydWN0IGFkZF9uYW1lX2RhdGEKICAgIFRoaXMgYWRk cyBhIG1hY3JvJ3MgbmFtZSB0byB0aGUgY3VycmVudCBjb21wbGV0aW9uIGxp c3QuICAqLwogc3RhdGljIHZvaWQKIGFkZF9tYWNyb19uYW1lIChjb25zdCBj aGFyICpuYW1lLCBjb25zdCBzdHJ1Y3QgbWFjcm9fZGVmaW5pdGlvbiAqaWdu b3JlLAorCQlzdHJ1Y3QgbWFjcm9fc291cmNlX2ZpbGUgKmlnbm9yZTIsIGlu dCBpZ25vcmUzLAogCQl2b2lkICp1c2VyX2RhdGEpCiB7CiAgIHN0cnVjdCBh ZGRfbmFtZV9kYXRhICpkYXR1bSA9IChzdHJ1Y3QgYWRkX25hbWVfZGF0YSAq KSB1c2VyX2RhdGE7Cg== --20cf30563f4dbcf32704a8875e67--