17505 2008-02-23 22:14:30 -0800 Add support for getting command line arguments in testkjs 2008-02-24 17:46:11 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 sam webkit-unassigned ggaren oldest_to_newest 71675 0 sam 2008-02-23 22:14:30 -0800 The SpiderMonkey js shell supports passing command line arguments to the scripts being executed by way of a global 'arguments' variable. 71676 1 19310 sam 2008-02-23 22:23:09 -0800 Created attachment 19310 work in progress 71791 2 19328 sam 2008-02-24 14:59:58 -0800 Created attachment 19328 patch 71795 3 bfulgham 2008-02-24 16:18:23 -0800 This definitely works well, and allowed generation of performance data for http://shootout.alioth.debian.org 71796 4 19328 oliver 2008-02-24 16:46:56 -0800 Comment on attachment 19328 patch r=me, provided you ensure run-javscriptcore-tests and run-sunspider still work correctly 71797 5 19330 sam 2008-02-24 17:24:09 -0800 Created attachment 19330 updated patch 71798 6 19331 sam 2008-02-24 17:25:56 -0800 Created attachment 19331 updated without build issues 71802 7 19331 mrowe 2008-02-24 17:37:34 -0800 Comment on attachment 19331 updated without build issues r=me 71803 8 sam 2008-02-24 17:37:54 -0800 Landed in r30553. 19310 2008-02-23 22:23:09 -0800 2008-02-24 14:59:58 -0800 work in progress argumentsSupport.diff text/plain 3139 sam SW5kZXg6IEphdmFTY3JpcHRDb3JlL2tqcy90ZXN0a2pzLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZh U2NyaXB0Q29yZS9ranMvdGVzdGtqcy5jcHAJKHJldmlzaW9uIDMwNTM1KQorKysgSmF2YVNjcmlw dENvcmUva2pzL3Rlc3RranMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw2ICsyNiw3IEBACiAj aW5jbHVkZSAiSlNHbG9iYWxPYmplY3QuaCIKICNpbmNsdWRlICJKU0xvY2suaCIKICNpbmNsdWRl ICJQYXJzZXIuaCIKKyNpbmNsdWRlICJhcnJheV9vYmplY3QuaCIKICNpbmNsdWRlICJjb2xsZWN0 b3IuaCIKICNpbmNsdWRlICJpbnRlcnByZXRlci5oIgogI2luY2x1ZGUgIm5vZGVzLmgiCkBAIC0y MjIsNyArMjIzLDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQogICAgIHJldHVy biByZXM7CiB9CiAKLXN0YXRpYyBHbG9iYWxJbXAqIGNyZWF0ZUdsb2JhbE9iamVjdCgpCitzdGF0 aWMgR2xvYmFsSW1wKiBjcmVhdGVHbG9iYWxPYmplY3QoVmVjdG9yPFVTdHJpbmc+JiBhcmd1bWVu dHMpCiB7CiAgIEdsb2JhbEltcCogZ2xvYmFsID0gbmV3IEdsb2JhbEltcDsKIApAQCAtMjM5LDYg KzI0MCwxMSBAQCBzdGF0aWMgR2xvYmFsSW1wKiBjcmVhdGVHbG9iYWxPYmplY3QoKQogICBnbG9i YWwtPnB1dChnbG9iYWwtPmdsb2JhbEV4ZWMoKSwgInJ1biIsIG5ldyBUZXN0RnVuY3Rpb25JbXAo VGVzdEZ1bmN0aW9uSW1wOjpSdW4sIDEpKTsKICAgZ2xvYmFsLT5wdXQoZ2xvYmFsLT5nbG9iYWxF eGVjKCksICJsb2FkIiwgbmV3IFRlc3RGdW5jdGlvbkltcChUZXN0RnVuY3Rpb25JbXA6OkxvYWQs IDEpKTsKIAorICBKU09iamVjdCogYXJyYXkgPSBnbG9iYWwtPmFycmF5Q29uc3RydWN0b3IoKS0+ Y29uc3RydWN0KGdsb2JhbC0+Z2xvYmFsRXhlYygpLCBnbG9iYWwtPmdsb2JhbEV4ZWMoKS0+ZW1w dHlMaXN0KCkpOworICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGFyZ3VtZW50cy5zaXplKCk7ICsr aSkKKyAgICBhcnJheS0+cHV0KGdsb2JhbC0+Z2xvYmFsRXhlYygpLCBpLCBqc1N0cmluZyhhcmd1 bWVudHNbaV0pKTsKKyAgZ2xvYmFsLT5wdXQoZ2xvYmFsLT5nbG9iYWxFeGVjKCksICJhcmd1bWVu dHMiLCBhcnJheSk7CisKICAgSW50ZXJwcmV0ZXI6OnNldFNob3VsZFByaW50RXhjZXB0aW9ucyh0 cnVlKTsKICAgcmV0dXJuIGdsb2JhbDsKIH0KQEAgLTI1OCw5ICsyNjQsOSBAQCBzdGF0aWMgYm9v bCBwcmV0dHlQcmludFNjcmlwdChjb25zdCBVU3RyCiAgIHJldHVybiB0cnVlOwogfQogCi1zdGF0 aWMgYm9vbCBydW5XaXRoU2NyaXB0cyhjb25zdCBWZWN0b3I8VVN0cmluZz4mIGZpbGVOYW1lcywg Ym9vbCBwcmV0dHlQcmludCkKK3N0YXRpYyBib29sIHJ1bldpdGhTY3JpcHRzKGNvbnN0IFZlY3Rv cjxVU3RyaW5nPiYgZmlsZU5hbWVzLCBWZWN0b3I8VVN0cmluZz4mIGFyZ3VtZW50cywgYm9vbCBw cmV0dHlQcmludCkKIHsKLSAgR2xvYmFsSW1wKiBnbG9iYWxPYmplY3QgPSBjcmVhdGVHbG9iYWxP YmplY3QoKTsKKyAgR2xvYmFsSW1wKiBnbG9iYWxPYmplY3QgPSBjcmVhdGVHbG9iYWxPYmplY3Qo YXJndW1lbnRzKTsKICAgVmVjdG9yPGNoYXI+IHNjcmlwdDsKICAgCiAgIGJvb2wgc3VjY2VzcyA9 IHRydWU7CkBAIC0yODEsMjIgKzI4NywyNSBAQCBzdGF0aWMgYm9vbCBydW5XaXRoU2NyaXB0cyhj b25zdCBWZWN0b3I8CiAgIHJldHVybiBzdWNjZXNzOwogfQogCi1zdGF0aWMgdm9pZCBwYXJzZUFy Z3VtZW50cyhpbnQgYXJnYywgY2hhcioqIGFyZ3YsIFZlY3RvcjxVU3RyaW5nPiYgZmlsZU5hbWVz LCBib29sJiBwcmV0dHlQcmludCkKK3N0YXRpYyB2b2lkIHBhcnNlQXJndW1lbnRzKGludCBhcmdj LCBjaGFyKiogYXJndiwgVmVjdG9yPFVTdHJpbmc+JiBmaWxlTmFtZXMsIFZlY3RvcjxVU3RyaW5n PiYgYXJndW1lbnRzLCBib29sJiBwcmV0dHlQcmludCkKIHsKLSAgaWYgKGFyZ2MgPCAyKSB7Ci0g ICAgZnByaW50ZihzdGRlcnIsICJVc2FnZTogdGVzdGtqcyBmaWxlMSBbZmlsZTIuLi5dXG4iKTsK KyAgaWYgKGFyZ2MgPCAzKSB7CisgICAgZnByaW50ZihzdGRlcnIsICJVc2FnZTogdGVzdGtqcyAt ZiBmaWxlMSBbLWYgZmlsZTIuLi5dWy1wXVthcmd1bWVudHMuLi5dXG4iKTsKICAgICBleGl0KC0x KTsKICAgfQotICAKKwogICBmb3IgKGludCBpID0gMTsgaSA8IGFyZ2M7IGkrKykgewotICAgIGNv bnN0IGNoYXIqIGZpbGVOYW1lID0gYXJndltpXTsKLSAgICBpZiAoc3RyY21wKGZpbGVOYW1lLCAi LWYiKSA9PSAwKSAvLyBtb3ppbGxhIHRlc3QgZHJpdmVyIHNjcmlwdCB1c2VzICItZiIgcHJlZml4 IGZvciBmaWxlcworICAgIGNvbnN0IGNoYXIqIGFyZyA9IGFyZ3ZbaV07CisgICAgaWYgKHN0cmNt cChhcmcsICItZiIpID09IDApIHsKKyAgICAgIGlmICgrK2kgPCBhcmdjKQorICAgICAgICBmaWxl TmFtZXMuYXBwZW5kKGFyZ3ZbaV0pOwogICAgICAgY29udGludWU7Ci0gICAgaWYgKHN0cmNtcChm aWxlTmFtZSwgIi1wIikgPT0gMCkgeworICAgIH0KKyAgICBpZiAoc3RyY21wKGFyZywgIi1wIikg PT0gMCkgewogICAgICAgcHJldHR5UHJpbnQgPSB0cnVlOwogICAgICAgY29udGludWU7CiAgICAg fQotICAgIGZpbGVOYW1lcy5hcHBlbmQoZmlsZU5hbWUpOworICAgIGFyZ3VtZW50cy5hcHBlbmQo YXJnKTsKICAgfQogfQogCkBAIC0zMDYsOSArMzE1LDEwIEBAIGludCBranNtYWluKGludCBhcmdj LCBjaGFyKiogYXJndikKICAgCiAgIGJvb2wgcHJldHR5UHJpbnQgPSBmYWxzZTsKICAgVmVjdG9y PFVTdHJpbmc+IGZpbGVOYW1lczsKLSAgcGFyc2VBcmd1bWVudHMoYXJnYywgYXJndiwgZmlsZU5h bWVzLCBwcmV0dHlQcmludCk7CisgIFZlY3RvcjxVU3RyaW5nPiBhcmd1bW5ldHM7CisgIHBhcnNl QXJndW1lbnRzKGFyZ2MsIGFyZ3YsIGZpbGVOYW1lcywgYXJndW1uZXRzLCBwcmV0dHlQcmludCk7 CiAgIAotICBib29sIHN1Y2Nlc3MgPSBydW5XaXRoU2NyaXB0cyhmaWxlTmFtZXMsIHByZXR0eVBy aW50KTsKKyAgYm9vbCBzdWNjZXNzID0gcnVuV2l0aFNjcmlwdHMoZmlsZU5hbWVzLCBhcmd1bW5l dHMsIHByZXR0eVByaW50KTsKIAogI2lmbmRlZiBOREVCVUcKICAgQ29sbGVjdG9yOjpjb2xsZWN0 KCk7Cg== 19328 2008-02-24 14:59:58 -0800 2008-02-24 17:24:09 -0800 patch arguments.diff text/plain 4284 sam SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDMwNTUxKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMDgtMDItMjQgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzUw NQorICAgICAgICBBZGQgc3VwcG9ydCBmb3IgZ2V0dGluZyBjb21tYW5kIGxpbmUgYXJndW1lbnRz IGluIHRlc3RranMKKworICAgICAgICAtIFRoaXMgc2xpZ2h0bHkgY2hhbmdlcyB0aGUgYmVoYXZp b3Igb2YgcGFyc2luZyBhcmd1bWVudHMgYnkgcmVxdWlyaW5nCisgICAgICAgICAgYSAnLWYnIGJl Zm9yZSBhbGwgZmlsZXMuIAorCisgICAgICAgICoga2pzL3Rlc3RranMuY3BwOgorICAgICAgICAo Y3JlYXRlR2xvYmFsT2JqZWN0KTogQWRkIGEgZ2xvYmFsIHByb3BlcnR5IGNhbGxlZCAnYXJndW1l bnRzJyB3aGljaAorICAgICAgICBjb250YWlucyBhbiBhcnJheSB3aXRoIHRoZSBwYXJzZWQgYXJn dW1lbnRzIGFzIHN0cmluZ3MuCisgICAgICAgIChydW5XaXRoU2NyaXB0cyk6IFBhc3MgaW4gdGhl IGFyZ3VtZW50cyB2ZWN0b3Igc28gdGhhdCBpdCBjYW4gYmUgcGFzc2VkCisgICAgICAgIHRvIHRo ZSBnbG9iYWwgb2JqZWN0LgorICAgICAgICAocGFyc2VBcmd1bWVudHMpOiBDaGFuZ2UgcGFyc2lu ZyBydWxlcyB0byByZXF1aXJlIGEgJy1mJyBiZWZvcmUgYW55IHNjcmlwdAorICAgICAgICBmaWxl LiAgQWxsIGFyZ3VtZW50cyB0aGF0IGFyZSBub3QgcHJlY2VkZWQgYnkgYSAnLWYnIGFuZCBhcmUg bm90ICctcCcgYXJlIAorICAgICAgICBhZGRlZCB0byB0aGUgbmV3IGFyZ3VtZW50cyBhcnJheS4K KyAgICAgICAgKGtqc21haW4pOgorCiAyMDA4LTAyLTI0ICBEYW4gQmVybnN0ZWluICA8bWl0ekBh cHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBKYXZh U2NyaXB0Q29yZS9ranMvdGVzdGtqcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUv a2pzL3Rlc3RranMuY3BwCShyZXZpc2lvbiAzMDU0OCkKKysrIEphdmFTY3JpcHRDb3JlL2tqcy90 ZXN0a2pzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYsNiArMjYsNyBAQAogI2luY2x1ZGUgIkpT R2xvYmFsT2JqZWN0LmgiCiAjaW5jbHVkZSAiSlNMb2NrLmgiCiAjaW5jbHVkZSAiUGFyc2VyLmgi CisjaW5jbHVkZSAiYXJyYXlfb2JqZWN0LmgiCiAjaW5jbHVkZSAiY29sbGVjdG9yLmgiCiAjaW5j bHVkZSAiaW50ZXJwcmV0ZXIuaCIKICNpbmNsdWRlICJub2Rlcy5oIgpAQCAtMjIyLDcgKzIyMyw3 IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiogYXJndikKICAgICByZXR1cm4gcmVzOwogfQog Ci1zdGF0aWMgR2xvYmFsSW1wKiBjcmVhdGVHbG9iYWxPYmplY3QoKQorc3RhdGljIEdsb2JhbElt cCogY3JlYXRlR2xvYmFsT2JqZWN0KFZlY3RvcjxVU3RyaW5nPiYgYXJndW1lbnRzKQogewogICBH bG9iYWxJbXAqIGdsb2JhbCA9IG5ldyBHbG9iYWxJbXA7CiAKQEAgLTIzOSw2ICsyNDAsMTEgQEAg c3RhdGljIEdsb2JhbEltcCogY3JlYXRlR2xvYmFsT2JqZWN0KCkKICAgZ2xvYmFsLT5wdXQoZ2xv YmFsLT5nbG9iYWxFeGVjKCksICJydW4iLCBuZXcgVGVzdEZ1bmN0aW9uSW1wKFRlc3RGdW5jdGlv bkltcDo6UnVuLCAxKSk7CiAgIGdsb2JhbC0+cHV0KGdsb2JhbC0+Z2xvYmFsRXhlYygpLCAibG9h ZCIsIG5ldyBUZXN0RnVuY3Rpb25JbXAoVGVzdEZ1bmN0aW9uSW1wOjpMb2FkLCAxKSk7CiAKKyAg SlNPYmplY3QqIGFycmF5ID0gZ2xvYmFsLT5hcnJheUNvbnN0cnVjdG9yKCktPmNvbnN0cnVjdChn bG9iYWwtPmdsb2JhbEV4ZWMoKSwgZ2xvYmFsLT5nbG9iYWxFeGVjKCktPmVtcHR5TGlzdCgpKTsK KyAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBhcmd1bWVudHMuc2l6ZSgpOyArK2kpCisgICAgYXJy YXktPnB1dChnbG9iYWwtPmdsb2JhbEV4ZWMoKSwgaSwganNTdHJpbmcoYXJndW1lbnRzW2ldKSk7 CisgIGdsb2JhbC0+cHV0KGdsb2JhbC0+Z2xvYmFsRXhlYygpLCAiYXJndW1lbnRzIiwgYXJyYXkp OworCiAgIEludGVycHJldGVyOjpzZXRTaG91bGRQcmludEV4Y2VwdGlvbnModHJ1ZSk7CiAgIHJl dHVybiBnbG9iYWw7CiB9CkBAIC0yNTgsOSArMjY0LDkgQEAgc3RhdGljIGJvb2wgcHJldHR5UHJp bnRTY3JpcHQoY29uc3QgVVN0cgogICByZXR1cm4gdHJ1ZTsKIH0KIAotc3RhdGljIGJvb2wgcnVu V2l0aFNjcmlwdHMoY29uc3QgVmVjdG9yPFVTdHJpbmc+JiBmaWxlTmFtZXMsIGJvb2wgcHJldHR5 UHJpbnQpCitzdGF0aWMgYm9vbCBydW5XaXRoU2NyaXB0cyhjb25zdCBWZWN0b3I8VVN0cmluZz4m IGZpbGVOYW1lcywgVmVjdG9yPFVTdHJpbmc+JiBhcmd1bWVudHMsIGJvb2wgcHJldHR5UHJpbnQp CiB7Ci0gIEdsb2JhbEltcCogZ2xvYmFsT2JqZWN0ID0gY3JlYXRlR2xvYmFsT2JqZWN0KCk7Cisg IEdsb2JhbEltcCogZ2xvYmFsT2JqZWN0ID0gY3JlYXRlR2xvYmFsT2JqZWN0KGFyZ3VtZW50cyk7 CiAgIFZlY3RvcjxjaGFyPiBzY3JpcHQ7CiAgIAogICBib29sIHN1Y2Nlc3MgPSB0cnVlOwpAQCAt MjgxLDIyICsyODcsMjYgQEAgc3RhdGljIGJvb2wgcnVuV2l0aFNjcmlwdHMoY29uc3QgVmVjdG9y PAogICByZXR1cm4gc3VjY2VzczsKIH0KIAotc3RhdGljIHZvaWQgcGFyc2VBcmd1bWVudHMoaW50 IGFyZ2MsIGNoYXIqKiBhcmd2LCBWZWN0b3I8VVN0cmluZz4mIGZpbGVOYW1lcywgYm9vbCYgcHJl dHR5UHJpbnQpCitzdGF0aWMgdm9pZCBwYXJzZUFyZ3VtZW50cyhpbnQgYXJnYywgY2hhcioqIGFy Z3YsIFZlY3RvcjxVU3RyaW5nPiYgZmlsZU5hbWVzLCBWZWN0b3I8VVN0cmluZz4mIGFyZ3VtZW50 cywgYm9vbCYgcHJldHR5UHJpbnQpCiB7Ci0gIGlmIChhcmdjIDwgMikgewotICAgIGZwcmludGYo c3RkZXJyLCAiVXNhZ2U6IHRlc3RranMgZmlsZTEgW2ZpbGUyLi4uXVxuIik7CisgIGlmIChhcmdj IDwgMykgeworICAgIGZwcmludGYoc3RkZXJyLCAiVXNhZ2U6IHRlc3RranMgLWYgZmlsZTEgWy1m IGZpbGUyLi4uXVstcF1bYXJndW1lbnRzLi4uXVxuIik7CiAgICAgZXhpdCgtMSk7CiAgIH0KLSAg CisKICAgZm9yIChpbnQgaSA9IDE7IGkgPCBhcmdjOyBpKyspIHsKLSAgICBjb25zdCBjaGFyKiBm aWxlTmFtZSA9IGFyZ3ZbaV07Ci0gICAgaWYgKHN0cmNtcChmaWxlTmFtZSwgIi1mIikgPT0gMCkg Ly8gbW96aWxsYSB0ZXN0IGRyaXZlciBzY3JpcHQgdXNlcyAiLWYiIHByZWZpeCBmb3IgZmlsZXMK KyAgICBjb25zdCBjaGFyKiBhcmcgPSBhcmd2W2ldOworICAgIGlmIChzdHJjbXAoYXJnLCAiLWYi KSA9PSAwKSB7CisgICAgICBpZiAoKytpID09IGFyZ2MpCisgICAgICAgIHJldHVybjsKKyAgICAg IGZpbGVOYW1lcy5hcHBlbmQoYXJndltpXSk7CiAgICAgICBjb250aW51ZTsKLSAgICBpZiAoc3Ry Y21wKGZpbGVOYW1lLCAiLXAiKSA9PSAwKSB7CisgICAgfQorICAgIGlmIChzdHJjbXAoYXJnLCAi LXAiKSA9PSAwKSB7CiAgICAgICBwcmV0dHlQcmludCA9IHRydWU7CiAgICAgICBjb250aW51ZTsK ICAgICB9Ci0gICAgZmlsZU5hbWVzLmFwcGVuZChmaWxlTmFtZSk7CisgICAgYXJndW1lbnRzLmFw cGVuZChhcmcpOwogICB9CiB9CiAKQEAgLTMwNiw5ICszMTYsMTAgQEAgaW50IGtqc21haW4oaW50 IGFyZ2MsIGNoYXIqKiBhcmd2KQogICAKICAgYm9vbCBwcmV0dHlQcmludCA9IGZhbHNlOwogICBW ZWN0b3I8VVN0cmluZz4gZmlsZU5hbWVzOwotICBwYXJzZUFyZ3VtZW50cyhhcmdjLCBhcmd2LCBm aWxlTmFtZXMsIHByZXR0eVByaW50KTsKKyAgVmVjdG9yPFVTdHJpbmc+IGFyZ3VtZW50czsKKyAg cGFyc2VBcmd1bWVudHMoYXJnYywgYXJndiwgZmlsZU5hbWVzLCBhcmd1bWVudHMsIHByZXR0eVBy aW50KTsKICAgCi0gIGJvb2wgc3VjY2VzcyA9IHJ1bldpdGhTY3JpcHRzKGZpbGVOYW1lcywgcHJl dHR5UHJpbnQpOworICBib29sIHN1Y2Nlc3MgPSBydW5XaXRoU2NyaXB0cyhmaWxlTmFtZXMsIGFy Z3VtZW50cywgcHJldHR5UHJpbnQpOwogCiAjaWZuZGVmIE5ERUJVRwogICBDb2xsZWN0b3I6OmNv bGxlY3QoKTsK 19330 2008-02-24 17:24:09 -0800 2008-02-24 17:25:56 -0800 updated patch arguments2.diff text/plain 4703 sam SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDMwNTUx KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMDgtMDIt MjQgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzUwNQorICAgICAgICBBZGQgc3VwcG9ydCBmb3IgZ2V0dGluZyBjb21tYW5kIGxp bmUgYXJndW1lbnRzIGluIHRlc3RranMKKworICAgICAgICAtIFRoaXMgc2xpZ2h0bHkgY2hhbmdl cyB0aGUgYmVoYXZpb3Igb2YgcGFyc2luZyBhcmd1bWVudHMgYnkgcmVxdWlyaW5nCisgICAgICAg ICAgYSAnLWYnIGJlZm9yZSBhbGwgZmlsZXMuIAorCisgICAgICAgICoga2pzL3Rlc3RranMuY3Bw OgorICAgICAgICAoY3JlYXRlR2xvYmFsT2JqZWN0KTogQWRkIGEgZ2xvYmFsIHByb3BlcnR5IGNh bGxlZCAnYXJndW1lbnRzJyB3aGljaAorICAgICAgICBjb250YWlucyBhbiBhcnJheSB3aXRoIHRo ZSBwYXJzZWQgYXJndW1lbnRzIGFzIHN0cmluZ3MuCisgICAgICAgIChydW5XaXRoU2NyaXB0cyk6 IFBhc3MgaW4gdGhlIGFyZ3VtZW50cyB2ZWN0b3Igc28gdGhhdCBpdCBjYW4gYmUgcGFzc2VkCisg ICAgICAgIHRvIHRoZSBnbG9iYWwgb2JqZWN0LgorICAgICAgICAocGFyc2VBcmd1bWVudHMpOiBD aGFuZ2UgcGFyc2luZyBydWxlcyB0byByZXF1aXJlIGEgJy1mJyBiZWZvcmUgYW55IHNjcmlwdAor ICAgICAgICBmaWxlLiBBZnRlciBhbGwgJy1mJyBhbmQgJy1wJyBhcmd1bWVudHMgaGF2ZSBiZWVu IHBhcnNlZCwgdGhlIHJlbWFpbmluZworICAgICAgICBhcmUgYWRkZWQgdG8gdGhlIGFyZ3VtZW50 cyB2ZWN0b3IgYW5kIGV4cG9zZWQgdG8gdGhlIHNjcmlwdC4gSWYgdGhlcmUgaXMgYQorICAgICAg ICBjaGFuY2Ugb2YgYW1iaWd1aXR5ICh0aGUgdXNlciB3YW50cyB0byBwYXNzIHRoZSBzdHJpbmcg Jy1mJyB0byB0aGUgc2NyaXB0KSwKKyAgICAgICAgdGhlIHN0cmluZyAnLS0nIGNhbiBiZSB1c2Vk IHNlcGFyYXRlIHRoZSBvcHRpb25zIGZyb20gdGhlIHBhc3MgdGhyb3VnaCAKKyAgICAgICAgYXJn dW1lbnRzLgorICAgICAgICAoa2pzbWFpbik6CisKIDIwMDgtMDItMjQgIERhbiBCZXJuc3RlaW4g IDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5k ZXg6IGtqcy90ZXN0a2pzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBranMvdGVzdGtqcy5jcHAJKHJldmlz aW9uIDMwNTQ4KQorKysga2pzL3Rlc3RranMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw2ICsy Niw3IEBACiAjaW5jbHVkZSAiSlNHbG9iYWxPYmplY3QuaCIKICNpbmNsdWRlICJKU0xvY2suaCIK ICNpbmNsdWRlICJQYXJzZXIuaCIKKyNpbmNsdWRlICJhcnJheV9vYmplY3QuaCIKICNpbmNsdWRl ICJjb2xsZWN0b3IuaCIKICNpbmNsdWRlICJpbnRlcnByZXRlci5oIgogI2luY2x1ZGUgIm5vZGVz LmgiCkBAIC0yMjIsNyArMjIzLDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQog ICAgIHJldHVybiByZXM7CiB9CiAKLXN0YXRpYyBHbG9iYWxJbXAqIGNyZWF0ZUdsb2JhbE9iamVj dCgpCitzdGF0aWMgR2xvYmFsSW1wKiBjcmVhdGVHbG9iYWxPYmplY3QoVmVjdG9yPFVTdHJpbmc+ JiBhcmd1bWVudHMpCiB7CiAgIEdsb2JhbEltcCogZ2xvYmFsID0gbmV3IEdsb2JhbEltcDsKIApA QCAtMjM5LDYgKzI0MCwxMSBAQCBzdGF0aWMgR2xvYmFsSW1wKiBjcmVhdGVHbG9iYWxPYmplY3Qo KQogICBnbG9iYWwtPnB1dChnbG9iYWwtPmdsb2JhbEV4ZWMoKSwgInJ1biIsIG5ldyBUZXN0RnVu Y3Rpb25JbXAoVGVzdEZ1bmN0aW9uSW1wOjpSdW4sIDEpKTsKICAgZ2xvYmFsLT5wdXQoZ2xvYmFs LT5nbG9iYWxFeGVjKCksICJsb2FkIiwgbmV3IFRlc3RGdW5jdGlvbkltcChUZXN0RnVuY3Rpb25J bXA6OkxvYWQsIDEpKTsKIAorICBKU09iamVjdCogYXJyYXkgPSBnbG9iYWwtPmFycmF5Q29uc3Ry dWN0b3IoKS0+Y29uc3RydWN0KGdsb2JhbC0+Z2xvYmFsRXhlYygpLCBnbG9iYWwtPmdsb2JhbEV4 ZWMoKS0+ZW1wdHlMaXN0KCkpOworICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGFyZ3VtZW50cy5z aXplKCk7ICsraSkKKyAgICBhcnJheS0+cHV0KGdsb2JhbC0+Z2xvYmFsRXhlYygpLCBpLCBqc1N0 cmluZyhhcmd1bWVudHNbaV0pKTsKKyAgZ2xvYmFsLT5wdXQoZ2xvYmFsLT5nbG9iYWxFeGVjKCks ICJhcmd1bWVudHMiLCBhcnJheSk7CisKICAgSW50ZXJwcmV0ZXI6OnNldFNob3VsZFByaW50RXhj ZXB0aW9ucyh0cnVlKTsKICAgcmV0dXJuIGdsb2JhbDsKIH0KQEAgLTI1OCw5ICsyNjQsOSBAQCBz dGF0aWMgYm9vbCBwcmV0dHlQcmludFNjcmlwdChjb25zdCBVU3RyCiAgIHJldHVybiB0cnVlOwog fQogCi1zdGF0aWMgYm9vbCBydW5XaXRoU2NyaXB0cyhjb25zdCBWZWN0b3I8VVN0cmluZz4mIGZp bGVOYW1lcywgYm9vbCBwcmV0dHlQcmludCkKK3N0YXRpYyBib29sIHJ1bldpdGhTY3JpcHRzKGNv bnN0IFZlY3RvcjxVU3RyaW5nPiYgZmlsZU5hbWVzLCBWZWN0b3I8VVN0cmluZz4mIGFyZ3VtZW50 cywgYm9vbCBwcmV0dHlQcmludCkKIHsKLSAgR2xvYmFsSW1wKiBnbG9iYWxPYmplY3QgPSBjcmVh dGVHbG9iYWxPYmplY3QoKTsKKyAgR2xvYmFsSW1wKiBnbG9iYWxPYmplY3QgPSBjcmVhdGVHbG9i YWxPYmplY3QoYXJndW1lbnRzKTsKICAgVmVjdG9yPGNoYXI+IHNjcmlwdDsKICAgCiAgIGJvb2wg c3VjY2VzcyA9IHRydWU7CkBAIC0yODEsMjMgKzI4Nyw0MiBAQCBzdGF0aWMgYm9vbCBydW5XaXRo U2NyaXB0cyhjb25zdCBWZWN0b3I8CiAgIHJldHVybiBzdWNjZXNzOwogfQogCi1zdGF0aWMgdm9p ZCBwYXJzZUFyZ3VtZW50cyhpbnQgYXJnYywgY2hhcioqIGFyZ3YsIFZlY3RvcjxVU3RyaW5nPiYg ZmlsZU5hbWVzLCBib29sJiBwcmV0dHlQcmludCkKK3N0YXRpYyB2b2lkIHByaW50VXNhZ2VTdGF0 ZW1lbnQoKQogewotICBpZiAoYXJnYyA8IDIpIHsKLSAgICBmcHJpbnRmKHN0ZGVyciwgIlVzYWdl OiB0ZXN0a2pzIGZpbGUxIFtmaWxlMi4uLl1cbiIpOworICAgIGZwcmludGYoc3RkZXJyLCAiVXNh Z2U6IHRlc3RranMgLWYgZmlsZTEgWy1mIGZpbGUyLi4uXVstcF1bLS0gYXJndW1lbnRzLi4uXVxu Iik7Cit9CisKK3N0YXRpYyB2b2lkIHBhcnNlQXJndW1lbnRzKGludCBhcmdjLCBjaGFyKiogYXJn diwgVmVjdG9yPFVTdHJpbmc+JiBmaWxlTmFtZXMsIFZlY3RvcjxVU3RyaW5nPiYgYXJndW1lbnRz LCBib29sJiBwcmV0dHlQcmludCkKK3sKKyAgaWYgKGFyZ2MgPCAzKSB7CisgICAgcHJpbnRVc2Fn ZVN0YXRlbWVudCgpOwogICAgIGV4aXQoLTEpOwogICB9Ci0gIAotICBmb3IgKGludCBpID0gMTsg aSA8IGFyZ2M7IGkrKykgewotICAgIGNvbnN0IGNoYXIqIGZpbGVOYW1lID0gYXJndltpXTsKLSAg ICBpZiAoc3RyY21wKGZpbGVOYW1lLCAiLWYiKSA9PSAwKSAvLyBtb3ppbGxhIHRlc3QgZHJpdmVy IHNjcmlwdCB1c2VzICItZiIgcHJlZml4IGZvciBmaWxlcworCisgIGludCBpID0gMTsKKyAgZm9y ICg7IGkgPCBhcmdjOyArK2kpIHsKKyAgICBjb25zdCBjaGFyKiBhcmcgPSBhcmd2W2ldOworICAg IGlmIChzdHJjbXAoYXJnLCAiLWYiKSA9PSAwKSB7CisgICAgICBpZiAoKytpID09IGFyZ2MpIHsK KyAgICAgICAgCisgICAgICAgIGV4aXQoLTEpOworICAgICAgfQorICAgICAgZmlsZU5hbWVzLmFw cGVuZChhcmd2W2ldKTsKICAgICAgIGNvbnRpbnVlOwotICAgIGlmIChzdHJjbXAoZmlsZU5hbWUs ICItcCIpID09IDApIHsKKyAgICB9CisgICAgaWYgKHN0cmNtcChhcmcsICItcCIpID09IDApIHsK ICAgICAgIHByZXR0eVByaW50ID0gdHJ1ZTsKICAgICAgIGNvbnRpbnVlOwogICAgIH0KLSAgICBm aWxlTmFtZXMuYXBwZW5kKGZpbGVOYW1lKTsKKyAgICBpZiAoc3RyY21wKGFyZywgIi0tIikgPT0g MCkgeworICAgICAgKytpOworICAgICAgYnJlYWs7CisgICAgfQorICAgIGJyZWFrOwogICB9CisK KyAgZm9yICg7IGkgPCBhcmdjOyArK2kpCisgICAgYXJndW1lbnRzLmFwcGVuZChhcmd2W2ldKTsK IH0KIAogaW50IGtqc21haW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQpAQCAtMzA2LDkgKzMzMSwx MCBAQCBpbnQga2pzbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3YpCiAgIAogICBib29sIHByZXR0 eVByaW50ID0gZmFsc2U7CiAgIFZlY3RvcjxVU3RyaW5nPiBmaWxlTmFtZXM7Ci0gIHBhcnNlQXJn dW1lbnRzKGFyZ2MsIGFyZ3YsIGZpbGVOYW1lcywgcHJldHR5UHJpbnQpOworICBWZWN0b3I8VVN0 cmluZz4gYXJndW1lbnRzOworICBwYXJzZUFyZ3VtZW50cyhhcmdjLCBhcmd2LCBmaWxlTmFtZXMs IGFyZ3VtZW50cywgcHJldHR5UHJpbnQpOwogICAKLSAgYm9vbCBzdWNjZXNzID0gcnVuV2l0aFNj cmlwdHMoZmlsZU5hbWVzLCBwcmV0dHlQcmludCk7CisgIGJvb2wgc3VjY2VzcyA9IHJ1bldpdGhT Y3JpcHRzKGZpbGVOYW1lcywgYXJndW1lbnRzLCBwcmV0dHlQcmludCk7CiAKICNpZm5kZWYgTkRF QlVHCiAgIENvbGxlY3Rvcjo6Y29sbGVjdCgpOwo= 19331 2008-02-24 17:25:56 -0800 2008-02-24 17:37:34 -0800 updated without build issues arguments2.diff text/plain 4693 sam SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDMwNTUx KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMDgtMDIt MjQgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzUwNQorICAgICAgICBBZGQgc3VwcG9ydCBmb3IgZ2V0dGluZyBjb21tYW5kIGxp bmUgYXJndW1lbnRzIGluIHRlc3RranMKKworICAgICAgICAtIFRoaXMgc2xpZ2h0bHkgY2hhbmdl cyB0aGUgYmVoYXZpb3Igb2YgcGFyc2luZyBhcmd1bWVudHMgYnkgcmVxdWlyaW5nCisgICAgICAg ICAgYSAnLWYnIGJlZm9yZSBhbGwgZmlsZXMuIAorCisgICAgICAgICoga2pzL3Rlc3RranMuY3Bw OgorICAgICAgICAoY3JlYXRlR2xvYmFsT2JqZWN0KTogQWRkIGEgZ2xvYmFsIHByb3BlcnR5IGNh bGxlZCAnYXJndW1lbnRzJyB3aGljaAorICAgICAgICBjb250YWlucyBhbiBhcnJheSB3aXRoIHRo ZSBwYXJzZWQgYXJndW1lbnRzIGFzIHN0cmluZ3MuCisgICAgICAgIChydW5XaXRoU2NyaXB0cyk6 IFBhc3MgaW4gdGhlIGFyZ3VtZW50cyB2ZWN0b3Igc28gdGhhdCBpdCBjYW4gYmUgcGFzc2VkCisg ICAgICAgIHRvIHRoZSBnbG9iYWwgb2JqZWN0LgorICAgICAgICAocGFyc2VBcmd1bWVudHMpOiBD aGFuZ2UgcGFyc2luZyBydWxlcyB0byByZXF1aXJlIGEgJy1mJyBiZWZvcmUgYW55IHNjcmlwdAor ICAgICAgICBmaWxlLiBBZnRlciBhbGwgJy1mJyBhbmQgJy1wJyBhcmd1bWVudHMgaGF2ZSBiZWVu IHBhcnNlZCwgdGhlIHJlbWFpbmluZworICAgICAgICBhcmUgYWRkZWQgdG8gdGhlIGFyZ3VtZW50 cyB2ZWN0b3IgYW5kIGV4cG9zZWQgdG8gdGhlIHNjcmlwdC4gSWYgdGhlcmUgaXMgYQorICAgICAg ICBjaGFuY2Ugb2YgYW1iaWd1aXR5ICh0aGUgdXNlciB3YW50cyB0byBwYXNzIHRoZSBzdHJpbmcg Jy1mJyB0byB0aGUgc2NyaXB0KSwKKyAgICAgICAgdGhlIHN0cmluZyAnLS0nIGNhbiBiZSB1c2Vk IHNlcGFyYXRlIHRoZSBvcHRpb25zIGZyb20gdGhlIHBhc3MgdGhyb3VnaCAKKyAgICAgICAgYXJn dW1lbnRzLgorICAgICAgICAoa2pzbWFpbik6CisKIDIwMDgtMDItMjQgIERhbiBCZXJuc3RlaW4g IDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5k ZXg6IGtqcy90ZXN0a2pzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBranMvdGVzdGtqcy5jcHAJKHJldmlz aW9uIDMwNTQ4KQorKysga2pzL3Rlc3RranMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw2ICsy Niw3IEBACiAjaW5jbHVkZSAiSlNHbG9iYWxPYmplY3QuaCIKICNpbmNsdWRlICJKU0xvY2suaCIK ICNpbmNsdWRlICJQYXJzZXIuaCIKKyNpbmNsdWRlICJhcnJheV9vYmplY3QuaCIKICNpbmNsdWRl ICJjb2xsZWN0b3IuaCIKICNpbmNsdWRlICJpbnRlcnByZXRlci5oIgogI2luY2x1ZGUgIm5vZGVz LmgiCkBAIC0yMjIsNyArMjIzLDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQog ICAgIHJldHVybiByZXM7CiB9CiAKLXN0YXRpYyBHbG9iYWxJbXAqIGNyZWF0ZUdsb2JhbE9iamVj dCgpCitzdGF0aWMgR2xvYmFsSW1wKiBjcmVhdGVHbG9iYWxPYmplY3QoVmVjdG9yPFVTdHJpbmc+ JiBhcmd1bWVudHMpCiB7CiAgIEdsb2JhbEltcCogZ2xvYmFsID0gbmV3IEdsb2JhbEltcDsKIApA QCAtMjM5LDYgKzI0MCwxMSBAQCBzdGF0aWMgR2xvYmFsSW1wKiBjcmVhdGVHbG9iYWxPYmplY3Qo KQogICBnbG9iYWwtPnB1dChnbG9iYWwtPmdsb2JhbEV4ZWMoKSwgInJ1biIsIG5ldyBUZXN0RnVu Y3Rpb25JbXAoVGVzdEZ1bmN0aW9uSW1wOjpSdW4sIDEpKTsKICAgZ2xvYmFsLT5wdXQoZ2xvYmFs LT5nbG9iYWxFeGVjKCksICJsb2FkIiwgbmV3IFRlc3RGdW5jdGlvbkltcChUZXN0RnVuY3Rpb25J bXA6OkxvYWQsIDEpKTsKIAorICBKU09iamVjdCogYXJyYXkgPSBnbG9iYWwtPmFycmF5Q29uc3Ry dWN0b3IoKS0+Y29uc3RydWN0KGdsb2JhbC0+Z2xvYmFsRXhlYygpLCBnbG9iYWwtPmdsb2JhbEV4 ZWMoKS0+ZW1wdHlMaXN0KCkpOworICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGFyZ3VtZW50cy5z aXplKCk7ICsraSkKKyAgICBhcnJheS0+cHV0KGdsb2JhbC0+Z2xvYmFsRXhlYygpLCBpLCBqc1N0 cmluZyhhcmd1bWVudHNbaV0pKTsKKyAgZ2xvYmFsLT5wdXQoZ2xvYmFsLT5nbG9iYWxFeGVjKCks ICJhcmd1bWVudHMiLCBhcnJheSk7CisKICAgSW50ZXJwcmV0ZXI6OnNldFNob3VsZFByaW50RXhj ZXB0aW9ucyh0cnVlKTsKICAgcmV0dXJuIGdsb2JhbDsKIH0KQEAgLTI1OCw5ICsyNjQsOSBAQCBz dGF0aWMgYm9vbCBwcmV0dHlQcmludFNjcmlwdChjb25zdCBVU3RyCiAgIHJldHVybiB0cnVlOwog fQogCi1zdGF0aWMgYm9vbCBydW5XaXRoU2NyaXB0cyhjb25zdCBWZWN0b3I8VVN0cmluZz4mIGZp bGVOYW1lcywgYm9vbCBwcmV0dHlQcmludCkKK3N0YXRpYyBib29sIHJ1bldpdGhTY3JpcHRzKGNv bnN0IFZlY3RvcjxVU3RyaW5nPiYgZmlsZU5hbWVzLCBWZWN0b3I8VVN0cmluZz4mIGFyZ3VtZW50 cywgYm9vbCBwcmV0dHlQcmludCkKIHsKLSAgR2xvYmFsSW1wKiBnbG9iYWxPYmplY3QgPSBjcmVh dGVHbG9iYWxPYmplY3QoKTsKKyAgR2xvYmFsSW1wKiBnbG9iYWxPYmplY3QgPSBjcmVhdGVHbG9i YWxPYmplY3QoYXJndW1lbnRzKTsKICAgVmVjdG9yPGNoYXI+IHNjcmlwdDsKICAgCiAgIGJvb2wg c3VjY2VzcyA9IHRydWU7CkBAIC0yODEsMjMgKzI4NywzOSBAQCBzdGF0aWMgYm9vbCBydW5XaXRo U2NyaXB0cyhjb25zdCBWZWN0b3I8CiAgIHJldHVybiBzdWNjZXNzOwogfQogCi1zdGF0aWMgdm9p ZCBwYXJzZUFyZ3VtZW50cyhpbnQgYXJnYywgY2hhcioqIGFyZ3YsIFZlY3RvcjxVU3RyaW5nPiYg ZmlsZU5hbWVzLCBib29sJiBwcmV0dHlQcmludCkKK3N0YXRpYyB2b2lkIHByaW50VXNhZ2VTdGF0 ZW1lbnQoKQogewotICBpZiAoYXJnYyA8IDIpIHsKLSAgICBmcHJpbnRmKHN0ZGVyciwgIlVzYWdl OiB0ZXN0a2pzIGZpbGUxIFtmaWxlMi4uLl1cbiIpOworICAgIGZwcmludGYoc3RkZXJyLCAiVXNh Z2U6IHRlc3RranMgLWYgZmlsZTEgWy1mIGZpbGUyLi4uXVstcF1bLS0gYXJndW1lbnRzLi4uXVxu Iik7CiAgICAgZXhpdCgtMSk7Ci0gIH0KLSAgCi0gIGZvciAoaW50IGkgPSAxOyBpIDwgYXJnYzsg aSsrKSB7Ci0gICAgY29uc3QgY2hhciogZmlsZU5hbWUgPSBhcmd2W2ldOwotICAgIGlmIChzdHJj bXAoZmlsZU5hbWUsICItZiIpID09IDApIC8vIG1vemlsbGEgdGVzdCBkcml2ZXIgc2NyaXB0IHVz ZXMgIi1mIiBwcmVmaXggZm9yIGZpbGVzCit9CisKK3N0YXRpYyB2b2lkIHBhcnNlQXJndW1lbnRz KGludCBhcmdjLCBjaGFyKiogYXJndiwgVmVjdG9yPFVTdHJpbmc+JiBmaWxlTmFtZXMsIFZlY3Rv cjxVU3RyaW5nPiYgYXJndW1lbnRzLCBib29sJiBwcmV0dHlQcmludCkKK3sKKyAgaWYgKGFyZ2Mg PCAzKQorICAgIHByaW50VXNhZ2VTdGF0ZW1lbnQoKTsKKworICBpbnQgaSA9IDE7CisgIGZvciAo OyBpIDwgYXJnYzsgKytpKSB7CisgICAgY29uc3QgY2hhciogYXJnID0gYXJndltpXTsKKyAgICBp ZiAoc3RyY21wKGFyZywgIi1mIikgPT0gMCkgeworICAgICAgaWYgKCsraSA9PSBhcmdjKQorICAg ICAgICBwcmludFVzYWdlU3RhdGVtZW50KCk7CisgICAgICBmaWxlTmFtZXMuYXBwZW5kKGFyZ3Zb aV0pOwogICAgICAgY29udGludWU7Ci0gICAgaWYgKHN0cmNtcChmaWxlTmFtZSwgIi1wIikgPT0g MCkgeworICAgIH0KKyAgICBpZiAoc3RyY21wKGFyZywgIi1wIikgPT0gMCkgewogICAgICAgcHJl dHR5UHJpbnQgPSB0cnVlOwogICAgICAgY29udGludWU7CiAgICAgfQotICAgIGZpbGVOYW1lcy5h cHBlbmQoZmlsZU5hbWUpOworICAgIGlmIChzdHJjbXAoYXJnLCAiLS0iKSA9PSAwKSB7CisgICAg ICArK2k7CisgICAgICBicmVhazsKKyAgICB9CisgICAgYnJlYWs7CiAgIH0KKworICBmb3IgKDsg aSA8IGFyZ2M7ICsraSkKKyAgICBhcmd1bWVudHMuYXBwZW5kKGFyZ3ZbaV0pOwogfQogCiBpbnQg a2pzbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3YpCkBAIC0zMDYsOSArMzI4LDEwIEBAIGludCBr anNtYWluKGludCBhcmdjLCBjaGFyKiogYXJndikKICAgCiAgIGJvb2wgcHJldHR5UHJpbnQgPSBm YWxzZTsKICAgVmVjdG9yPFVTdHJpbmc+IGZpbGVOYW1lczsKLSAgcGFyc2VBcmd1bWVudHMoYXJn YywgYXJndiwgZmlsZU5hbWVzLCBwcmV0dHlQcmludCk7CisgIFZlY3RvcjxVU3RyaW5nPiBhcmd1 bWVudHM7CisgIHBhcnNlQXJndW1lbnRzKGFyZ2MsIGFyZ3YsIGZpbGVOYW1lcywgYXJndW1lbnRz LCBwcmV0dHlQcmludCk7CiAgIAotICBib29sIHN1Y2Nlc3MgPSBydW5XaXRoU2NyaXB0cyhmaWxl TmFtZXMsIHByZXR0eVByaW50KTsKKyAgYm9vbCBzdWNjZXNzID0gcnVuV2l0aFNjcmlwdHMoZmls ZU5hbWVzLCBhcmd1bWVudHMsIHByZXR0eVByaW50KTsKIAogI2lmbmRlZiBOREVCVUcKICAgQ29s bGVjdG9yOjpjb2xsZWN0KCk7Cg==