From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1985 invoked by alias); 24 Feb 2009 07:11:10 -0000 Received: (qmail 1971 invoked by uid 22791); 24 Feb 2009 07:11:08 -0000 X-SWARE-Spam-Status: No, hits=-0.3 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_34,KAM_STOCKGEN,SARE_MSGID_LONG40,SPF_PASS X-Spam-Check-By: sourceware.org Received: from ti-out-0910.google.com (HELO ti-out-0910.google.com) (209.85.142.186) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 24 Feb 2009 07:11:00 +0000 Received: by ti-out-0910.google.com with SMTP id y8so1972263tia.12 for ; Mon, 23 Feb 2009 23:10:51 -0800 (PST) MIME-Version: 1.0 Received: by 10.110.105.10 with SMTP id d10mr7285271tic.33.1235459451159; Mon, 23 Feb 2009 23:10:51 -0800 (PST) Date: Tue, 24 Feb 2009 10:52:00 -0000 Message-ID: Subject: [RFA] Add _() to query From: teawater To: Eli Zaretskii , "gdb-patches@sourceware.org" Content-Type: multipart/mixed; boundary=0016e652d056b884040463a4d1eb 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: 2009-02/txt/msg00454.txt.bz2 --0016e652d056b884040463a4d1eb Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-length: 1246 Hi Eli, I remember you told me that you want to add _() to all query. I make a patch for it. Do you think it's OK? 2009-02-24 Hui Zhu * cli/cli-script.c (define_command): Add _() to query. * gnu-nat.c (inf_validate_task_sc): Ditto. * infcmd.c (kill_if_already_running): Ditto. (jump_command): Ditto. (attach_command): Ditto. * inflow.c (kill_command): Ditto. * infrun.c (handle_command): Ditto. * maint.c (maintenance_dump_me): Ditto. * memattr.c (mem_delete_command): Ditto. * monitor.c (monitor_interrupt_query): Ditto. * nto-procfs.c (interrupt_query): Ditto. * printcmd.c (undisplay_command): Ditto. * remote-mips.c (mips_kill): Ditto. * remote.c (interrupt_query): Ditto. * solib-irix.c (irix_open_symbol_file_object): Ditto. * solib-osf.c (osf_open_symbol_file_object): Ditto. * solib-pa64.c (pa64_open_symbol_file_object): Ditto. * solib-som.c (som_open_symbol_file_object): Ditto. * solib-svr4.c (open_symbol_file_object): Ditto. * symfile.c (symbol_file_add_with_addrs_or_offsets): Ditto. (add_symbol_file_command): Ditto. * target.c (kill_or_be_killed): Ditto. * tracepoint.c (delete_trace_command): Ditto. * top.c (quit_confirm): Add _() to s that will be used in query. Thanks, Hui --0016e652d056b884040463a4d1eb Content-Type: text/plain; charset=US-ASCII; name="add__()_to_query.txt" Content-Disposition: attachment; filename="add__()_to_query.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_frk90crt0 Content-length: 13998 LS0tCiBjbGkvY2xpLXNjcmlwdC5jIHwgICAgMiArLQogZ251LW5hdC5jICAg ICAgICB8ICAgIDQgKystLQogaW5mY21kLmMgICAgICAgICB8ICAgMTAgKysr KystLS0tLQogaW5mbG93LmMgICAgICAgICB8ICAgIDIgKy0KIGluZnJ1bi5j ICAgICAgICAgfCAgICA0ICsrLS0KIG1haW50LmMgICAgICAgICAgfCAgICAy ICstCiBtZW1hdHRyLmMgICAgICAgIHwgICAgMiArLQogbW9uaXRvci5jICAg ICAgICB8ICAgIDQgKystLQogbnRvLXByb2Nmcy5jICAgICB8ICAgIDQgKyst LQogcHJpbnRjbWQuYyAgICAgICB8ICAgIDIgKy0KIHJlbW90ZS1taXBzLmMg ICAgfCAgICA0ICsrLS0KIHJlbW90ZS5jICAgICAgICAgfCAgICA0ICsrLS0K IHNvbGliLWlyaXguYyAgICAgfCAgICAyICstCiBzb2xpYi1vc2YuYyAgICAg IHwgICAgMiArLQogc29saWItcGE2NC5jICAgICB8ICAgIDIgKy0KIHNvbGli LXNvbS5jICAgICAgfCAgICAyICstCiBzb2xpYi1zdnI0LmMgICAgIHwgICAg MiArLQogc3ltZmlsZS5jICAgICAgICB8ICAgIDQgKystLQogdGFyZ2V0LmMg ICAgICAgICB8ICAgIDIgKy0KIHRvcC5jICAgICAgICAgICAgfCAgICA2ICsr Ky0tLQogdHJhY2Vwb2ludC5jICAgICB8ICAgIDIgKy0KIDIxIGZpbGVzIGNo YW5nZWQsIDM0IGluc2VydGlvbnMoKyksIDM0IGRlbGV0aW9ucygtKQoKLS0t IGEvY2xpL2NsaS1zY3JpcHQuYworKysgYi9jbGkvY2xpLXNjcmlwdC5jCkBA IC0xMzc5LDcgKzEzNzksNyBAQCBkZWZpbmVfY29tbWFuZCAoY2hhciAqY29t bmFtZSwgaW50IGZyb21fCiAJewogCSAgd2FybmluZyAoXygiWW91ciBuZXcg YCVzJyBjb21tYW5kIGRvZXMgbm90IGhvb2sgYW55IGV4aXN0aW5nIGNvbW1h bmQuIiksCiAJCSAgIGNvbWZ1bGwpOwotCSAgaWYgKCFxdWVyeSAoIlByb2Nl ZWQ/ICIpKQorCSAgaWYgKCFxdWVyeSAoXygiUHJvY2VlZD8gIikpKQogCSAg ICBlcnJvciAoXygiTm90IGNvbmZpcm1lZC4iKSk7CiAJfQogICAgIH0KLS0t IGEvZ251LW5hdC5jCisrKyBiL2dudS1uYXQuYwpAQCAtODU0LDggKzg1NCw4 IEBAIGluZl92YWxpZGF0ZV90YXNrX3NjIChzdHJ1Y3QgaW5mICppbmYpCiAg ICAgICBpbnQgYWJvcnQ7CiAKICAgICAgIHRhcmdldF90ZXJtaW5hbF9vdXJz ICgpOwkvKiBBbGxvdyBJL08uICAqLwotICAgICAgYWJvcnQgPSAhcXVlcnkg KCJQaWQgJWQgaGFzIGFuIGFkZGl0aW9uYWwgdGFzayBzdXNwZW5kIGNvdW50 IG9mICVkOyIKLQkJICAgICAgIiBjbGVhciBpdD8gIiwgaW5mLT5waWQsCisg ICAgICBhYm9ydCA9ICFxdWVyeSAoXygiUGlkICVkIGhhcyBhbiBhZGRpdGlv bmFsIHRhc2sgc3VzcGVuZCBjb3VudCBvZiAlZDsiCisJCSAgICAgICIgY2xl YXIgaXQ/ICIpLCBpbmYtPnBpZCwKIAkJICAgICAgc3VzcGVuZF9jb3VudCAt IGluZi0+dGFzay0+Y3VyX3NjKTsKICAgICAgIHRhcmdldF90ZXJtaW5hbF9p bmZlcmlvciAoKTsJLyogR2l2ZSBpdCBiYWNrIHRvIHRoZSBjaGlsZC4gICov CiAKLS0tIGEvaW5mY21kLmMKKysrIGIvaW5mY21kLmMKQEAgLTQ0MSw4ICs0 NDEsOCBAQCBraWxsX2lmX2FscmVhZHlfcnVubmluZyAoaW50IGZyb21fdHR5 KQogICAgICAgdGFyZ2V0X3JlcXVpcmVfcnVubmFibGUgKCk7CiAKICAgICAg IGlmIChmcm9tX3R0eQotCSAgJiYgIXF1ZXJ5ICgiVGhlIHByb2dyYW0gYmVp bmcgZGVidWdnZWQgaGFzIGJlZW4gc3RhcnRlZCBhbHJlYWR5LlxuXAotU3Rh cnQgaXQgZnJvbSB0aGUgYmVnaW5uaW5nPyAiKSkKKwkgICYmICFxdWVyeSAo XygiVGhlIHByb2dyYW0gYmVpbmcgZGVidWdnZWQgaGFzIGJlZW4gc3RhcnRl ZCBhbHJlYWR5LlxuXAorU3RhcnQgaXQgZnJvbSB0aGUgYmVnaW5uaW5nPyAi KSkpCiAJZXJyb3IgKF8oIlByb2dyYW0gbm90IHJlc3RhcnRlZC4iKSk7CiAg ICAgICB0YXJnZXRfa2lsbCAoKTsKICAgICB9CkBAIC0xMDI5LDcgKzEwMjks NyBAQCBqdW1wX2NvbW1hbmQgKGNoYXIgKmFyZywgaW50IGZyb21fdHR5KQog ICBzZm4gPSBmaW5kX3BjX2Z1bmN0aW9uIChzYWwucGMpOwogICBpZiAoZm4g IT0gTlVMTCAmJiBzZm4gIT0gZm4pCiAgICAgewotICAgICAgaWYgKCFxdWVy eSAoIkxpbmUgJWQgaXMgbm90IGluIGAlcycuICBKdW1wIGFueXdheT8gIiwg c2FsLmxpbmUsCisgICAgICBpZiAoIXF1ZXJ5IChfKCJMaW5lICVkIGlzIG5v dCBpbiBgJXMnLiAgSnVtcCBhbnl3YXk/ICIpLCBzYWwubGluZSwKIAkJICBT WU1CT0xfUFJJTlRfTkFNRSAoZm4pKSkKIAl7CiAJICBlcnJvciAoXygiTm90 IGNvbmZpcm1lZC4iKSk7CkBAIC0xMDQzLDcgKzEwNDMsNyBAQCBqdW1wX2Nv bW1hbmQgKGNoYXIgKmFyZywgaW50IGZyb21fdHR5KQogICAgICAgaWYgKHNl Y3Rpb25faXNfb3ZlcmxheSAoU1lNQk9MX09CSl9TRUNUSU9OIChzZm4pKSAm JgogCSAgIXNlY3Rpb25faXNfbWFwcGVkIChTWU1CT0xfT0JKX1NFQ1RJT04g KHNmbikpKQogCXsKLQkgIGlmICghcXVlcnkgKCJXQVJOSU5HISEhICBEZXN0 aW5hdGlvbiBpcyBpbiB1bm1hcHBlZCBvdmVybGF5ISAgSnVtcCBhbnl3YXk/ ICIpKQorCSAgaWYgKCFxdWVyeSAoXygiV0FSTklORyEhISAgRGVzdGluYXRp b24gaXMgaW4gdW5tYXBwZWQgb3ZlcmxheSEgIEp1bXAgYW55d2F5PyAiKSkp CiAJICAgIHsKIAkgICAgICBlcnJvciAoXygiTm90IGNvbmZpcm1lZC4iKSk7 CiAJICAgICAgLyogTk9UUkVBQ0hFRCAqLwpAQCAtMjIzNSw3ICsyMjM1LDcg QEAgYXR0YWNoX2NvbW1hbmQgKGNoYXIgKmFyZ3MsIGludCBmcm9tX3R0eQog ICAgIDsKICAgZWxzZSBpZiAodGFyZ2V0X2hhc19leGVjdXRpb24pCiAgICAg ewotICAgICAgaWYgKHF1ZXJ5ICgiQSBwcm9ncmFtIGlzIGJlaW5nIGRlYnVn Z2VkIGFscmVhZHkuICBLaWxsIGl0PyAiKSkKKyAgICAgIGlmIChxdWVyeSAo XygiQSBwcm9ncmFtIGlzIGJlaW5nIGRlYnVnZ2VkIGFscmVhZHkuICBLaWxs IGl0PyAiKSkpCiAJdGFyZ2V0X2tpbGwgKCk7CiAgICAgICBlbHNlCiAJZXJy b3IgKF8oIk5vdCBraWxsZWQuIikpOwotLS0gYS9pbmZsb3cuYworKysgYi9p bmZsb3cuYwpAQCAtNjA3LDcgKzYwNyw3IEBAIGtpbGxfY29tbWFuZCAoY2hh ciAqYXJnLCBpbnQgZnJvbV90dHkpCiAKICAgaWYgKHB0aWRfZXF1YWwgKGlu ZmVyaW9yX3B0aWQsIG51bGxfcHRpZCkpCiAgICAgZXJyb3IgKF8oIlRoZSBw cm9ncmFtIGlzIG5vdCBiZWluZyBydW4uIikpOwotICBpZiAoIXF1ZXJ5ICgi S2lsbCB0aGUgcHJvZ3JhbSBiZWluZyBkZWJ1Z2dlZD8gIikpCisgIGlmICgh cXVlcnkgKF8oIktpbGwgdGhlIHByb2dyYW0gYmVpbmcgZGVidWdnZWQ/ICIp KSkKICAgICBlcnJvciAoXygiTm90IGNvbmZpcm1lZC4iKSk7CiAgIHRhcmdl dF9raWxsICgpOwogCi0tLSBhL2luZnJ1bi5jCisrKyBiL2luZnJ1bi5jCkBA IC00NjM3LDggKzQ2MzcsOCBAQCBoYW5kbGVfY29tbWFuZCAoY2hhciAqYXJn cywgaW50IGZyb21fdHR5CiAJICAgIGNhc2UgVEFSR0VUX1NJR05BTF9JTlQ6 CiAJICAgICAgaWYgKCFhbGxzaWdzICYmICFzaWdzW3NpZ251bV0pCiAJCXsK LQkJICBpZiAocXVlcnkgKCIlcyBpcyB1c2VkIGJ5IHRoZSBkZWJ1Z2dlci5c blwKLUFyZSB5b3Ugc3VyZSB5b3Ugd2FudCB0byBjaGFuZ2UgaXQ/ICIsIHRh cmdldF9zaWduYWxfdG9fbmFtZSAoKGVudW0gdGFyZ2V0X3NpZ25hbCkgc2ln bnVtKSkpCisJCSAgaWYgKHF1ZXJ5IChfKCIlcyBpcyB1c2VkIGJ5IHRoZSBk ZWJ1Z2dlci5cblwKK0FyZSB5b3Ugc3VyZSB5b3Ugd2FudCB0byBjaGFuZ2Ug aXQ/ICIpLCB0YXJnZXRfc2lnbmFsX3RvX25hbWUgKChlbnVtIHRhcmdldF9z aWduYWwpIHNpZ251bSkpKQogCQkgICAgewogCQkgICAgICBzaWdzW3NpZ251 bV0gPSAxOwogCQkgICAgfQotLS0gYS9tYWludC5jCisrKyBiL21haW50LmMK QEAgLTk4LDcgKzk4LDcgQEAgbWFpbnRlbmFuY2VfY29tbWFuZCAoY2hhciAq YXJncywgaW50IGZybwogc3RhdGljIHZvaWQKIG1haW50ZW5hbmNlX2R1bXBf bWUgKGNoYXIgKmFyZ3MsIGludCBmcm9tX3R0eSkKIHsKLSAgaWYgKHF1ZXJ5 ICgiU2hvdWxkIEdEQiBkdW1wIGNvcmU/ICIpKQorICBpZiAocXVlcnkgKF8o IlNob3VsZCBHREIgZHVtcCBjb3JlPyAiKSkpCiAgICAgewogI2lmZGVmIF9f REpHUFBfXwogICAgICAgLyogU0lHUVVJVCBieSBkZWZhdWx0IGlzIGlnbm9y ZWQsIHNvIHVzZSBTSUdBQlJUIGluc3RlYWQuICAqLwotLS0gYS9tZW1hdHRy LmMKKysrIGIvbWVtYXR0ci5jCkBAIC02OTAsNyArNjkwLDcgQEAgbWVtX2Rl bGV0ZV9jb21tYW5kIChjaGFyICphcmdzLCBpbnQgZnJvbQogCiAgIGlmIChw ID09IDApCiAgICAgewotICAgICAgaWYgKHF1ZXJ5ICgiRGVsZXRlIGFsbCBt ZW1vcnkgcmVnaW9ucz8gIikpCisgICAgICBpZiAocXVlcnkgKF8oIkRlbGV0 ZSBhbGwgbWVtb3J5IHJlZ2lvbnM/ICIpKSkKIAltZW1fY2xlYXIgKCk7CiAg ICAgICBkb250X3JlcGVhdCAoKTsKICAgICAgIHJldHVybjsKLS0tIGEvbW9u aXRvci5jCisrKyBiL21vbml0b3IuYwpAQCAtMTAwOCw4ICsxMDA4LDggQEAg bW9uaXRvcl9pbnRlcnJ1cHRfcXVlcnkgKHZvaWQpCiB7CiAgIHRhcmdldF90 ZXJtaW5hbF9vdXJzICgpOwogCi0gIGlmIChxdWVyeSAoIkludGVycnVwdGVk IHdoaWxlIHdhaXRpbmcgZm9yIHRoZSBwcm9ncmFtLlxuXAotR2l2ZSB1cCAo YW5kIHN0b3AgZGVidWdnaW5nIGl0KT8gIikpCisgIGlmIChxdWVyeSAoXygi SW50ZXJydXB0ZWQgd2hpbGUgd2FpdGluZyBmb3IgdGhlIHByb2dyYW0uXG5c CitHaXZlIHVwIChhbmQgc3RvcCBkZWJ1Z2dpbmcgaXQpPyAiKSkpCiAgICAg ewogICAgICAgdGFyZ2V0X21vdXJuX2luZmVyaW9yICgpOwogICAgICAgZGVw cmVjYXRlZF90aHJvd19yZWFzb24gKFJFVFVSTl9RVUlUKTsKLS0tIGEvbnRv LXByb2Nmcy5jCisrKyBiL250by1wcm9jZnMuYwpAQCAtNTkzLDggKzU5Myw4 IEBAIGludGVycnVwdF9xdWVyeSAodm9pZCkKIHsKICAgdGFyZ2V0X3Rlcm1p bmFsX291cnMgKCk7CiAKLSAgaWYgKHF1ZXJ5ICgiSW50ZXJydXB0ZWQgd2hp bGUgd2FpdGluZyBmb3IgdGhlIHByb2dyYW0uXG5cCi1HaXZlIHVwIChhbmQg c3RvcCBkZWJ1Z2dpbmcgaXQpPyAiKSkKKyAgaWYgKHF1ZXJ5IChfKCJJbnRl cnJ1cHRlZCB3aGlsZSB3YWl0aW5nIGZvciB0aGUgcHJvZ3JhbS5cblwKK0dp dmUgdXAgKGFuZCBzdG9wIGRlYnVnZ2luZyBpdCk/ICIpKSkKICAgICB7CiAg ICAgICB0YXJnZXRfbW91cm5faW5mZXJpb3IgKCk7CiAgICAgICBkZXByZWNh dGVkX3Rocm93X3JlYXNvbiAoUkVUVVJOX1FVSVQpOwotLS0gYS9wcmludGNt ZC5jCisrKyBiL3ByaW50Y21kLmMKQEAgLTE0ODIsNyArMTQ4Miw3IEBAIHVu ZGlzcGxheV9jb21tYW5kIChjaGFyICphcmdzLCBpbnQgZnJvbV8KIAogICBp ZiAoYXJncyA9PSAwKQogICAgIHsKLSAgICAgIGlmIChxdWVyeSAoIkRlbGV0 ZSBhbGwgYXV0by1kaXNwbGF5IGV4cHJlc3Npb25zPyAiKSkKKyAgICAgIGlm IChxdWVyeSAoXygiRGVsZXRlIGFsbCBhdXRvLWRpc3BsYXkgZXhwcmVzc2lv bnM/ICIpKSkKIAljbGVhcl9kaXNwbGF5cyAoKTsKICAgICAgIGRvbnRfcmVw ZWF0ICgpOwogICAgICAgcmV0dXJuOwotLS0gYS9yZW1vdGUtbWlwcy5jCisr KyBiL3JlbW90ZS1taXBzLmMKQEAgLTIxNDIsOCArMjE0Miw4IEBAIG1pcHNf a2lsbCAodm9pZCkKIAogICAgICAgdGFyZ2V0X3Rlcm1pbmFsX291cnMgKCk7 CiAKLSAgICAgIGlmIChxdWVyeSAoIkludGVycnVwdGVkIHdoaWxlIHdhaXRp bmcgZm9yIHRoZSBwcm9ncmFtLlxuXAotR2l2ZSB1cCAoYW5kIHN0b3AgZGVi dWdnaW5nIGl0KT8gIikpCisgICAgICBpZiAocXVlcnkgKF8oIkludGVycnVw dGVkIHdoaWxlIHdhaXRpbmcgZm9yIHRoZSBwcm9ncmFtLlxuXAorR2l2ZSB1 cCAoYW5kIHN0b3AgZGVidWdnaW5nIGl0KT8gIikpKQogCXsKIAkgIC8qIENs ZWFuIHVwIGluIHN1Y2ggYSB3YXkgdGhhdCBtaXBzX2Nsb3NlIHdvbid0IHRy eSB0byB0YWxrIHRvIHRoZQogCSAgICAgYm9hcmQgKGl0IGFsbW9zdCBzdXJl bHkgd29uJ3Qgd29yayBzaW5jZSB3ZSB3ZXJlbid0IGFibGUgdG8gdGFsayB0 bwotLS0gYS9yZW1vdGUuYworKysgYi9yZW1vdGUuYwpAQCAtMzk0NCw4ICsz OTQ0LDggQEAgaW50ZXJydXB0X3F1ZXJ5ICh2b2lkKQogICAgIH0KICAgZWxz ZQogICAgIHsKLSAgICAgIGlmIChxdWVyeSAoIkludGVycnVwdGVkIHdoaWxl IHdhaXRpbmcgZm9yIHRoZSBwcm9ncmFtLlxuXAotR2l2ZSB1cCAoYW5kIHN0 b3AgZGVidWdnaW5nIGl0KT8gIikpCisgICAgICBpZiAocXVlcnkgKF8oIklu dGVycnVwdGVkIHdoaWxlIHdhaXRpbmcgZm9yIHRoZSBwcm9ncmFtLlxuXAor R2l2ZSB1cCAoYW5kIHN0b3AgZGVidWdnaW5nIGl0KT8gIikpKQogCXsKIAkg IHBvcF90YXJnZXQgKCk7CiAJICBkZXByZWNhdGVkX3Rocm93X3JlYXNvbiAo UkVUVVJOX1FVSVQpOwotLS0gYS9zb2xpYi1pcml4LmMKKysrIGIvc29saWIt aXJpeC5jCkBAIC02MTEsNyArNjExLDcgQEAgaXJpeF9vcGVuX3N5bWJvbF9m aWxlX29iamVjdCAodm9pZCAqZnJvbQogICBjaGFyICpmaWxlbmFtZTsKIAog ICBpZiAoc3ltZmlsZV9vYmpmaWxlKQotICAgIGlmICghcXVlcnkgKCJBdHRl bXB0IHRvIHJlbG9hZCBzeW1ib2xzIGZyb20gcHJvY2Vzcz8gIikpCisgICAg aWYgKCFxdWVyeSAoXygiQXR0ZW1wdCB0byByZWxvYWQgc3ltYm9scyBmcm9t IHByb2Nlc3M/ICIpKSkKICAgICAgIHJldHVybiAwOwogCiAgIGlmICgoZGVi dWdfYmFzZSA9IGxvY2F0ZV9iYXNlICgpKSA9PSAwKQotLS0gYS9zb2xpYi1v c2YuYworKysgYi9zb2xpYi1vc2YuYwpAQCAtNTg0LDcgKzU4NCw3IEBAIG9z Zl9vcGVuX3N5bWJvbF9maWxlX29iamVjdCAodm9pZCAqZnJvbV8KICAgaW50 IGZvdW5kOwogCiAgIGlmIChzeW1maWxlX29iamZpbGUpCi0gICAgaWYgKCFx dWVyeSAoIkF0dGVtcHQgdG8gcmVsb2FkIHN5bWJvbHMgZnJvbSBwcm9jZXNz PyAiKSkKKyAgICBpZiAoIXF1ZXJ5IChfKCJBdHRlbXB0IHRvIHJlbG9hZCBz eW1ib2xzIGZyb20gcHJvY2Vzcz8gIikpKQogICAgICAgcmV0dXJuIDA7CiAK ICAgLyogVGhlIGZpcnN0IG1vZHVsZSBhZnRlciAvc2Jpbi9sb2FkZXIgaXMg dGhlIG1haW4gcHJvZ3JhbS4gICovCi0tLSBhL3NvbGliLXBhNjQuYworKysg Yi9zb2xpYi1wYTY0LmMKQEAgLTUyOSw3ICs1MjksNyBAQCBwYTY0X29wZW5f c3ltYm9sX2ZpbGVfb2JqZWN0ICh2b2lkICpmcm9tCiAgIGNoYXIgKmRsbF9w YXRoOwogCiAgIGlmIChzeW1maWxlX29iamZpbGUpCi0gICAgaWYgKCFxdWVy eSAoIkF0dGVtcHQgdG8gcmVsb2FkIHN5bWJvbHMgZnJvbSBwcm9jZXNzPyAi KSkKKyAgICBpZiAoIXF1ZXJ5IChfKCJBdHRlbXB0IHRvIHJlbG9hZCBzeW1i b2xzIGZyb20gcHJvY2Vzcz8gIikpKQogICAgICAgcmV0dXJuIDA7CiAKICAg LyogUmVhZCBpbiB0aGUgbG9hZCBtYXAgcG9pbnRlciBpZiB3ZSBoYXZlIG5v dCBkb25lIHNvIGFscmVhZHkuICAqLwotLS0gYS9zb2xpYi1zb20uYworKysg Yi9zb2xpYi1zb20uYwpAQCAtNjk2LDcgKzY5Niw3IEBAIHNvbV9vcGVuX3N5 bWJvbF9maWxlX29iamVjdCAodm9pZCAqZnJvbV8KICAgY2hhciBidWZbNF07 CiAKICAgaWYgKHN5bWZpbGVfb2JqZmlsZSkKLSAgICBpZiAoIXF1ZXJ5ICgi QXR0ZW1wdCB0byByZWxvYWQgc3ltYm9scyBmcm9tIHByb2Nlc3M/ICIpKQor ICAgIGlmICghcXVlcnkgKF8oIkF0dGVtcHQgdG8gcmVsb2FkIHN5bWJvbHMg ZnJvbSBwcm9jZXNzPyAiKSkpCiAgICAgICByZXR1cm4gMDsKIAogICAvKiBG aXJzdCBsaW5rIG1hcCBtZW1iZXIgc2hvdWxkIGJlIHRoZSBleGVjdXRhYmxl LiAgKi8KLS0tIGEvc29saWItc3ZyNC5jCisrKyBiL3NvbGliLXN2cjQuYwpA QCAtODQ1LDcgKzg0NSw3IEBAIG9wZW5fc3ltYm9sX2ZpbGVfb2JqZWN0ICh2 b2lkICpmcm9tX3R0eXAKICAgc3RydWN0IGNsZWFudXAgKmNsZWFudXBzID0g bWFrZV9jbGVhbnVwICh4ZnJlZSwgbF9uYW1lX2J1Zik7CiAKICAgaWYgKHN5 bWZpbGVfb2JqZmlsZSkKLSAgICBpZiAoIXF1ZXJ5ICgiQXR0ZW1wdCB0byBy ZWxvYWQgc3ltYm9scyBmcm9tIHByb2Nlc3M/ICIpKQorICAgIGlmICghcXVl cnkgKF8oIkF0dGVtcHQgdG8gcmVsb2FkIHN5bWJvbHMgZnJvbSBwcm9jZXNz PyAiKSkpCiAgICAgICByZXR1cm4gMDsKIAogICAvKiBBbHdheXMgbG9jYXRl IHRoZSBkZWJ1ZyBzdHJ1Y3QsIGluIGNhc2UgaXQgaGFzIG1vdmVkLiAgKi8K LS0tIGEvc3ltZmlsZS5jCisrKyBiL3N5bWZpbGUuYwpAQCAtOTY4LDcgKzk2 OCw3IEBAIHN5bWJvbF9maWxlX2FkZF93aXRoX2FkZHJzX29yX29mZnNldHMg KGIKICAgaWYgKChoYXZlX2Z1bGxfc3ltYm9scyAoKSB8fCBoYXZlX3BhcnRp YWxfc3ltYm9scyAoKSkKICAgICAgICYmIG1haW5saW5lCiAgICAgICAmJiBm cm9tX3R0eQotICAgICAgJiYgIXF1ZXJ5ICgiTG9hZCBuZXcgc3ltYm9sIHRh YmxlIGZyb20gXCIlc1wiPyAiLCBuYW1lKSkKKyAgICAgICYmICFxdWVyeSAo XygiTG9hZCBuZXcgc3ltYm9sIHRhYmxlIGZyb20gXCIlc1wiPyAiKSwgbmFt ZSkpCiAgICAgZXJyb3IgKF8oIk5vdCBjb25maXJtZWQuIikpOwogCiAgIG9i amZpbGUgPSBhbGxvY2F0ZV9vYmpmaWxlIChhYmZkLCBmbGFncyk7CkBAIC0y MjIyLDcgKzIyMjIsNyBAQCBhZGRfc3ltYm9sX2ZpbGVfY29tbWFuZCAoY2hh ciAqYXJncywgaW50CiAJIHNvIHdlIGNhbid0IGRldGVybWluZSB3aGF0IHNl Y3Rpb24gbmFtZXMgYXJlIHZhbGlkLiAgKi8KICAgICB9CiAKLSAgaWYgKGZy b21fdHR5ICYmICghcXVlcnkgKCIlcyIsICIiKSkpCisgIGlmIChmcm9tX3R0 eSAmJiAoIXF1ZXJ5IChfKCIlcyIpLCAiIikpKQogICAgIGVycm9yIChfKCJO b3QgY29uZmlybWVkLiIpKTsKIAogICBzeW1ib2xfZmlsZV9hZGQgKGZpbGVu YW1lLCBmcm9tX3R0eSwgc2VjdGlvbl9hZGRycywgMCwgZmxhZ3MpOwotLS0g YS90YXJnZXQuYworKysgYi90YXJnZXQuYwpAQCAtMzQxLDcgKzM0MSw3IEBA IGtpbGxfb3JfYmVfa2lsbGVkIChpbnQgZnJvbV90dHkpCiAgICAgewogICAg ICAgcHJpbnRmX3VuZmlsdGVyZWQgKF8oIllvdSBhcmUgYWxyZWFkeSBydW5u aW5nIGEgcHJvZ3JhbTpcbiIpKTsKICAgICAgIHRhcmdldF9maWxlc19pbmZv ICgpOwotICAgICAgaWYgKHF1ZXJ5ICgiS2lsbCBpdD8gIikpCisgICAgICBp ZiAocXVlcnkgKF8oIktpbGwgaXQ/ICIpKSkKIAl7CiAJICB0YXJnZXRfa2ls bCAoKTsKIAkgIGlmICh0YXJnZXRfaGFzX2V4ZWN1dGlvbikKLS0tIGEvdG9w LmMKKysrIGIvdG9wLmMKQEAgLTExODMsMTEgKzExODMsMTEgQEAgcXVpdF9j b25maXJtICh2b2lkKQogICAgICAgICAgc2VlIGlmIGEgR1VJIGlzIHJ1bm5p bmcuICBUaGUgYHVzZV93aW5kb3dzJyB2YXJpYWJsZSBkb2Vzbid0CiAgICAg ICAgICBjdXQgaXQuICAqLwogICAgICAgaWYgKGRlcHJlY2F0ZWRfaW5pdF91 aV9ob29rKQotCXMgPSAiQSBkZWJ1Z2dpbmcgc2Vzc2lvbiBpcyBhY3RpdmUu XG5EbyB5b3Ugc3RpbGwgd2FudCB0byBjbG9zZSB0aGUgZGVidWdnZXI/IjsK KwlzID0gXygiQSBkZWJ1Z2dpbmcgc2Vzc2lvbiBpcyBhY3RpdmUuXG5EbyB5 b3Ugc3RpbGwgd2FudCB0byBjbG9zZSB0aGUgZGVidWdnZXI/Iik7CiAgICAg ICBlbHNlIGlmIChpbmYtPmF0dGFjaF9mbGFnKQotCXMgPSAiVGhlIHByb2dy YW0gaXMgcnVubmluZy4gIFF1aXQgYW55d2F5IChhbmQgZGV0YWNoIGl0KT8g IjsKKwlzID0gXygiVGhlIHByb2dyYW0gaXMgcnVubmluZy4gIFF1aXQgYW55 d2F5IChhbmQgZGV0YWNoIGl0KT8gIik7CiAgICAgICBlbHNlCi0JcyA9ICJU aGUgcHJvZ3JhbSBpcyBydW5uaW5nLiAgUXVpdCBhbnl3YXkgKGFuZCBraWxs IGl0KT8gIjsKKwlzID0gXygiVGhlIHByb2dyYW0gaXMgcnVubmluZy4gIFF1 aXQgYW55d2F5IChhbmQga2lsbCBpdCk/ICIpOwogCiAgICAgICBpZiAoIXF1 ZXJ5ICgiJXMiLCBzKSkKIAlyZXR1cm4gMDsKLS0tIGEvdHJhY2Vwb2ludC5j CisrKyBiL3RyYWNlcG9pbnQuYwpAQCAtNjkyLDcgKzY5Miw3IEBAIGRlbGV0 ZV90cmFjZV9jb21tYW5kIChjaGFyICphcmdzLCBpbnQgZnIKICAgICBpZiAo ZnJvbV90dHkpCQkvKiBjb25maXJtIG9ubHkgaWYgZnJvbV90dHkuLi4gICov CiAgICAgICBpZiAodHJhY2Vwb2ludF9jaGFpbikJLyogYW5kIGlmIHRoZXJl IGFyZSB0cmFjZXBvaW50cyB0bwogCQkJCSAgIGRlbGV0ZSEgICovCi0JaWYg KCFxdWVyeSAoIkRlbGV0ZSBhbGwgdHJhY2Vwb2ludHM/ICIpKQorCWlmICgh cXVlcnkgKF8oIkRlbGV0ZSBhbGwgdHJhY2Vwb2ludHM/ICIpKSkKIAkgIHJl dHVybjsKIAogICBtYXBfYXJnc19vdmVyX3RyYWNlcG9pbnRzIChhcmdzLCBm cm9tX3R0eSwgZGVsZXRlX29wKTsK --0016e652d056b884040463a4d1eb--