From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dani Moncayo Newsgroups: gmane.emacs.bugs Subject: bug#12055: Re: bug#12055: 24.1.50; Characters "=?UTF-8?Q?=C3=A1?=" and "=?UTF-8?Q?=C3=A9?=" are not correctly displayed on a Windows terminal Date: Sat, 28 Jul 2012 17:23:19 +0200 Message-ID: References: <834noshquk.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=e89a8ff1c63c9e035404c5e568aa X-Trace: dough.gmane.org 1343489045 4039 80.91.229.3 (28 Jul 2012 15:24:05 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 28 Jul 2012 15:24:05 +0000 (UTC) Cc: lekktu@gmail.com, 12055@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jul 28 17:24:04 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Sv8s8-0006Lz-Bf for geb-bug-gnu-emacs@m.gmane.org; Sat, 28 Jul 2012 17:24:04 +0200 Original-Received: from localhost ([::1]:59982 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sv8s7-0003XR-Ae for geb-bug-gnu-emacs@m.gmane.org; Sat, 28 Jul 2012 11:24:03 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:59513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sv8s4-0003WX-T7 for bug-gnu-emacs@gnu.org; Sat, 28 Jul 2012 11:24:01 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sv8s3-0005oN-Vb for bug-gnu-emacs@gnu.org; Sat, 28 Jul 2012 11:24:00 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:37212) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sv8s3-0005oJ-SB for bug-gnu-emacs@gnu.org; Sat, 28 Jul 2012 11:23:59 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1Sv8ys-0005rp-An for bug-gnu-emacs@gnu.org; Sat, 28 Jul 2012 11:31:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dani Moncayo Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 28 Jul 2012 15:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 12055 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 12055-submit@debbugs.gnu.org id=B12055.134348942622509 (code B ref 12055); Sat, 28 Jul 2012 15:31:02 +0000 Original-Received: (at 12055) by debbugs.gnu.org; 28 Jul 2012 15:30:26 +0000 Original-Received: from localhost ([127.0.0.1]:46758 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Sv8yI-0005qz-3k for submit@debbugs.gnu.org; Sat, 28 Jul 2012 11:30:26 -0400 Original-Received: from mail-ob0-f172.google.com ([209.85.214.172]:50410) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Sv8yG-0005qs-Ek for 12055@debbugs.gnu.org; Sat, 28 Jul 2012 11:30:25 -0400 Original-Received: by obbwc20 with SMTP id wc20so5788251obb.3 for <12055@debbugs.gnu.org>; Sat, 28 Jul 2012 08:23:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=av6GNsdugnI1phArdyOCArPrIDAvL6Hb5F1iUooSYNA=; b=yJNVJ5Tda6YmQpcew2m/8jY883BorbVnY5SAzZEcrTTpYuljjO4SE81FoRfg0MxxFx UgO/tBEuB6dfTTkkuWJhhQOQi4Xt4oWYLb6omgnRYYAPZ9w+wKIuTfDrqyVaTak7Zx/M XukmOJn0FX4BieeaaRJOhIorU6lXHsM1pS78vNiWzGOYgRjwbSWCorML3vfEPWcxpvQT j/YUBdXQHOZnIeIbwAYXfpHYZgSE+hmRjk6CH7rzyycOjRYadCN1ZRJ9XhdzChUq4+F/ +tcft/S5FaIdaOjWP9j3DaPC0Unr0Opmv0M77la2xP8HwN6E3HA1m3cVAImG4ylNLo6P VMEg== Original-Received: by 10.60.26.134 with SMTP id l6mr8840376oeg.40.1343489000211; Sat, 28 Jul 2012 08:23:20 -0700 (PDT) Original-Received: by 10.60.172.11 with HTTP; Sat, 28 Jul 2012 08:23:19 -0700 (PDT) In-Reply-To: <834noshquk.fsf@gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 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.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:62509 Archived-At: --e89a8ff1c63c9e035404c5e568aa Content-Type: text/plain; charset=ISO-8859-1 > Did you compile international/mule-cmds.el (which was modified by the > patch) Yes. > and did you re-dump Emacs after byte-compiling mule-cmds.el? I don't know. This is exactly what I did: 1. I applied your patch to my branch (the whole patch, which includes the file you mention). 2. To make sure that the patch was correctly applied, I compared your patch with the output of "bzr diff" (I'm attaching this output if you want to check it). 3. I went to the "nt" subdirectory and ran a plain "mingw32-make". I thought that the build system would know what to recompile based on what files have changed since the last time. 4. I ran a "mingw32-make install". > If you did all that, what is the value you get by evaluating > (terminal-coding-system) cp1252 >, and what is the value you get from > w32-get-console-codepage? "w32-get-console-codepage" is void as a variable. "(w32-get-console-codepage)" returns 850. -- Dani Moncayo --e89a8ff1c63c9e035404c5e568aa Content-Type: application/octet-stream; name=bzr-diff Content-Disposition: attachment; filename=bzr-diff Content-Transfer-Encoding: base64 X-Attachment-Id: f_h56ulo6c0 PT09IG1vZGlmaWVkIGZpbGUgJ2xpc3AvaW50ZXJuYXRpb25hbC9tdWxlLWNtZHMuZWwnCi0tLSBs aXNwL2ludGVybmF0aW9uYWwvbXVsZS1jbWRzLmVsCTIwMTItMDctMjUgMjM6MTE6MjMgKzAwMDAK KysrIGxpc3AvaW50ZXJuYXRpb25hbC9tdWxlLWNtZHMuZWwJMjAxMi0wNy0yOCAxMzoyMTo1MiAr MDAwMApAQCAtMjY1NSwyMyArMjY1NSwyOSBAQAogCiAgICAgOzsgT24gV2luZG93cywgb3ZlcnJp ZGUgbG9jYWxlLWNvZGluZy1zeXN0ZW0sCiAgICAgOzsgZGVmYXVsdC1maWxlLW5hbWUtY29kaW5n LXN5c3RlbSwga2V5Ym9hcmQtY29kaW5nLXN5c3RlbSwKLSAgICA7OyB0ZXJtaW5hbC1jb2Rpbmct c3lzdGVtIHdpdGggc3lzdGVtIGNvZGVwYWdlLgorICAgIDs7IHRlcm1pbmFsLWNvZGluZy1zeXN0 ZW0gd2l0aCB0aGUgYXBwcm9wcmlhdGUgY29kZXBhZ2VzLgogICAgICh3aGVuIChib3VuZHAgJ3cz Mi1hbnNpLWNvZGUtcGFnZSkKLSAgICAgIChsZXQgKChjb2RlLXBhZ2UtY29kaW5nIChpbnRlcm4g KGZvcm1hdCAiY3AlZCIgdzMyLWFuc2ktY29kZS1wYWdlKSkpKQotCSh3aGVuIChjb2Rpbmctc3lz dGVtLXAgY29kZS1wYWdlLWNvZGluZykKLQkgICh1bmxlc3MgZnJhbWUgKHNldHEgbG9jYWxlLWNv ZGluZy1zeXN0ZW0gY29kZS1wYWdlLWNvZGluZykpCi0JICAoc2V0LWtleWJvYXJkLWNvZGluZy1z eXN0ZW0gY29kZS1wYWdlLWNvZGluZyBmcmFtZSkKLQkgIChzZXQtdGVybWluYWwtY29kaW5nLXN5 c3RlbSBjb2RlLXBhZ2UtY29kaW5nIGZyYW1lKQotCSAgOzsgU2V0IGRlZmF1bHQtZmlsZS1uYW1l LWNvZGluZy1zeXN0ZW0gbGFzdCwgc28gdGhhdCBFbWFjcwotCSAgOzsgZG9lc24ndCB0cnkgdG8g dXNlIGNwTk5OTiB3aGVuIGl0IGRlZmluZXMga2V5Ym9hcmQgYW5kCi0JICA7OyB0ZXJtaW5hbCBl bmNvZGluZy4gIFRoYXQncyBiZWNhdXNlIHRoZSBhYm92ZSB0d28gbGluZXMKLQkgIDs7IHdpbGwg d2FudCB0byBsb2FkIGNvZGUtcGFnZXMuZWwsIHdoZXJlIGNwTk5OTiBhcmUKLQkgIDs7IGRlZmlu ZWQ7IGlmIGRlZmF1bHQtZmlsZS1uYW1lLWNvZGluZy1zeXN0ZW0gd2VyZSBzZXQgdG8KLQkgIDs7 IGNwTk5OTiB3aGlsZSB0aGVzZSB0d28gbGluZXMgcnVuLCBFbWFjcyB3aWxsIHdhbnQgdG8gdXNl Ci0JICA7OyBpdCBmb3IgZW5jb2RpbmcgdGhlIGZpbGUgbmFtZSBpdCB3YW50cyB0byBsb2FkLiAg QW5kIHRoYXQKLQkgIDs7IHdpbGwgZmFpbCwgc2luY2UgY3BOTk5OIGlzIG5vdCB5ZXQgdXNhYmxl IHVudGlsCi0JICA7OyBjb2RlLXBhZ2VzLmVsIGZpbmlzaGVzIGxvYWRpbmcuCi0JICAoc2V0cSBk ZWZhdWx0LWZpbGUtbmFtZS1jb2Rpbmctc3lzdGVtIGNvZGUtcGFnZS1jb2RpbmcpKSkpCisgICAg ICAobGV0ICgoYW5zaS1jb2RlLXBhZ2UtY29kaW5nIChpbnRlcm4gKGZvcm1hdCAiY3AlZCIgdzMy LWFuc2ktY29kZS1wYWdlKSkpCisgICAgICAgICAgIChvZW0tY29kZS1wYWdlLWNvZGluZworICAg ICAgICAgICAgKGludGVybiAoZm9ybWF0ICJjcCVkIiAodzMyLWdldC1jb25zb2xlLWNvZGVwYWdl KSkpKQorICAgICAgICAgICBhbnNpLWNzLXAgb2VtLWNzLXApCisgICAgICAgKGFuZCAoY29kaW5n LXN5c3RlbS1wIGFuc2ktY29kZS1wYWdlLWNvZGluZykKKyAgICAgICAgICAgIChzZXRxIGFuc2kt Y3MtcCB0KSkKKyAgICAgICAoYW5kIChjb2Rpbmctc3lzdGVtLXAgb2VtLWNvZGUtcGFnZS1jb2Rp bmcpCisgICAgICAgICAgICAoc2V0cSBvZW0tY3MtcCB0KSkKKyAgICAgICA7OyBTZXQgdGhlIGtl eWJvYXJkIGFuZCBkaXNwbGF5IGVuY29kaW5nIHRvIGVpdGhlciB0aGUgY3VycmVudAorICAgICAg IDs7IEFOU0kgY29kZXBhZ2Ugb2YgdGhlIE9FTSBjb2RlcGFnZSwgZGVwZW5kaW5nIG9uIHdoZXRo ZXIKKyAgICAgICA7OyB0aGlzIGlzIGEgR1VJIG9yIGEgVFRZIGZyYW1lLgorICAgICAgICh3aGVu IGFuc2ktY3MtcAorICAgICAgICAgKHVubGVzcyBmcmFtZSAoc2V0cSBsb2NhbGUtY29kaW5nLXN5 c3RlbSBhbnNpLWNvZGUtcGFnZS1jb2RpbmcpKQorICAgICAgICAgKHdoZW4gKGRpc3BsYXktZ3Jh cGhpYy1wIGZyYW1lKQorICAgICAgICAgICAoc2V0LWtleWJvYXJkLWNvZGluZy1zeXN0ZW0gYW5z aS1jb2RlLXBhZ2UtY29kaW5nIGZyYW1lKQorICAgICAgICAgICAoc2V0LXRlcm1pbmFsLWNvZGlu Zy1zeXN0ZW0gYW5zaS1jb2RlLXBhZ2UtY29kaW5nIGZyYW1lKSkKKyAgICAgICAgIChzZXRxIGRl ZmF1bHQtZmlsZS1uYW1lLWNvZGluZy1zeXN0ZW0gYW5zaS1jb2RlLXBhZ2UtY29kaW5nKSkKKyAg ICAgICAod2hlbiBvZW0tY3MtcAorICAgICAgICAgKHVubGVzcyAoZGlzcGxheS1ncmFwaGljLXAg ZnJhbWUpCisgICAgICAgICAgIChzZXQta2V5Ym9hcmQtY29kaW5nLXN5c3RlbSBvZW0tY29kZS1w YWdlLWNvZGluZyBmcmFtZSkKKyAgICAgICAgICAgKHNldC10ZXJtaW5hbC1jb2Rpbmctc3lzdGVt IG9lbS1jb2RlLXBhZ2UtY29kaW5nIGZyYW1lKSkpKSkKIAogICAgICh3aGVuIChlcSBzeXN0ZW0t dHlwZSAnZGFyd2luKQogICAgICAgOzsgT24gRGFyd2luLCBmaWxlIG5hbWVzIGFyZSBhbHdheXMg ZW5jb2RlZCBpbiB1dGYtOCwgbm8gbWF0dGVyCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3JjL3czMmNv bnNvbGUuYycKLS0tIHNyYy93MzJjb25zb2xlLmMJMjAxMi0wNi0yOCAwNzo1MDoyNyArMDAwMAor Kysgc3JjL3czMmNvbnNvbGUuYwkyMDEyLTA3LTI4IDEzOjIxOjUyICswMDAwCkBAIC0zNyw2ICsz Nyw3IEBACiAjaW5jbHVkZSAidGVybWhvb2tzLmgiCiAjaW5jbHVkZSAidGVybWNoYXIuaCIKICNp bmNsdWRlICJkaXNwZXh0ZXJuLmgiCisjaW5jbHVkZSAidzMyaGVhcC5oIiAgIC8qIGZvciBvc19z dWJ0eXBlICovCiAjaW5jbHVkZSAidzMyaW5ldnQuaCIKIAogLyogZnJvbSB3aW5kb3cuYyAqLwpA QCAtNjcsNiArNjgsNyBAQAogI2VuZGlmCiAKIEhBTkRMRSAga2V5Ym9hcmRfaGFuZGxlOworaW50 IHczMl9jb25zb2xlX3VuaWNvZGVfaW5wdXQ7CiAKIAogLyogU2V0dGluZyB0aGlzIGFzIHRoZSBj dHJsIGhhbmRsZXIgcHJldmVudHMgZW1hY3MgZnJvbSBiZWluZyBraWxsZWQgd2hlbgpAQCAtNzg2 LDYgKzc4OCwxMSBAQAogCQkgICAgICAgaW5mby5zcldpbmRvdy5MZWZ0KTsKICAgICB9CiAKKyAg aWYgKG9zX3N1YnR5cGUgPT0gT1NfTlQpCisgICAgdzMyX2NvbnNvbGVfdW5pY29kZV9pbnB1dCA9 IDE7CisgIGVsc2UKKyAgICB3MzJfY29uc29sZV91bmljb2RlX2lucHV0ID0gMDsKKwogICAvKiBT ZXR1cCB3MzJfZGlzcGxheV9pbmZvIHN0cnVjdHVyZSBmb3IgdGhpcyBmcmFtZS4gKi8KIAogICB3 MzJfaW5pdGlhbGl6ZV9kaXNwbGF5X2luZm8gKGJ1aWxkX3N0cmluZyAoIkNvbnNvbGUiKSk7Cgo9 PT0gbW9kaWZpZWQgZmlsZSAnc3JjL3czMmluZXZ0LmMnCi0tLSBzcmMvdzMyaW5ldnQuYwkyMDEy LTA1LTI2IDExOjU4OjE5ICswMDAwCisrKyBzcmMvdzMyaW5ldnQuYwkyMDEyLTA3LTI4IDEzOjIx OjUyICswMDAwCkBAIC00MSw2ICs0MSw3IEBACiAjaW5jbHVkZSAidGVybWNoYXIuaCIKICNpbmNs dWRlICJ3MzJoZWFwLmgiCiAjaW5jbHVkZSAidzMydGVybS5oIgorI2luY2x1ZGUgInczMmluZXZ0 LmgiCiAKIC8qIHN0ZGluLCBmcm9tIHczMmNvbnNvbGUuYyAqLwogZXh0ZXJuIEhBTkRMRSBrZXli b2FyZF9oYW5kbGU7CkBAIC02MSw2ICs2MiwxNSBAQAogLyogVGVtcG9yYXJpbHkgc3RvcmUgbGVh ZCBieXRlIG9mIERCQ1MgaW5wdXQgc2VxdWVuY2VzLiAgKi8KIHN0YXRpYyBjaGFyIGRiY3NfbGVh ZCA9IDA7CiAKK3N0YXRpYyBpbmxpbmUgQk9PTAordzMyX3JlYWRfY29uc29sZV9pbnB1dCAoSEFO RExFIGgsIElOUFVUX1JFQ09SRCAqcmVjLCBEV09SRCByZWNzaXplLAorICAgICAgICAgICAgICAg ICAgICAgICBEV09SRCAqd2FpdGluZykKK3sKKyAgcmV0dXJuICh3MzJfY29uc29sZV91bmljb2Rl X2lucHV0CisgICAgICAgICA/IFJlYWRDb25zb2xlSW5wdXRXIChoLCByZWMsIHJlY3NpemUsIHdh aXRpbmcpCisgICAgICAgICA6IFJlYWRDb25zb2xlSW5wdXRBIChoLCByZWMsIHJlY3NpemUsIHdh aXRpbmcpKTsKK30KKwogc3RhdGljIGludAogZmlsbF9xdWV1ZSAoQk9PTCBibG9jaykKIHsKQEAg LTgwLDggKzkwLDggQEAKIAlyZXR1cm4gMDsKICAgICB9CiAKLSAgcmMgPSBSZWFkQ29uc29sZUlu cHV0IChrZXlib2FyZF9oYW5kbGUsIGV2ZW50X3F1ZXVlLCBFVkVOVF9RVUVVRV9TSVpFLAotCQkJ ICZldmVudHNfd2FpdGluZyk7CisgIHJjID0gdzMyX3JlYWRfY29uc29sZV9pbnB1dCAoa2V5Ym9h cmRfaGFuZGxlLCBldmVudF9xdWV1ZSwgRVZFTlRfUVVFVUVfU0laRSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICZldmVudHNfd2FpdGluZyk7CiAgIGlmICghcmMpCiAgICAgcmV0dXJu IC0xOwogICBxdWV1ZV9wdHIgPSBldmVudF9xdWV1ZTsKQEAgLTIyNCw3ICsyMzQsNyBAQAogI2Vu ZGlmCiAKICAgLyogT24gTlQsIGNhbGwgVG9Vbmljb2RlIGluc3RlYWQgYW5kIHRoZW4gY29udmVy dCB0byB0aGUgY3VycmVudAotICAgICBsb2NhbGUncyBkZWZhdWx0IGNvZGVwYWdlLiAgKi8KKyAg ICAgY29uc29sZSBpbnB1dCBjb2RlcGFnZS4gICovCiAgIGlmIChvc19zdWJ0eXBlID09IE9TX05U KQogICAgIHsKICAgICAgIFdDSEFSIGJ1ZlsxMjhdOwpAQCAtMjMzLDE0ICsyNDMsOSBAQAogCQkJ ICBrZXlzdGF0ZSwgYnVmLCAxMjgsIDApOwogICAgICAgaWYgKGlzZGVhZCA+IDApCiAJewotCSAg Y2hhciBjcFsyMF07Ci0JICBpbnQgY3BJZDsKKyAgICAgICAgIGludCBjcElkID0gR2V0Q29uc29s ZUNQICgpOwogCiAJICBldmVudC0+dUNoYXIuVW5pY29kZUNoYXIgPSBidWZbaXNkZWFkIC0gMV07 Ci0KLQkgIEdldExvY2FsZUluZm8gKEdldFRocmVhZExvY2FsZSAoKSwKLQkJCSBMT0NBTEVfSURF RkFVTFRBTlNJQ09ERVBBR0UsIGNwLCAyMCk7Ci0JICBjcElkID0gYXRvaSAoY3ApOwogCSAgaXNk ZWFkID0gV2lkZUNoYXJUb011bHRpQnl0ZSAoY3BJZCwgMCwgYnVmLCBpc2RlYWQsCiAJCQkJCWFu c2lfY29kZSwgNCwgTlVMTCwgTlVMTCk7CiAJfQpAQCAtNDQ3LDI2ICs0NTIsMzQgQEAKIAl9CiAg ICAgICBlbHNlIGlmIChldmVudC0+dUNoYXIuQXNjaWlDaGFyID4gMCkKIAl7CisgICAgICAgICAv KiBQdXJlIEFTQ0lJIGNoYXJhY3RlcnMgPCAxMjguICAqLwogCSAgZW1hY3NfZXYtPmtpbmQgPSBB U0NJSV9LRVlTVFJPS0VfRVZFTlQ7CiAJICBlbWFjc19ldi0+Y29kZSA9IGV2ZW50LT51Q2hhci5B c2NpaUNoYXI7CiAJfQotICAgICAgZWxzZSBpZiAoZXZlbnQtPnVDaGFyLlVuaWNvZGVDaGFyID4g MCkKKyAgICAgIGVsc2UgaWYgKGV2ZW50LT51Q2hhci5Vbmljb2RlQ2hhciA+IDAKKyAgICAgICAg ICAgICAgJiYgdzMyX2NvbnNvbGVfdW5pY29kZV9pbnB1dCkKIAl7CisgICAgICAgICAvKiBVbmlj b2RlIGNvZGVwb2ludDsgb25seSB2YWxpZCBpZiB3ZSBhcmUgdXNpbmcgVW5pY29kZQorICAgICAg ICAgICAgY29uc29sZSBpbnB1dCBtb2RlLiAgKi8KIAkgIGVtYWNzX2V2LT5raW5kID0gTVVMVElC WVRFX0NIQVJfS0VZU1RST0tFX0VWRU5UOwogCSAgZW1hY3NfZXYtPmNvZGUgPSBldmVudC0+dUNo YXIuVW5pY29kZUNoYXI7CiAJfQogICAgICAgZWxzZQogCXsKLQkgIC8qIEZhbGxiYWNrIGZvciBu b24tVW5pY29kZSB2ZXJzaW9ucyBvZiBXaW5kb3dzLiAgKi8KKyAgICAgICAgIC8qIEZhbGxiYWNr IGhhbmRsaW5nIG9mIG5vbi1BU0NJSSBjaGFyYWN0ZXJzIGZvciBub24tVW5pY29kZQorICAgICAg ICAgICAgdmVyc2lvbnMgb2YgV2luZG93cywgYW5kIGZvciBub24tVW5pY29kZSBpbnB1dCBvbiBO VAorICAgICAgICAgICAgZmFtaWx5IG9mIFdpbmRvd3MuICBPbmx5IGNoYXJhY3RlcnMgaW4gdGhl IGN1cnJlbnQKKyAgICAgICAgICAgIGNvbnNvbGUgY29kZXBhZ2UgYXJlIHN1cHBvcnRlZCBieSB0 aGlzIGZhbGxiYWNrLiAgKi8KIAkgIHdjaGFyX3QgY29kZTsKIAkgIGNoYXIgZGJjc1syXTsKLSAg ICAgICAgICBjaGFyIGNwWzIwXTsKICAgICAgICAgICBpbnQgY3BJZDsKIAotCSAgLyogR2V0IHRo ZSBjb2RlcGFnZSB0byBpbnRlcnByZXQgdGhpcyBrZXkgd2l0aC4gICovCi0gICAgICAgICAgR2V0 TG9jYWxlSW5mbyAoR2V0VGhyZWFkTG9jYWxlICgpLAotCQkJIExPQ0FMRV9JREVGQVVMVEFOU0lD T0RFUEFHRSwgY3AsIDIwKTsKLSAgICAgICAgICBjcElkID0gYXRvaSAoY3ApOworICAgICAgICAg LyogR2V0IHRoZSBjdXJyZW50IGNvbnNvbGUgaW5wdXQgY29kZXBhZ2UgdG8gaW50ZXJwcmV0IHRo aXMKKyAgICAgICAgICAgIGtleSB3aXRoLiAgTm90ZSB0aGF0IHRoZSBzeXN0ZW0gZGVmYXVsdHMg Zm9yIHRoZSBPRU0KKyAgICAgICAgICAgIGNvZGVwYWdlIGNvdWxkIGhhdmUgYmVlbiBjaGFuZ2Vk IGJ5IGNhbGxpbmcgU2V0Q29uc29sZUNQCisgICAgICAgICAgICBvciB3MzItc2V0LWNvbnNvbGUt Y29kZXBhZ2UsIHNvIHVzaW5nIEdldExvY2FsZUluZm8gdG8KKyAgICAgICAgICAgIGdldCBMT0NB TEVfSURFRkFVTFRDT0RFUEFHRSBpcyBub3QgVFJUIGhlcmUuICAqLworICAgICAgICAgIGNwSWQg PSBHZXRDb25zb2xlQ1AgKCk7CiAKIAkgIGRiY3NbMF0gPSBkYmNzX2xlYWQ7CiAJICBkYmNzWzFd ID0gZXZlbnQtPnVDaGFyLkFzY2lpQ2hhcjsKQEAgLTUwMSw2ICs1MTQsNyBAQAogICAgIH0KICAg ZWxzZQogICAgIHsKKyAgICAgIC8qIEZ1bmN0aW9uIGtleXMgYW5kIG90aGVyIG5vbi1jaGFyYWN0 ZXIga2V5cy4gICovCiAgICAgICBlbWFjc19ldi0+a2luZCA9IE5PTl9BU0NJSV9LRVlTVFJPS0Vf RVZFTlQ7CiAgICAgICBlbWFjc19ldi0+Y29kZSA9IGV2ZW50LT53VmlydHVhbEtleUNvZGU7CiAg ICAgfQoKPT09IG1vZGlmaWVkIGZpbGUgJ3NyYy93MzJpbmV2dC5oJwotLS0gc3JjL3czMmluZXZ0 LmgJMjAxMi0wMS0xOSAwNzoyMToyNSArMDAwMAorKysgc3JjL3czMmluZXZ0LmgJMjAxMi0wNy0y OCAxMzoyMTo1MiArMDAwMApAQCAtMTksNiArMTksOCBAQAogI2lmbmRlZiBFTUFDU19XMzJJTkVW VF9ICiAjZGVmaW5lIEVNQUNTX1czMklORVZUX0gKIAorZXh0ZXJuIGludCB3MzJfY29uc29sZV91 bmljb2RlX2lucHV0OworCiBleHRlcm4gaW50IHczMl9jb25zb2xlX3JlYWRfc29ja2V0IChzdHJ1 Y3QgdGVybWluYWwgKnRlcm0sIGludCBudW1jaGFycywKIAkJCQkgICAgc3RydWN0IGlucHV0X2V2 ZW50ICpob2xkX3F1aXQpOwogZXh0ZXJuIHZvaWQgdzMyX2NvbnNvbGVfbW91c2VfcG9zaXRpb24g KEZSQU1FX1BUUiAqZiwgaW50IGluc2lzdCwKCg== --e89a8ff1c63c9e035404c5e568aa--