From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.bugs Subject: bug#8855: dbus error at startup Date: Sun, 28 Oct 2012 18:38:18 -0700 Organization: UCLA Computer Science Department Message-ID: <508DDE0A.9020903@cs.ucla.edu> References: <5088CF93.2020802@cs.ucla.edu> <83y5iua59n.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------000809040304020309060406" X-Trace: ger.gmane.org 1351474726 27873 80.91.229.3 (29 Oct 2012 01:38:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 29 Oct 2012 01:38:46 +0000 (UTC) Cc: 8855@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Oct 29 02:38:54 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 1TSeJZ-0004uB-Et for geb-bug-gnu-emacs@m.gmane.org; Mon, 29 Oct 2012 02:38:53 +0100 Original-Received: from localhost ([::1]:60421 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSeJR-0003mx-87 for geb-bug-gnu-emacs@m.gmane.org; Sun, 28 Oct 2012 21:38:45 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:53640) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSeJN-0003mo-Gb for bug-gnu-emacs@gnu.org; Sun, 28 Oct 2012 21:38:43 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TSeJL-0004AY-Qp for bug-gnu-emacs@gnu.org; Sun, 28 Oct 2012 21:38:41 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:55086) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSeJL-0004AM-Mx for bug-gnu-emacs@gnu.org; Sun, 28 Oct 2012 21:38:39 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1TSeLe-0007DW-7w for bug-gnu-emacs@gnu.org; Sun, 28 Oct 2012 21:41:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Paul Eggert Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 29 Oct 2012 01:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 8855 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 8855-submit@debbugs.gnu.org id=B8855.135147484527715 (code B ref 8855); Mon, 29 Oct 2012 01:41:02 +0000 Original-Received: (at 8855) by debbugs.gnu.org; 29 Oct 2012 01:40:45 +0000 Original-Received: from localhost ([127.0.0.1]:37104 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TSeLM-0007Cx-9Q for submit@debbugs.gnu.org; Sun, 28 Oct 2012 21:40:45 -0400 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:40692) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TSeLI-0007Co-S0 for 8855@debbugs.gnu.org; Sun, 28 Oct 2012 21:40:43 -0400 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id BACABA60008; Sun, 28 Oct 2012 18:38:16 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Je-P+v66lHND; Sun, 28 Oct 2012 18:38:15 -0700 (PDT) Original-Received: from [192.168.1.3] (pool-108-23-119-2.lsanca.fios.verizon.net [108.23.119.2]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id CCC1939E8105; Sun, 28 Oct 2012 18:38:15 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux i686; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 In-Reply-To: <83y5iua59n.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:66162 Archived-At: This is a multi-part message in MIME format. --------------000809040304020309060406 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Attached is a slightly less-intrusive version of the patch. It omits the removal of "#ifdef SIGCHLD", which isn't strictly needed to fix the bug. I don't see any further simplifications, unfortunately. The patch fixes a bug that's been reported multiple times so I'm thinking it may be worthwhile to install now, even though there's a feature freeze. --------------000809040304020309060406 Content-Type: text/plain; charset=UTF-8; name="g_spawn_sync.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="g_spawn_sync.txt" PT09IG1vZGlmaWVkIGZpbGUgJ3NyYy9DaGFuZ2VMb2cnCi0tLSBzcmMvQ2hhbmdlTG9nCTIw MTItMTAtMjggMTc6NDI6NTIgKzAwMDAKKysrIHNyYy9DaGFuZ2VMb2cJMjAxMi0xMC0yOSAw MToyNTo1MyArMDAwMApAQCAtMSwzICsxLDMxIEBACisyMDEyLTEwLTI4ICBQYXVsIEVnZ2Vy dCAgPGVnZ2VydEBjcy51Y2xhLmVkdT4KKworCUZpeCBhIHJhY2UgY29uZGl0aW9uIHRoYXQg Y2F1c2VzIEVtYWNzIHRvIG1lc3MgdXAgZ2xpYiAoQnVnIzg4NTUpLgorCVRoZSBzeW1wdG9t IGlzIGEgZGlhZ25vc3RpYyAiR0xpYi1XQVJOSU5HICoqOiBJbiBjYWxsIHRvCisJZ19zcGF3 bl9zeW5jKCksIGV4aXQgc3RhdHVzIG9mIGEgY2hpbGQgcHJvY2VzcyB3YXMgcmVxdWVzdGVk IGJ1dAorCVNJR0NITEQgYWN0aW9uIHdhcyBzZXQgdG8gU0lHX0lHTiBhbmQgRUNISUxEIHdh cyByZWNlaXZlZCBieQorCXdhaXRwaWQoKSwgc28gZXhpdCBzdGF0dXMgY2FuJ3QgYmUgcmV0 dXJuZWQuIiAgVGhlIGRpYWdub3N0aWMKKwlpcyBwYXJ0bHkgd3JvbmcsIGFzIHRoZSBTSUdD SExEIGFjdGlvbiBpcyBub3Qgc2V0IHRvIFNJR19JR04uCisJVGhlIHJlYWwgYnVnIGlzIGEg cmFjZSBjb25kaXRpb24gYmV0d2VlbiBFbWFjcyBhbmQgZ2xpYjogRW1hY3MKKwlkb2VzIGEg d2FpdHBpZCAoLTEsIC4uLikgYW5kIHJlYXBzIGdsaWIncyBzdWJwcm9jZXNzIGJ5IG1pc3Rh a2UsCisJc28gdGhhdCBnbGliIGNhbid0IGZpbmQgaXQuICBXb3JrIGFyb3VuZCB0aGUgYnVn IGJ5IGludm9raW5nCisJd2FpdHBpZCBvbmx5IG9uIHN1YnByb2Nlc3NlcyB0aGF0IEVtYWNz IGl0c2VsZiBjcmVhdGVzLgorCVBlcmhhcHMgdGhpcyBidWcgZml4IGNhbiBiZSBtYWRlIG1v cmUgZWZmaWNpZW50IGJ5IGludm9raW5nCisJd2FpdHBpZCBvbmNlIG9uIGEgcHJvY2VzcyBn cm91cCBpbnN0ZWFkIG9mIGludm9raW5nIGl0IG9uIGVhY2gKKwlrbm93biBjaGlsZCwgYnV0 IGF0IGxlYXN0IHRoaXMgY29kZSBmaXhlcyB0aGUgYnVnLgorCSogcHJvY2Vzcy5jIChjcmVh dGVfcHJvY2VzcywgcmVjb3JkX2NoaWxkX3N0YXR1c19jaGFuZ2UpOgorCURvbid0IHVzZSBz cGVjaWFsIHZhbHVlIC0xIGluIHBpZCBmaWVsZCwgYXMgdGhlIGNhbGxlciBub3cgbXVzdAor CWtub3cgdGhlIHBpZCByYXRoZXIgdGhhbiBoYXZpbmcgdGhlIGNhbGxlZSBpbmZlciBpdC4g IFRoZQorCWluZmVyZW5jZSB3YXMgc29tZXRpbWVzIGluY29ycmVjdCBhbnl3YXksIGR1ZSB0 byBhbm90aGVyIHJhY2UuCisJKHByb2Nlc3Nfc3RhdHVzX3JldHJpZXZlZCk6IE5ldyBmdW5j dGlvbi4KKwkocmVjb3JkX2NoaWxkX3N0YXR1c19jaGFuZ2UpOiBVc2UgaXQuICBSZXR1cm4g Ym9vbC4KKwlBY2NlcHQgbmVnYXRpdmUgMXN0IGFyZ3VtZW50LCB3aGljaCBtZWFucyB0byB3 YWl0IGZvciBvbmUgb2YKKwl0aGUgcHJvY2Vzc2VzIHRoYXQgRW1hY3MgYWxyZWFkeSBrbm93 cyBhYm91dC4KKwkoaGFuZGxlX2NoaWxkX3NpZ25hbCk6IExldCByZWNvcmRfY2hpbGRfc3Rh dHVzX2NoYW5nZSBkbyBhbGwKKwl0aGUgd29yaywgc2luY2Ugd2UgZG8gbm90IHdhbnQgdG8g cmVhcCBhbGwgZXhpdGVkIGNoaWxkIHByb2Nlc3NlcywKKwlvbmx5IHRoZSBjaGlsZCBwcm9j ZXNzZXMgdGhhdCBFbWFjcyBpdHNlbGYgY3JlYXRlZC4KKwkqIHN5c3dhaXQuaDogQWRqdXN0 IHRvIGFib3ZlIEFQSSBjaGFuZ2VzLgorCiAyMDEyLTEwLTI4ICBFbGkgWmFyZXRza2lpICA8 ZWxpekBnbnUub3JnPgogCiAJKiB3MzJwcm9jLmMgKFRJTUVSX1RJQ0tTX1BFUl9TRUMpOiBO ZXcgbWFjcm8uCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3JjL3Byb2Nlc3MuYycKLS0tIHNyYy9w cm9jZXNzLmMJMjAxMi0xMC0xOSAxOToyNToxOCArMDAwMAorKysgc3JjL3Byb2Nlc3MuYwky MDEyLTEwLTI5IDAxOjI1OjUzICswMDAwCkBAIC03OTUsOSArNzk1LDggQEAKICNpZmRlZiBT SUdDSExECiAvKiBGZGVsZXRlX3Byb2Nlc3MgcHJvbWlzZXMgdG8gaW1tZWRpYXRlbHkgZm9y Z2V0IGFib3V0IHRoZSBwcm9jZXNzLCBidXQgaW4KICAgIHJlYWxpdHksIEVtYWNzIG5lZWRz IHRvIHJlbWVtYmVyIHRob3NlIHByb2Nlc3NlcyB1bnRpbCB0aGV5IGhhdmUgYmVlbgotICAg dHJlYXRlZCBieSB0aGUgU0lHQ0hMRCBoYW5kbGVyOyBvdGhlcndpc2UgdGhpcyBoYW5kbGVy IHdvdWxkIGNvbnNpZGVyIHRoZQotICAgcHJvY2VzcyBhcyBiZWluZyBzeW5jaHJvbm91cyBh bmQgc2F5IHRoYXQgdGhlIHN5bmNocm9ub3VzIHByb2Nlc3MgaXMKLSAgIGRlYWQuICAqLwor ICAgdHJlYXRlZCBieSB0aGUgU0lHQ0hMRCBoYW5kbGVyIGFuZCB3YWl0cGlkIGhhcyBiZWVu IGludm9rZWQgb24gdGhlbTsKKyAgIG90aGVyd2lzZSB0aGV5IG1pZ2h0IGZpbGwgdXAgdGhl IGtlcm5lbCdzIHByb2Nlc3MgdGFibGUuICAqLwogc3RhdGljIExpc3BfT2JqZWN0IGRlbGV0 ZWRfcGlkX2xpc3Q7CiAjZW5kaWYKIApAQCAtMTcwNCwxNiArMTcwMyw3IEBACiAgIGlmIChp bmNoYW5uZWwgPiBtYXhfcHJvY2Vzc19kZXNjKQogICAgIG1heF9wcm9jZXNzX2Rlc2MgPSBp bmNoYW5uZWw7CiAKLSAgLyogVW50aWwgd2Ugc3RvcmUgdGhlIHByb3BlciBwaWQsIGVuYWJs ZSB0aGUgU0lHQ0hMRCBoYW5kbGVyCi0gICAgIHRvIHJlY29nbml6ZSBhbiB1bmtub3duIHBp ZCBhcyBzdGFuZGluZyBmb3IgdGhpcyBwcm9jZXNzLgotICAgICBJdCBpcyB2ZXJ5IGltcG9y dGFudCBub3QgdG8gbGV0IHRoaXMgYG1hcmtlcicgdmFsdWUgc3RheQotICAgICBpbiB0aGUg dGFibGUgYWZ0ZXIgdGhpcyBmdW5jdGlvbiBoYXMgcmV0dXJuZWQ7IGlmIGl0IGRvZXMKLSAg ICAgaXQgbWlnaHQgY2F1c2UgY2FsbC1wcm9jZXNzIHRvIGhhbmcgYW5kIHN1YnNlcXVlbnQg YXN5bmNocm9ub3VzCi0gICAgIHByb2Nlc3NlcyB0byBnZXQgdGhlaXIgcmV0dXJuIHZhbHVl cyBzY3JhbWJsZWQuICAqLwotICBYUFJPQ0VTUyAocHJvY2VzcyktPnBpZCA9IC0xOwotCi0g IC8qIFRoaXMgbXVzdCBiZSBjYWxsZWQgYWZ0ZXIgdGhlIGFib3ZlIGxpbmUgYmVjYXVzZSBp dCBtYXkgc2lnbmFsIGFuCi0gICAgIGVycm9yLiAqLworICAvKiBUaGlzIG1heSBzaWduYWwg YW4gZXJyb3IuICovCiAgIHNldHVwX3Byb2Nlc3NfY29kaW5nX3N5c3RlbXMgKHByb2Nlc3Mp OwogCiAgIGVuY29kZWRfY3VycmVudF9kaXIgPSBFTkNPREVfRklMRSAoY3VycmVudF9kaXIp OwpAQCAtNjI3OSw5ICs2MjY5LDMwIEBACiAgIHJldHVybiBwcm9jZXNzOwogfQogDAotLyog T24gcmVjZWlwdCBvZiBhIHNpZ25hbCB0aGF0IGEgY2hpbGQgc3RhdHVzIGhhcyBjaGFuZ2Vk LCBsb29wIGFza2luZwotICAgYWJvdXQgY2hpbGRyZW4gd2l0aCBjaGFuZ2VkIHN0YXR1c2Vz IHVudGlsIHRoZSBzeXN0ZW0gc2F5cyB0aGVyZQotICAgYXJlIG5vIG1vcmUuCisvKiBJZiB0 aGUgc3RhdHVzIG9mIHRoZSBwcm9jZXNzIERFU0lSRUQgaGFzIGNoYW5nZWQsIHJldHVybiB0 cnVlIGFuZAorICAgc2V0ICpTVEFUVVMgdG8gaXRzIGV4aXQgc3RhdHVzOyBvdGhlcndpc2Us IHJldHVybiBmYWxzZS4KKyAgIElmIEhBVkUgaXMgbm9ubmVnYXRpdmUsIGFzc3VtZSB0aGF0 IEhBVkUgPSB3YWl0cGlkIChIQVZFLCBTVEFUVVMsIC4uLikKKyAgIGhhcyBhbHJlYWR5IGJl ZW4gaW52b2tlZCwgYW5kIGRvIG5vdCBpbnZva2Ugd2FpdHBpZCBhZ2Fpbi4gICovCisKK3N0 YXRpYyBib29sCitwcm9jZXNzX3N0YXR1c19yZXRyaWV2ZWQgKHBpZF90IGRlc2lyZWQsIHBp ZF90IGhhdmUsIGludCAqc3RhdHVzKQoreworICBpZiAoaGF2ZSA8IDApCisgICAgeworICAg ICAgZG8KKwloYXZlID0gd2FpdHBpZCAoZGVzaXJlZCwgc3RhdHVzLCBXTk9IQU5HIHwgV1VO VFJBQ0VEKTsKKyAgICAgIHdoaWxlIChoYXZlIDwgMCAmJiBlcnJubyA9PSBFSU5UUik7Cisg ICAgfQorCisgIHJldHVybiBoYXZlID09IGRlc2lyZWQ7Cit9CisKKy8qIElmIFBJRCBpcyBu b25uZWdhdGl2ZSwgdGhlIGNoaWxkIHByb2Nlc3MgUElEIHdpdGggd2FpdCBzdGF0dXMgVyBo YXMKKyAgIGNoYW5nZWQgaXRzIHN0YXR1czsgcmVjb3JkIHRoaXMgYW5kIHJldHVybiB0cnVl LgorCisgICBJZiBQSUQgaXMgbmVnYXRpdmUsIGlnbm9yZSBXLCBhbmQgbG9vayBmb3IgYSBr bm93biBjaGlsZCBwcm9jZXNzCisgICBvZiBFbWFjcyB3aG9zZSBzdGF0dXMgaGFzIGNoYW5n ZWQuICBJZiBvbmUgaXMgZm91bmQsIHJlY29yZCBpdHMgbmV3CisgICBzdGF0dXMgYW5kIHJl dHVybiB0cnVlOyBvdGhlcndpc2UsIHJldHVybiBmYWxzZS4KIAogICAgQWxsIHdlIGRvIGlz IGNoYW5nZSB0aGUgc3RhdHVzOyB3ZSBkbyBub3QgcnVuIHNlbnRpbmVscyBvciBwcmludAog ICAgbm90aWZpY2F0aW9ucy4gIFRoYXQgaXMgc2F2ZWQgZm9yIHRoZSBuZXh0IHRpbWUga2V5 Ym9hcmQgaW5wdXQgaXMKQEAgLTYzMDQsOCArNjMxNSw3IEBACiAgICAqKiBNYWxsb2MgV0FS TklORzogVGhpcyBzaG91bGQgbmV2ZXIgY2FsbCBtYWxsb2MgZWl0aGVyIGRpcmVjdGx5IG9y CiAgICBpbmRpcmVjdGx5OyBpZiBpdCBkb2VzLCB0aGF0IGlzIGEgYnVnICAqLwogCi0vKiBS ZWNvcmQgdGhlIGNoYW5nZWQgc3RhdHVzIG9mIHRoZSBjaGlsZCBwcm9jZXNzIFBJRCB3aXRo IHdhaXQgc3RhdHVzIFcuICAqLwotdm9pZAorYm9vbAogcmVjb3JkX2NoaWxkX3N0YXR1c19j aGFuZ2UgKHBpZF90IHBpZCwgaW50IHcpCiB7CiAjaWZkZWYgU0lHQ0hMRApAQCAtNjMxOSwx MSArNjMyOSwxOCBAQAogICBmb3IgKHRhaWwgPSBkZWxldGVkX3BpZF9saXN0OyBDT05TUCAo dGFpbCk7IHRhaWwgPSBYQ0RSICh0YWlsKSkKICAgICB7CiAgICAgICBMaXNwX09iamVjdCB4 cGlkID0gWENBUiAodGFpbCk7Ci0gICAgICBpZiAoKElOVEVHRVJQICh4cGlkKSAmJiBwaWQg PT0gWElOVCAoeHBpZCkpCi0JICB8fCAoRkxPQVRQICh4cGlkKSAmJiBwaWQgPT0gWEZMT0FU X0RBVEEgKHhwaWQpKSkKKyAgICAgIGJvb2wgYWxsX3BpZHNfYXJlX2ZpeG51bXMKKwk9IChN T1NUX05FR0FUSVZFX0ZJWE5VTSA8PSBUWVBFX01JTklNVU0gKHBpZF90KQorCSAgICYmIFRZ UEVfTUFYSU1VTSAocGlkX3QpIDw9IE1PU1RfUE9TSVRJVkVfRklYTlVNKTsKKyAgICAgIHBp ZF90IGRlbGV0ZWRfcGlkOworICAgICAgaWYgKGFsbF9waWRzX2FyZV9maXhudW1zIHx8IElO VEVHRVJQICh4cGlkKSkKKwlkZWxldGVkX3BpZCA9IFhJTlQgKHhwaWQpOworICAgICAgZWxz ZQorCWRlbGV0ZWRfcGlkID0gWEZMT0FUX0RBVEEgKHhwaWQpOworICAgICAgaWYgKHByb2Nl c3Nfc3RhdHVzX3JldHJpZXZlZCAoZGVsZXRlZF9waWQsIHBpZCwgJncpKQogCXsKIAkgIFhT RVRDQVIgKHRhaWwsIFFuaWwpOwotCSAgcmV0dXJuOworCSAgcmV0dXJuIDE7CiAJfQogICAg IH0KIApAQCAtNjMzMywyMyArNjM1MCwxMSBAQAogICAgIHsKICAgICAgIHByb2MgPSBYQ0RS IChYQ0FSICh0YWlsKSk7CiAgICAgICBwID0gWFBST0NFU1MgKHByb2MpOwotICAgICAgaWYg KEVRIChwLT50eXBlLCBRcmVhbCkgJiYgcC0+cGlkID09IHBpZCkKKyAgICAgIGlmIChFUSAo cC0+dHlwZSwgUXJlYWwpICYmIHByb2Nlc3Nfc3RhdHVzX3JldHJpZXZlZCAocC0+cGlkLCBw aWQsICZ3KSkKIAlicmVhazsKICAgICAgIHAgPSAwOwogICAgIH0KIAotICAvKiBMb29rIGZv ciBhbiBhc3luY2hyb25vdXMgcHJvY2VzcyB3aG9zZSBwaWQgaGFzbid0IGJlZW4gZmlsbGVk Ci0gICAgIGluIHlldC4gICovCi0gIGlmICghIHApCi0gICAgZm9yICh0YWlsID0gVnByb2Nl c3NfYWxpc3Q7IENPTlNQICh0YWlsKTsgdGFpbCA9IFhDRFIgKHRhaWwpKQotICAgICAgewot CXByb2MgPSBYQ0RSIChYQ0FSICh0YWlsKSk7Ci0JcCA9IFhQUk9DRVNTIChwcm9jKTsKLQlp ZiAocC0+cGlkID09IC0xKQotCSAgYnJlYWs7Ci0JcCA9IDA7Ci0gICAgICB9Ci0KICAgLyog Q2hhbmdlIHRoZSBzdGF0dXMgb2YgdGhlIHByb2Nlc3MgdGhhdCB3YXMgZm91bmQuICAqLwog ICBpZiAocCkKICAgICB7CkBAIC02Mzc1LDExICs2MzgwLDE0IEBACiAJIGxvb2sgYXJvdW5k LiAgKi8KICAgICAgIGlmIChpbnB1dF9hdmFpbGFibGVfY2xlYXJfdGltZSkKIAkqaW5wdXRf YXZhaWxhYmxlX2NsZWFyX3RpbWUgPSBtYWtlX2VtYWNzX3RpbWUgKDAsIDApOworCisgICAg ICByZXR1cm4gMTsKICAgICB9Ci0gIC8qIFRoZXJlIHdhcyBubyBhc3luY2hyb25vdXMgcHJv Y2VzcyBmb3VuZCBmb3IgdGhhdCBwaWQ6IHdlIGhhdmUKLSAgICAgYSBzeW5jaHJvbm91cyBw cm9jZXNzLiAgKi8KLSAgZWxzZQorICBlbHNlIGlmICgwIDw9IHBpZCkKICAgICB7CisgICAg ICAvKiBUaGUgY2FsbGVyIHN1Y2Nlc3NmdWxseSB3YWl0ZWQgZm9yIGEgcGlkIGJ1dCBubyBh c3luY2hyb25vdXMKKwkgcHJvY2VzcyB3YXMgZm91bmQgZm9yIGl0LCBzbyB0aGlzIGlzIGEg c3luY2hyb25vdXMgcHJvY2Vzcy4gICovCisKICAgICAgIHN5bmNoX3Byb2Nlc3NfYWxpdmUg PSAwOwogCiAgICAgICAvKiBSZXBvcnQgdGhlIHN0YXR1cyBvZiB0aGUgc3luY2hyb25vdXMg cHJvY2Vzcy4gICovCkBAIC02MzkyLDggKzY0MDAsMTIgQEAKIAkgbG9vayBhcm91bmQuICAq LwogICAgICAgaWYgKGlucHV0X2F2YWlsYWJsZV9jbGVhcl90aW1lKQogCSppbnB1dF9hdmFp bGFibGVfY2xlYXJfdGltZSA9IG1ha2VfZW1hY3NfdGltZSAoMCwgMCk7CisKKyAgICAgIHJl dHVybiAxOwogICAgIH0KICNlbmRpZgorCisgIHJldHVybiAwOwogfQogCiAjaWZkZWYgU0lH Q0hMRApAQCAtNjQxMywyMyArNjQyNSw4IEBACiBzdGF0aWMgdm9pZAogaGFuZGxlX2NoaWxk X3NpZ25hbCAoaW50IHNpZykKIHsKLSAgZG8KLSAgICB7Ci0gICAgICBwaWRfdCBwaWQ7Ci0g ICAgICBpbnQgc3RhdHVzOwotCi0gICAgICBkbwotCXBpZCA9IHdhaXRwaWQgKC0xLCAmc3Rh dHVzLCBXTk9IQU5HIHwgV1VOVFJBQ0VEKTsKLSAgICAgIHdoaWxlIChwaWQgPCAwICYmIGVy cm5vID09IEVJTlRSKTsKLQotICAgICAgLyogUElEID09IDAgbWVhbnMgbm8gcHJvY2Vzc2Vz IGZvdW5kLCBQSUQgPT0gLTEgbWVhbnMgYSByZWFsIGZhaWx1cmUuCi0JIEVpdGhlciB3YXks IHdlIGhhdmUgZG9uZSBhbGwgb3VyIGpvYi4gICovCi0gICAgICBpZiAocGlkIDw9IDApCi0J YnJlYWs7Ci0KLSAgICAgIHJlY29yZF9jaGlsZF9zdGF0dXNfY2hhbmdlIChwaWQsIHN0YXR1 cyk7Ci0gICAgfQotICB3aGlsZSAoQ0FOX0hBTkRMRV9NVUxUSVBMRV9DSElMRFJFTik7Cisg IHdoaWxlIChyZWNvcmRfY2hpbGRfc3RhdHVzX2NoYW5nZSAoLTEsIDApICYmIENBTl9IQU5E TEVfTVVMVElQTEVfQ0hJTERSRU4pCisgICAgY29udGludWU7CiB9CiAKIHN0YXRpYyB2b2lk Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3JjL3N5c3dhaXQuaCcKLS0tIHNyYy9zeXN3YWl0LmgJ MjAxMi0wOS0yMyAyMjoyNToyMiArMDAwMAorKysgc3JjL3N5c3dhaXQuaAkyMDEyLTEwLTI1 IDA1OjI5OjQwICswMDAwCkBAIC0yMyw2ICsyMyw3IEBACiAjaWZuZGVmIEVNQUNTX1NZU1dB SVRfSAogI2RlZmluZSBFTUFDU19TWVNXQUlUX0gKIAorI2luY2x1ZGUgPHN0ZGJvb2wuaD4K ICNpbmNsdWRlIDxzeXMvdHlwZXMuaD4KIAogI2lmZGVmIEhBVkVfU1lTX1dBSVRfSAkvKiBX ZSBoYXZlIHN5cy93YWl0Lmggd2l0aCBQT1NJWG9pZCBkZWZpbml0aW9ucy4gKi8KQEAgLTUy LDcgKzUzLDcgQEAKICNlbmRpZgogCiAvKiBEZWZpbmVkIGluIHByb2Nlc3MuYy4gICovCi1l eHRlcm4gdm9pZCByZWNvcmRfY2hpbGRfc3RhdHVzX2NoYW5nZSAocGlkX3QsIGludCk7Citl eHRlcm4gYm9vbCByZWNvcmRfY2hpbGRfc3RhdHVzX2NoYW5nZSAocGlkX3QsIGludCk7CiAK IC8qIERlZmluZWQgaW4gc3lzZGVwLmMuICAqLwogZXh0ZXJuIHZvaWQgd2FpdF9mb3JfdGVy bWluYXRpb24gKHBpZF90KTsKCg== --------------000809040304020309060406--