From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: [PATCH] Override Windows default Win-* key combinations when using Emacs Date: Mon, 7 Mar 2016 18:57:37 -0800 Organization: UCLA Computer Science Department Message-ID: <56DE3FA1.2080305@cs.ucla.edu> References: <568BBC58.50702@aprikoodi.fi> <83y4c43qkh.fsf@gnu.org> <5691667C.5000009@aprikoodi.fi> <838u3wkkvb.fsf@gnu.org> <5694E07E.8010005@aprikoodi.fi> <83fuy2kd2w.fsf@gnu.org> <56961607.2090504@aprikoodi.fi> <569634D6.6030404@aprikoodi.fi> <83oacpiial.fsf@gnu.org> <5697995B.5010306@aprikoodi.fi> <83mvs8gh7n.fsf@gnu.org> <83vb6tethb.fsf@gnu.org> <569A22D3.7070208@aprikoodi.fi> <56B207C0.3030304@aprikoodi.fi> <83mvrhyf4c.fsf@gnu.org> <838u27eo5p.fsf@gnu.org> <56D03005.3070809@aprikoodi.fi> <831t7ycrow.fsf@gnu.org> <56D2B300.80700@cs.ucla.edu> <83wppoal6o.fsf@gnu.org> <56D35297.9040507@cs.ucla.edu> <83bn70a94l.fsf@gnu.org> <56D38265.9000503@cs.ucla.edu> <83a8mk9oqd.fsf@gnu.org> <56D3EE3A.5090803@cs.ucla.edu> <83vb578qem.fsf@gnu.org> <56D4958B.8070300@cs.ucla.edu> <83io11xm9n.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------090608050600070700000108" X-Trace: ger.gmane.org 1457405902 30865 80.91.229.3 (8 Mar 2016 02:58:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 8 Mar 2016 02:58:22 +0000 (UTC) Cc: jussi@aprikoodi.fi, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 08 03:58:10 2016 Return-path: Envelope-to: ged-emacs-devel@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 1ad7qa-0006zd-9D for ged-emacs-devel@m.gmane.org; Tue, 08 Mar 2016 03:58:08 +0100 Original-Received: from localhost ([::1]:59791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ad7qZ-0001rZ-SQ for ged-emacs-devel@m.gmane.org; Mon, 07 Mar 2016 21:58:07 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ad7qJ-0001rP-CA for emacs-devel@gnu.org; Mon, 07 Mar 2016 21:57:53 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ad7qH-0001ne-Dm for emacs-devel@gnu.org; Mon, 07 Mar 2016 21:57:51 -0500 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:40558) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ad7qB-0001mv-9J; Mon, 07 Mar 2016 21:57:43 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 000AD160504; Mon, 7 Mar 2016 18:57:40 -0800 (PST) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id X1CgZV1DjxGD; Mon, 7 Mar 2016 18:57:37 -0800 (PST) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id E4A17160E46; Mon, 7 Mar 2016 18:57:37 -0800 (PST) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id TtZzcray4fW2; Mon, 7 Mar 2016 18:57:37 -0800 (PST) Original-Received: from [192.168.1.9] (pool-100-32-155-148.lsanca.fios.verizon.net [100.32.155.148]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id BA5B0160504; Mon, 7 Mar 2016 18:57:37 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 In-Reply-To: <83io11xm9n.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:201104 Archived-At: This is a multi-part message in MIME format. --------------090608050600070700000108 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Eli Zaretskii wrote: >>> > >When this is done, we can install your patch for whatever other >>> > >systems which still don't have getaddrinfo (if there are such systems >>> > >that we still support). Writing such a getaddrinfo wrapper is easy, >>> > >and I expect it to be done soon enough, so please wait with your patch >>> > >until then. >> > >> >Sounds good. > This is now done on master. OK, thanks, I installed into master the attached patch, which simplifies the Emacs C code by assuming getaddrinfo on non-Microsoftish hosts. This should be safe nowadays. --------------090608050600070700000108 Content-Type: text/plain; charset=UTF-8; name="0001-Assume-getaddrinfo-in-C-code.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-Assume-getaddrinfo-in-C-code.txt" RnJvbSA1MzZmZWE2YTgzMWY4MDUyODgzY2JlMjEwZjE1ODM0ZGM5YzRjYTVhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBNb24sIDcgTWFyIDIwMTYgMTg6NTQ6MjUgLTA4MDAKU3ViamVjdDogW1BBVENI XSBBc3N1bWUgZ2V0YWRkcmluZm8gaW4gQyBjb2RlCk1JTUUtVmVyc2lvbjogMS4wCkNvbnRl bnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD1VVEYtOApDb250ZW50LVRyYW5zZmVyLUVu Y29kaW5nOiA4Yml0CgoqIGFkbWluL0NQUC1ERUZJTkVTLCBjb25maWd1cmUuYWM6IFJlbW92 ZSBIQVZFX0dFVEFERFJJTkZPLCBIQVZFX0hfRVJSTk8uCkFsbCB1c2VzIHJlbW92ZWQuCiog ZG9jL2xpc3ByZWYvcHJvY2Vzc2VzLnRleGkgKE5ldHdvcmssIE5ldHdvcmsgUHJvY2Vzc2Vz KSwgZXRjL05FV1M6ClNheSB0aGF0IHBvcnQgbnVtYmVycyBjYW4gYmUgaW50ZWdlciBzdHJp bmdzLgoqIGxpYi1zcmMvcG9wLmMgKGhfZXJybm8pIFshV0lORE9XU05UICYmICFIQVZFX0hf RVJSTk9dOiBSZW1vdmUgZGVjbC4KKHNvY2tldF9jb25uZWN0aW9uKTogQXNzdW1lIEhBVkVf R0VUQUREUklORk8uCiogbGlzcC9tcGMuZWwgKG1wYy0tcHJvYy1jb25uZWN0KToKKiBsaXNw L25ldC9uZXR3b3JrLXN0cmVhbS5lbCAob3Blbi1uZXR3b3JrLXN0cmVhbSk6Ckl04oCZcyBu b3cgT0sgdG8gdXNlIGludGVnZXIgc3RyaW5ncyBhcyBwb3J0IG51bWJlcnMuCiogc3JjL3By b2Nlc3MuYyAoY29udl9udW1lcmljYWxfdG9fbGlzcCkgWyFIQVZFX0dFVEFERFJJTkZPXTog UmVtb3ZlLgooRm1ha2VfbmV0d29ya19wcm9jZXNzKTogQXNzdW1lIEhBVkVfR0VUQUREUklO Rk8uCi0tLQogYWRtaW4vQ1BQLURFRklORVMgICAgICAgICAgfCAgMiAtLQogY29uZmlndXJl LmFjICAgICAgICAgICAgICAgfCAxNiArLS0tLS0tLS0tLQogZG9jL2xpc3ByZWYvcHJvY2Vz c2VzLnRleGkgfCAgOCArKysrLS0KIGV0Yy9ORVdTICAgICAgICAgICAgICAgICAgIHwgIDkg KysrLS0tCiBsaWItc3JjL3BvcC5jICAgICAgICAgICAgICB8IDM5IC0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiBsaXNwL21wYy5lbCAgICAgICAgICAgICAgICB8ICA1ICstLS0KIGxp c3AvbmV0L25ldHdvcmstc3RyZWFtLmVsIHwgIDQgKy0tCiBzcmMvcHJvY2Vzcy5jICAgICAg ICAgICAgICB8IDY4ICsrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0KIDggZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgMTM0IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2FkbWluL0NQUC1ERUZJTkVTIGIvYWRtaW4vQ1BQLURFRklO RVMKaW5kZXggOTA2NDA1My4uZDlkZjE1MiAxMDA2NDQKLS0tIGEvYWRtaW4vQ1BQLURFRklO RVMKKysrIGIvYWRtaW4vQ1BQLURFRklORVMKQEAgLTE0Nyw3ICsxNDcsNiBAQCBIQVZFX0ZV VElNRVMKIEhBVkVfRlVUSU1FU0FUCiBIQVZFX0dBSV9TVFJFUlJPUgogSEFWRV9HQ09ORgot SEFWRV9HRVRBRERSSU5GTwogSEFWRV9HRVRERUxJTQogSEFWRV9HRVRHUkVOVAogSEFWRV9H RVRIT1NUTkFNRQpAQCAtMTg0LDcgKzE4Myw2IEBAIEhBVkVfR1RLX1dJREdFVF9HRVRfV0lO RE9XCiBIQVZFX0dUS19XSURHRVRfU0VUX0hBU19XSU5ET1cKIEhBVkVfR1RLX1dJTkRPV19T RVRfSEFTX1JFU0laRV9HUklQCiBIQVZFX0dfVFlQRV9JTklUCi1IQVZFX0hfRVJSTk8KIEhB VkVfSUZBRERSU19ICiBIQVZFX0lNQUdFTUFHSUNLCiBIQVZFX0lORVRfU09DS0VUUwpkaWZm IC0tZ2l0IGEvY29uZmlndXJlLmFjIGIvY29uZmlndXJlLmFjCmluZGV4IDYxMjg3ZDcuLjk0 MGExZTIgMTAwNjQ0Ci0tLSBhL2NvbmZpZ3VyZS5hYworKysgYi9jb25maWd1cmUuYWMKQEAg LTM3MDEsMjAgKzM3MDEsNiBAQCBmaQogQUNfU1VCU1QoTElCWE1MMl9MSUJTKQogQUNfU1VC U1QoTElCWE1MMl9DRkxBR1MpCiAKLSMgSWYgbmV0ZGIuaCBkb2Vzbid0IGRlY2xhcmUgaF9l cnJubywgd2UgbXVzdCBkZWNsYXJlIGl0IGJ5IGhhbmQuCi0jIE9uIE1pbkdXLCB0aGF0IGlz IHByb3ZpZGVkIGJ5IG50L2luYy9zeXMvc29ja2V0LmggYW5kIHczMi5jLgotaWYgdGVzdCAi JHtvcHN5c30iID0gIm1pbmd3MzIiOyB0aGVuCi0gIGVtYWNzX2N2X25ldGRiX2RlY2xhcmVz X2hfZXJybm89eWVzCi1maQotQUNfQ0FDSEVfQ0hFQ0sod2hldGhlciBuZXRkYiBkZWNsYXJl cyBoX2Vycm5vLAotCSAgICAgICBlbWFjc19jdl9uZXRkYl9kZWNsYXJlc19oX2Vycm5vLAot W0FDX0xJTktfSUZFTFNFKFtBQ19MQU5HX1BST0dSQU0oW1sjaW5jbHVkZSA8bmV0ZGIuaD5d XSwKLSAgW1tyZXR1cm4gaF9lcnJubztdXSldLAotICBlbWFjc19jdl9uZXRkYl9kZWNsYXJl c19oX2Vycm5vPXllcywgZW1hY3NfY3ZfbmV0ZGJfZGVjbGFyZXNfaF9lcnJubz1ubyldKQot aWYgdGVzdCAkZW1hY3NfY3ZfbmV0ZGJfZGVjbGFyZXNfaF9lcnJubyA9IHllczsgdGhlbgot ICBBQ19ERUZJTkUoSEFWRV9IX0VSUk5PLCAxLCBbRGVmaW5lIHRvIDEgaWYgbmV0ZGIuaCBk ZWNsYXJlcyBoX2Vycm5vLl0pCi1maQotCiAjIENoZWNrIGZvciBtYWlsLWxvY2tpbmcgZnVu Y3Rpb25zIGluIGEgIm1haWwiIGxpYnJhcnkuICBQcm9iYWJseSB0aGlzIHNob3VsZAogIyBo YXZlIHRoZSBzYW1lIGNoZWNrIGFzIGZvciBsaWJsb2NrZmlsZSBiZWxvdy4KIEFDX0NIRUNL X0xJQihtYWlsLCBtYWlsbG9jaywgaGF2ZV9tYWlsPXllcywgaGF2ZV9tYWlsPW5vKQpAQCAt MzgwMyw3ICszNzg5LDcgQEAgQUNfQ0hFQ0tfRlVOQ1MoYWNjZXB0NCBmY2hkaXIgZ2V0aG9z dG5hbWUgXAogZ2V0cnVzYWdlIGdldF9jdXJyZW50X2Rpcl9uYW1lIFwKIGxyYW5kNDggcmFu ZG9tIHJpbnQgXAogc2VsZWN0IGdldHBhZ2VzaXplIHNldGxvY2FsZSBuZXdsb2NhbGUgXAot Z2V0cmxpbWl0IHNldHJsaW1pdCBzaHV0ZG93biBnZXRhZGRyaW5mbyBcCitnZXRybGltaXQg c2V0cmxpbWl0IHNodXRkb3duIFwKIHB0aHJlYWRfc2lnbWFzayBzdHJzaWduYWwgc2V0aXRp bWVyIFwKIHNlbmR0byByZWN2ZnJvbSBnZXRzb2NrbmFtZSBnZXRwZWVybmFtZSBnZXRpZmFk ZHJzIGZyZWVpZmFkZHJzIFwKIGdhaV9zdHJlcnJvciBzeW5jIFwKZGlmZiAtLWdpdCBhL2Rv Yy9saXNwcmVmL3Byb2Nlc3Nlcy50ZXhpIGIvZG9jL2xpc3ByZWYvcHJvY2Vzc2VzLnRleGkK aW5kZXggNzljZWJhYS4uOGQzZGY1NSAxMDA2NDQKLS0tIGEvZG9jL2xpc3ByZWYvcHJvY2Vz c2VzLnRleGkKKysrIGIvZG9jL2xpc3ByZWYvcHJvY2Vzc2VzLnRleGkKQEAgLTIxMjgsNyAr MjEyOCw4IEBAIE5ldHdvcmsKIAogVGhlIGFyZ3VtZW50cyBAdmFye2hvc3R9IGFuZCBAdmFy e3NlcnZpY2V9IHNwZWNpZnkgd2hlcmUgdG8gY29ubmVjdCB0bzsKIEB2YXJ7aG9zdH0gaXMg dGhlIGhvc3QgbmFtZSAoYSBzdHJpbmcpLCBhbmQgQHZhcntzZXJ2aWNlfSBpcyB0aGUgbmFt ZSBvZgotYSBkZWZpbmVkIG5ldHdvcmsgc2VydmljZSAoYSBzdHJpbmcpIG9yIGEgcG9ydCBu dW1iZXIgKGFuIGludGVnZXIpLgorYSBkZWZpbmVkIG5ldHdvcmsgc2VydmljZSAoYSBzdHJp bmcpIG9yIGEgcG9ydCBudW1iZXIgKGFuIGludGVnZXIgbGlrZQorQGNvZGV7ODB9IG9yIGFu IGludGVnZXIgc3RyaW5nIGxpa2UgQGNvZGV7IjgwIn0pLgogCiBUaGUgcmVtYWluaW5nIGFy Z3VtZW50cyBAdmFye3BhcmFtZXRlcnN9IGFyZSBrZXl3b3JkL2FyZ3VtZW50IHBhaXJzCiB0 aGF0IGFyZSBtYWlubHkgcmVsZXZhbnQgdG8gZW5jcnlwdGVkIGNvbm5lY3Rpb25zOgpAQCAt MjM1Miw4ICsyMzUzLDkgQEAgTmV0d29yayBQcm9jZXNzZXMKIAogQGl0ZW0gOnNlcnZpY2Ug QHZhcntzZXJ2aWNlfQogQHZhcntzZXJ2aWNlfSBzcGVjaWZpZXMgYSBwb3J0IG51bWJlciB0 byBjb25uZWN0IHRvOyBvciwgZm9yIGEgc2VydmVyLAotdGhlIHBvcnQgbnVtYmVyIHRvIGxp c3RlbiBvbi4gIEl0IHNob3VsZCBiZSBhIHNlcnZpY2UgbmFtZSB0aGF0Ci10cmFuc2xhdGVz IHRvIGEgcG9ydCBudW1iZXIsIG9yIGFuIGludGVnZXIgc3BlY2lmeWluZyB0aGUgcG9ydCBu dW1iZXIKK3RoZSBwb3J0IG51bWJlciB0byBsaXN0ZW4gb24uICBJdCBzaG91bGQgYmUgYSBz ZXJ2aWNlIG5hbWUgbGlrZQorQHNhbXB7Imh0dHAifSB0aGF0IHRyYW5zbGF0ZXMgdG8gYSBw b3J0IG51bWJlciwgb3IgYW4gaW50ZWdlciBsaWtlIEBzYW1wezgwfQorb3IgYW4gaW50ZWdl ciBzdHJpbmcgbGlrZSBAc2FtcHsiODAifSB0aGF0IHNwZWNpZmllcyB0aGUgcG9ydCBudW1i ZXIKIGRpcmVjdGx5LiAgRm9yIGEgc2VydmVyLCBpdCBjYW4gYWxzbyBiZSBAY29kZXt0fSwg d2hpY2ggbWVhbnMgdG8gbGV0CiB0aGUgc3lzdGVtIHNlbGVjdCBhbiB1bnVzZWQgcG9ydCBu dW1iZXIuCiAKZGlmZiAtLWdpdCBhL2V0Yy9ORVdTIGIvZXRjL05FV1MKaW5kZXggNDMyODc2 MS4uYjY1MWI5ZSAxMDA2NDQKLS0tIGEvZXRjL05FV1MKKysrIGIvZXRjL05FV1MKQEAgLTc0 LDExICs3NCwxMCBAQCB0byBkZWFsIHdpdGggYXN5bmNocm9ub3VzIHNvY2tldHMgaXMgdG8g YXZvaWQgaW50ZXJhY3Rpbmcgd2l0aCB0aGVtCiB1bnRpbCB0aGV5IGhhdmUgY2hhbmdlZCBz dGF0dXMgdG8gInJ1biIuICBUaGlzIGlzIG1vc3QgZWFzaWx5IGRvbmUKIGZyb20gYSBwcm9j ZXNzIHNlbnRpbmVsLgogCi0qKiBgbWFrZS1uZXR3b3JrLXN0cmVhbScgaGFzIGFsd2F5cyBh bGxvd2VkIDpzZXJ2aWNlIHRvIGJlIHNwZWNpZmllZAotYXMgYSAibnVtYmVyIHN0cmluZyIg KGkuZS4sIDpzZXJ2aWNlICI5OTMiKSB3aGVuIHVzaW5nIGdldGhvc3RieW5hbWUsCi1idXQg aGFzIHJlcXVpcmVkIHVzaW5nIGEgcmVhbCBudW1iZXIgKGkuZS4sIDpzZXJ2aWNlIDk5Mykg b24gc3lzdGVtcwotd2l0aG91dCBnZXRob3N0YnluYW1lLiAgVGhpcyBkaWZmZXJlbmNlIGhh cyBub3cgYmVlbiBlbGltaW5hdGVkLCBhbmQKLXlvdSBjYW4gdXNlICJudW1iZXIgc3RyaW5n cyIgb24gYWxsIHN5c3RlbXMuCisqKiDigJhtYWtlLW5ldHdvcmstcHJvY2Vzc+KAmSBhbmQg 4oCYb3Blbi1uZXR3b3JrLXN0cmVhbeKAmSBzb21ldGltZXMgYWxsb3dlZAorOnNlcnZpY2Ug dG8gYmUgYW4gaW50ZWdlciBzdHJpbmcgKGUuZy4sIDpzZXJ2aWNlICI5OTMiKSBhbmQgc29t ZXRpbWVzCityZXF1aXJlZCBhbiBpbnRlZ2VyIChlLmcuLCA6c2VydmljZSA5OTMpLiAgVGhp cyBkaWZmZXJlbmNlIGhhcyBiZWVuCitlbGltaW5hdGVkLCBhbmQgaW50ZWdlciBzdHJpbmdz IHdvcmsgZXZlcnl3aGVyZS4KIAogKiogSXQgaXMgcG9zc2libGUgdG8gZGlzYWJsZSBhdHRl bXB0ZWQgcmVjb3Zlcnkgb24gZmF0YWwgc2lnbmFscwogCmRpZmYgLS1naXQgYS9saWItc3Jj L3BvcC5jIGIvbGliLXNyYy9wb3AuYwppbmRleCAyMWQ3MjE1Li45ODM5OTM0IDEwMDY0NAot LS0gYS9saWItc3JjL3BvcC5jCisrKyBiL2xpYi1zcmMvcG9wLmMKQEAgLTEwMiwxMiArMTAy LDYgQEAgZXh0ZXJuIGNoYXIgKmtyYl9yZWFsbW9maG9zdCAoLyogY2hhciAqICovKTsKICNl bmRpZiAvKiAhIEtFUkJFUk9TNSAqLwogI2VuZGlmIC8qIEtFUkJFUk9TICovCiAKLSNpZm5k ZWYgV0lORE9XU05UCi0jaWZuZGVmIEhBVkVfSF9FUlJOTwotZXh0ZXJuIGludCBoX2Vycm5v OwotI2VuZGlmCi0jZW5kaWYKLQogc3RhdGljIGludCBzb2NrZXRfY29ubmVjdGlvbiAoY2hh ciAqLCBpbnQpOwogc3RhdGljIGludCBwb3BfZ2V0bGluZSAocG9wc2VydmVyLCBjaGFyICoq KTsKIHN0YXRpYyBpbnQgc2VuZGxpbmUgKHBvcHNlcnZlciwgY29uc3QgY2hhciAqKTsKQEAg LTk3MiwxMyArOTY2LDkgQEAgc3RhdGljIGludCBoYXZlX3dpbnNvY2sgPSAwOwogc3RhdGlj IGludAogc29ja2V0X2Nvbm5lY3Rpb24gKGNoYXIgKmhvc3QsIGludCBmbGFncykKIHsKLSNp ZmRlZiBIQVZFX0dFVEFERFJJTkZPCiAgIHN0cnVjdCBhZGRyaW5mbyAqcmVzLCAqaXQ7CiAg IHN0cnVjdCBhZGRyaW5mbyBoaW50czsKICAgaW50IHJldDsKLSNlbHNlIC8qICFIQVZFX0dF VEFERFJJTkZPICovCi0gIHN0cnVjdCBob3N0ZW50ICpob3N0ZW50OwotI2VuZGlmCiAgIHN0 cnVjdCBzZXJ2ZW50ICpzZXJ2ZW50OwogICBzdHJ1Y3Qgc29ja2FkZHJfaW4gYWRkcjsKICAg Y2hhciBmb3VuZF9wb3J0ID0gMDsKQEAgLTEwNjUsNyArMTA1NSw2IEBAIHNvY2tldF9jb25u ZWN0aW9uIChjaGFyICpob3N0LCBpbnQgZmxhZ3MpCiAKICAgICB9CiAKLSNpZmRlZiBIQVZF X0dFVEFERFJJTkZPCiAgIG1lbXNldCAoJmhpbnRzLCAwLCBzaXplb2YgKGhpbnRzKSk7CiAg IGhpbnRzLmFpX3NvY2t0eXBlID0gU09DS19TVFJFQU07CiAgIGhpbnRzLmFpX2ZsYWdzID0g QUlfQ0FOT05OQU1FOwpAQCAtMTA5NywzNCArMTA4Niw2IEBAIHNvY2tldF9jb25uZWN0aW9u IChjaGFyICpob3N0LCBpbnQgZmxhZ3MpCiAgICAgfQogICBmcmVlYWRkcmluZm8gKHJlcyk7 CiAKLSNlbHNlIC8qICFIQVZFX0dFVEFERFJJTkZPICovCi0gIGRvCi0gICAgewotICAgICAg aG9zdGVudCA9IGdldGhvc3RieW5hbWUgKGhvc3QpOwotICAgICAgdHJ5X2NvdW50Kys7Ci0g ICAgICBpZiAoKCEgaG9zdGVudCkgJiYgKChoX2Vycm5vICE9IFRSWV9BR0FJTikgfHwgKHRy eV9jb3VudCA9PSA1KSkpCi0JewotCSAgc3RyY3B5IChwb3BfZXJyb3IsICJDb3VsZCBub3Qg ZGV0ZXJtaW5lIFBPUCBzZXJ2ZXIncyBhZGRyZXNzIik7Ci0JICByZXR1cm4gKC0xKTsKLQl9 Ci0gICAgfSB3aGlsZSAoISBob3N0ZW50KTsKLQotICB3aGlsZSAoKmhvc3RlbnQtPmhfYWRk cl9saXN0KQotICAgIHsKLSAgICAgIG1lbWNweSAoJmFkZHIuc2luX2FkZHIsICpob3N0ZW50 LT5oX2FkZHJfbGlzdCwgaG9zdGVudC0+aF9sZW5ndGgpOwotICAgICAgaWYgKCEgY29ubmVj dCAoc29jaywgKHN0cnVjdCBzb2NrYWRkciAqKSAmYWRkciwgc2l6ZW9mIChhZGRyKSkpCi0J YnJlYWs7Ci0gICAgICBob3N0ZW50LT5oX2FkZHJfbGlzdCsrOwotICAgIH0KLSAgY29ubmVj dF9vayA9ICpob3N0ZW50LT5oX2FkZHJfbGlzdCAhPSBOVUxMOwotICBpZiAoISBjb25uZWN0 X29rKQotICAgIHsKLSAgICAgIHJlYWxob3N0ID0gYWxsb2NhIChzdHJsZW4gKGhvc3RlbnQt PmhfbmFtZSkgKyAxKTsKLSAgICAgIHN0cmNweSAocmVhbGhvc3QsIGhvc3RlbnQtPmhfbmFt ZSk7Ci0gICAgfQotCi0jZW5kaWYgLyogIUhBVkVfR0VUQUREUklORk8gKi8KLQogI2RlZmlu ZSBDT05ORUNUX0VSUk9SICJDb3VsZCBub3QgY29ubmVjdCB0byBQT1Agc2VydmVyOiAiCiAK ICAgaWYgKCEgY29ubmVjdF9vaykKZGlmZiAtLWdpdCBhL2xpc3AvbXBjLmVsIGIvbGlzcC9t cGMuZWwKaW5kZXggMjBlNGJjOC4uYWE3ZmVlNiAxMDA2NDQKLS0tIGEvbGlzcC9tcGMuZWwK KysrIGIvbGlzcC9tcGMuZWwKQEAgLTI2NSwxMCArMjY1LDcgQEAgbXBjLS1wcm9jLWNvbm5l Y3QKICAgICAgIChsZXQgKCh2IChtYXRjaC1zdHJpbmcgMyBob3N0KSkpCiAgICAgICAgIChz ZXRxIGhvc3QgKG1hdGNoLXN0cmluZyAyIGhvc3QpKQogICAgICAgICAod2hlbiAoYW5kIChz dHJpbmdwIHYpIChub3QgKHN0cmluZz0gIiIgdikpKQotICAgICAgICAgIChzZXRxIHBvcnQK LSAgICAgICAgICAgICAgICAoaWYgKHN0cmluZy1tYXRjaCAiW15bOmRpZ2l0Ol1dIiB2KQot ICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLXRvLW51bWJlciB2KQotICAgICAgICAgICAg ICAgICAgdikpKSkpCisgICAgICAgICAgKHNldHEgcG9ydCB2KSkpKQogICAgICh3aGVuIChm aWxlLW5hbWUtYWJzb2x1dGUtcCBob3N0KQogICAgICAgOzsgRXhwYW5kIGZpbGUgbmFtZSBi ZWNhdXNlIGBmaWxlLW5hbWUtYWJzb2x1dGUtcCcKICAgICAgIDs7IGNvbnNpZGVycyBwYXRo cyBiZWdpbm5pbmcgd2l0aCAifiIgYXMgYWJzb2x1dGUKZGlmZiAtLWdpdCBhL2xpc3AvbmV0 L25ldHdvcmstc3RyZWFtLmVsIGIvbGlzcC9uZXQvbmV0d29yay1zdHJlYW0uZWwKaW5kZXgg ZjkxOWVmYi4uNWRkYWVmNSAxMDA2NDQKLS0tIGEvbGlzcC9uZXQvbmV0d29yay1zdHJlYW0u ZWwKKysrIGIvbGlzcC9uZXQvbmV0d29yay1zdHJlYW0uZWwKQEAgLTY1LDggKzY1LDggQEAg b3Blbi1uZXR3b3JrLXN0cmVhbQogIFByb2Nlc3Mgb3V0cHV0IGdvZXMgYXQgZW5kIG9mIHRo YXQgYnVmZmVyLiAgQlVGRkVSIG1heSBiZSBuaWwsCiAgbWVhbmluZyB0aGF0IHRoZSBwcm9j ZXNzIGlzIG5vdCBhc3NvY2lhdGVkIHdpdGggYW55IGJ1ZmZlci4KIEhPU1QgaXMgdGhlIG5h bWUgb3IgSVAgYWRkcmVzcyBvZiB0aGUgaG9zdCB0byBjb25uZWN0IHRvLgotU0VSVklDRSBp cyB0aGUgbmFtZSBvZiB0aGUgc2VydmljZSBkZXNpcmVkLCBvciBhbiBpbnRlZ2VyIHNwZWNp ZnlpbmcKLSBhIHBvcnQgbnVtYmVyIHRvIGNvbm5lY3QgdG8uCitTRVJWSUNFIGlzIHRoZSBu YW1lIG9mIHRoZSBzZXJ2aWNlIGRlc2lyZWQsIG9yIGFuIGludGVnZXIgb3IKKyBpbnRlZ2Vy IHN0cmluZyBzcGVjaWZ5aW5nIGEgcG9ydCBudW1iZXIgdG8gY29ubmVjdCB0by4KIAogVGhl IHJlbWFpbmluZyBQQVJBTUVURVJTIHNob3VsZCBiZSBhIHNlcXVlbmNlIG9mIGtleXdvcmRz IGFuZAogdmFsdWVzOgpkaWZmIC0tZ2l0IGEvc3JjL3Byb2Nlc3MuYyBiL3NyYy9wcm9jZXNz LmMKaW5kZXggNjlmNWUxZC4uMzU5Y2QyMSAxMDA2NDQKLS0tIGEvc3JjL3Byb2Nlc3MuYwor KysgYi9zcmMvcHJvY2Vzcy5jCkBAIC0zNDI5LDIxICszNDI5LDYgQEAgY29ubmVjdF9uZXR3 b3JrX3NvY2tldCAoTGlzcF9PYmplY3QgcHJvYywgTGlzcF9PYmplY3QgaXBfYWRkcmVzc2Vz KQogCiB9CiAKLSNpZm5kZWYgSEFWRV9HRVRBRERSSU5GTwotc3RhdGljIExpc3BfT2JqZWN0 Ci1jb252X251bWVyaWNhbF90b19saXNwICh1bnNpZ25lZCBjaGFyICpudW1iZXIsIGludCBs ZW5ndGgsIGludCBwb3J0KQotewotICBMaXNwX09iamVjdCBhZGRyZXNzID0gRm1ha2VfdmVj dG9yIChtYWtlX251bWJlciAobGVuZ3RoICsgMSksIFFuaWwpOwotICBzdHJ1Y3QgTGlzcF9W ZWN0b3IgKnAgPSBYVkVDVE9SIChhZGRyZXNzKTsKLQotICBwLT5jb250ZW50c1tsZW5ndGhd ID0gbWFrZV9udW1iZXIgKHBvcnQpOwotICBmb3IgKGludCBpID0gMDsgaSA8IGxlbmd0aDsg aSsrKQotICAgIHAtPmNvbnRlbnRzW2ldID0gbWFrZV9udW1iZXIgKG51bWJlcltpXSk7Ci0K LSAgcmV0dXJuIGFkZHJlc3M7Ci19Ci0jZW5kaWYKLQogLyogQ3JlYXRlIGEgbmV0d29yayBz dHJlYW0vZGF0YWdyYW0gY2xpZW50L3NlcnZlciBwcm9jZXNzLiAgVHJlYXRlZAogICAgZXhh Y3RseSBsaWtlIGEgbm9ybWFsIHByb2Nlc3Mgd2hlbiByZWFkaW5nIGFuZCB3cml0aW5nLiAg UHJpbWFyeQogICAgZGlmZmVyZW5jZXMgYXJlIGluIHN0YXR1cyBkaXNwbGF5IGFuZCBwcm9j ZXNzIGRlbGV0aW9uLiAgQSBuZXR3b3JrCkBAIC0zNDc5LDkgKzM0NjQsOCBAQCBob3N0LCBh bmQgb25seSBjbGllbnRzIGNvbm5lY3RpbmcgdG8gdGhhdCBhZGRyZXNzIHdpbGwgYmUgYWNj ZXB0ZWQuCiAKIDpzZXJ2aWNlIFNFUlZJQ0UgLS0gU0VSVklDRSBpcyBuYW1lIG9mIHRoZSBz ZXJ2aWNlIGRlc2lyZWQsIG9yIGFuCiBpbnRlZ2VyIHNwZWNpZnlpbmcgYSBwb3J0IG51bWJl ciB0byBjb25uZWN0IHRvLiAgSWYgU0VSVklDRSBpcyB0LAotYSByYW5kb20gcG9ydCBudW1i ZXIgaXMgc2VsZWN0ZWQgZm9yIHRoZSBzZXJ2ZXIuICAoSWYgRW1hY3Mgd2FzCi1jb21waWxl ZCB3aXRoIGdldGFkZHJpbmZvLCBhIHBvcnQgbnVtYmVyIGNhbiBhbHNvIGJlIHNwZWNpZmll ZCBhcyBhCi1zdHJpbmcsIGUuZy4gIjgwIiwgYXMgd2VsbCBhcyBhbiBpbnRlZ2VyLiAgVGhp cyBpcyBub3QgcG9ydGFibGUuKQorYSByYW5kb20gcG9ydCBudW1iZXIgaXMgc2VsZWN0ZWQg Zm9yIHRoZSBzZXJ2ZXIuICBBIHBvcnQgbnVtYmVyIGNhbgorYmUgc3BlY2lmaWVkIGFzIGFu IGludGVnZXIgc3RyaW5nLCBlLmcuLCAiODAiLCBhcyB3ZWxsIGFzIGFuIGludGVnZXIuCiAK IDp0eXBlIFRZUEUgLS0gVFlQRSBpcyB0aGUgdHlwZSBvZiBjb25uZWN0aW9uLiAgVGhlIGRl ZmF1bHQgKG5pbCkgaXMgYQogc3RyZWFtIHR5cGUgY29ubmVjdGlvbiwgYGRhdGFncmFtJyBj cmVhdGVzIGEgZGF0YWdyYW0gdHlwZSBjb25uZWN0aW9uLApAQCAtMzYxNCwxMSArMzU5OCw5 IEBAIHVzYWdlOiAobWFrZS1uZXR3b3JrLXByb2Nlc3MgJnJlc3QgQVJHUykgICovKQogICBM aXNwX09iamVjdCBwcm9jOwogICBMaXNwX09iamVjdCBjb250YWN0OwogICBzdHJ1Y3QgTGlz cF9Qcm9jZXNzICpwOwotI2lmIGRlZmluZWQgSEFWRV9HRVRBRERSSU5GTyB8fCBkZWZpbmVk IEhBVkVfR0VUQUREUklORk9fQQogICBjb25zdCBjaGFyICpwb3J0c3RyaW5nOwogICBwdHJk aWZmX3QgcG9ydHN0cmluZ2xlbiBBVFRSSUJVVEVfVU5VU0VEOwogICBjaGFyIHBvcnRidWZb SU5UX0JVRlNJWkVfQk9VTkQgKEVNQUNTX0lOVCldOwotI2VuZGlmCiAjaWZkZWYgSEFWRV9M T0NBTF9TT0NLRVRTCiAgIHN0cnVjdCBzb2NrYWRkcl91biBhZGRyZXNzX3VuOwogI2VuZGlm CkBAIC0zNjg5LDcgKzM2NzEsNyBAQCB1c2FnZTogKG1ha2UtbmV0d29yay1wcm9jZXNzICZy ZXN0IEFSR1MpICAqLykKICAgdGVtID0gRnBsaXN0X2dldCAoY29udGFjdCwgUUNmYW1pbHkp OwogICBpZiAoTklMUCAodGVtKSkKICAgICB7Ci0jaWYgZGVmaW5lZCAoSEFWRV9HRVRBRERS SU5GTykgJiYgZGVmaW5lZCAoQUZfSU5FVDYpCisjaWZkZWYgQUZfSU5FVDYKICAgICAgIGZh bWlseSA9IEFGX1VOU1BFQzsKICNlbHNlCiAgICAgICBmYW1pbHkgPSBBRl9JTkVUOwpAQCAt Mzc2MSw3ICszNzQzLDYgQEAgdXNhZ2U6IChtYWtlLW5ldHdvcmstcHJvY2VzcyAmcmVzdCBB UkdTKSAgKi8pCiAgICAgfQogI2VuZGlmCiAKLSNpZiBkZWZpbmVkIEhBVkVfR0VUQUREUklO Rk8gfHwgZGVmaW5lZCBIQVZFX0dFVEFERFJJTkZPX0EKICAgaWYgKCFOSUxQIChob3N0KSkK ICAgICB7CiAgICAgICAvKiBTRVJWSUNFIGNhbiBlaXRoZXIgYmUgYSBzdHJpbmcgb3IgaW50 LgpAQCAtMzc4Myw3ICszNzY0LDYgQEAgdXNhZ2U6IChtYWtlLW5ldHdvcmstcHJvY2VzcyAm cmVzdCBBUkdTKSAgKi8pCiAJICBwb3J0c3RyaW5nbGVuID0gU0JZVEVTIChzZXJ2aWNlKTsK IAl9CiAgICAgfQotI2VuZGlmCiAKICNpZmRlZiBIQVZFX0dFVEFERFJJTkZPX0EKICAgaWYg KCFOSUxQIChob3N0KSAmJiAhTklMUCAoRnBsaXN0X2dldCAoY29udGFjdCwgUUNub3dhaXQp KSkKQEAgLTM4MTUsNyArMzc5NSw2IEBAIHVzYWdlOiAobWFrZS1uZXR3b3JrLXByb2Nlc3Mg JnJlc3QgQVJHUykgICovKQogICAgIH0KICNlbmRpZiAvKiBIQVZFX0dFVEFERFJJTkZPX0Eg Ki8KIAotI2lmZGVmIEhBVkVfR0VUQUREUklORk8KICAgLyogSWYgd2UgaGF2ZSBhIGhvc3Qs IHVzZSBnZXRhZGRyaW5mbyB0byByZXNvbHZlIGJvdGggaG9zdCBhbmQgc2VydmljZS4KICAg ICAgT3RoZXJ3aXNlLCB1c2UgZ2V0c2VydmJ5bmFtZSB0byBsb29rdXAgdGhlIHNlcnZpY2Uu ICAqLwogCkBAIC0zODU1LDEwICszODM0LDggQEAgdXNhZ2U6IChtYWtlLW5ldHdvcmstcHJv Y2VzcyAmcmVzdCBBUkdTKSAgKi8pCiAKICAgICAgIGdvdG8gb3Blbl9zb2NrZXQ7CiAgICAg fQotI2VuZGlmIC8qIEhBVkVfR0VUQUREUklORk8gKi8KIAotICAvKiBXZSBlbmQgdXAgaGVy ZSBpZiBnZXRhZGRyaW5mbyBpcyBub3QgZGVmaW5lZCwgb3IgaW4gY2FzZSBubyBob3N0bmFt ZQotICAgICBoYXMgYmVlbiBzcGVjaWZpZWQgKGUuZy4gZm9yIGEgbG9jYWwgc2VydmVyIHBy b2Nlc3MpLiAgKi8KKyAgLyogTm8gaG9zdG5hbWUgaGFzIGJlZW4gc3BlY2lmaWVkIChlLmcu LCBhIGxvY2FsIHNlcnZlciBwcm9jZXNzKS4gICovCiAKICAgaWYgKEVRIChzZXJ2aWNlLCBR dCkpCiAgICAgcG9ydCA9IDA7CkBAIC0zODk0LDQzICszODcxLDYgQEAgdXNhZ2U6IChtYWtl LW5ldHdvcmstcHJvY2VzcyAmcmVzdCBBUkdTKSAgKi8pCiAgICAgICB4c2lnbmFsMSAoUWVy cm9yLCBDQUxMTiAoRmZvcm1hdCwgdW5rbm93bl9zZXJ2aWNlLCBzZXJ2aWNlKSk7CiAgICAg fQogCi0jaWZuZGVmIEhBVkVfR0VUQUREUklORk8KLSAgaWYgKCFOSUxQIChob3N0KSkKLSAg ICB7Ci0gICAgICBzdHJ1Y3QgaG9zdGVudCAqaG9zdF9pbmZvX3B0cjsKLSAgICAgIHVuc2ln bmVkIGNoYXIgKmFkZHI7Ci0gICAgICBpbnQgYWRkcmxlbjsKLQotICAgICAgLyogZ2V0aG9z dGJ5bmFtZSBtYXkgZmFpbCB3aXRoIFRSWV9BR0FJTiwgYnV0IHdlIGRvbid0IGhvbm9yIHRo YXQsCi0JIGFzIGl0IG1heSBgaGFuZycgRW1hY3MgZm9yIGEgdmVyeSBsb25nIHRpbWUuICAq LwotICAgICAgaW1tZWRpYXRlX3F1aXQgPSAxOwotICAgICAgUVVJVDsKLQotICAgICAgaG9z dF9pbmZvX3B0ciA9IGdldGhvc3RieW5hbWUgKChjb25zdCBjaGFyICopIFNEQVRBIChob3N0 KSk7Ci0gICAgICBpbW1lZGlhdGVfcXVpdCA9IDA7Ci0KLSAgICAgIGlmIChob3N0X2luZm9f cHRyKQotCXsKLQkgIGFkZHIgPSAodW5zaWduZWQgY2hhciAqKSBob3N0X2luZm9fcHRyLT5o X2FkZHI7Ci0JICBhZGRybGVuID0gaG9zdF9pbmZvX3B0ci0+aF9sZW5ndGg7Ci0JfQotICAg ICAgZWxzZQotCS8qIEF0dGVtcHQgdG8gaW50ZXJwcmV0IGhvc3QgYXMgbnVtZXJpYyBpbmV0 IGFkZHJlc3MuICBUaGlzCi0JICAgb25seSB3b3JrcyBmb3IgSVB2NCBhZGRyZXNzZXMuICov Ci0JewotCSAgdW5zaWduZWQgbG9uZyBudW1lcmljX2FkZHIgPSBpbmV0X2FkZHIgKFNTREFU QSAoaG9zdCkpOwotCi0JICBpZiAobnVtZXJpY19hZGRyID09IC0xKQotCSAgICBlcnJvciAo IlVua25vd24gaG9zdCBcIiVzXCIiLCBTREFUQSAoaG9zdCkpOwotCi0JICBhZGRyID0gKHVu c2lnbmVkIGNoYXIgKikgJm51bWVyaWNfYWRkcjsKLQkgIGFkZHJsZW4gPSA0OwotCX0KLQot ICAgICAgaXBfYWRkcmVzc2VzID0gbGlzdDEgKGNvbnZfbnVtZXJpY2FsX3RvX2xpc3AgKGFk ZHIsIGFkZHJsZW4sIHBvcnQpKTsKLSAgICB9Ci0jZW5kaWYgLyogbm90IEhBVkVfR0VUQURE UklORk8gKi8KLQogIG9wZW5fc29ja2V0OgogCiAgIGlmICghTklMUCAoYnVmZmVyKSkKLS0g CjIuNS4wCgo= --------------090608050600070700000108--