130508 2014-03-20 06:39:43 -0700 prepare-ChangeLog should list functions that have been removed too. 2014-10-20 23:15:17 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=137889 P2 Normal --- 1 llango.u-szeged llango.u-szeged ap commit-queue darin gyuyoung.kim rniwa oldest_to_newest 992491 0 llango.u-szeged 2014-03-20 06:39:43 -0700 The prepare-ChangeLog does not list the deleted functions in the Changelog. We have to read the functions and the line ranges of them from the source before the change, then search for overlaps between them and the changed line ranges from diff. 992495 1 227287 llango.u-szeged 2014-03-20 06:46:02 -0700 Created attachment 227287 Patch 992539 2 ap 2014-03-20 09:09:40 -0700 On one hand, information about which functions were removed seems as relevant as information about added functions. But on the other hand, the list of functions in ChangeLog is just a template for adding per-function comments manually, and there is rarely anything to say about deleted functions ("deleted because this function is no longer needed, duh"). Overall, I'm leaning slightly against this proposed change. 993009 3 llango.u-szeged 2014-03-21 04:02:52 -0700 (In reply to comment #2) > On one hand, information about which functions were removed seems as relevant as information about added functions. But on the other hand, the list of functions in ChangeLog is just a template for adding per-function comments manually, and there is rarely anything to say about deleted functions ("deleted because this function is no longer needed, duh"). > > Overall, I'm leaning slightly against this proposed change. I think this is a useful information. A few days ago I had to find a missing method, but I could not find out from the git blame info and neither from the ChangeLog. I wanted to know that when was it removed and why. This why I started to work on this fix. There is a TODO list in the prepare-ChangeLog, that contains this change. If we don't want this feature, then we should remove it from the list: http://trac.webkit.org/browser/trunk/Tools/Scripts/prepare-ChangeLog#L38 993484 4 darin 2014-03-22 06:53:03 -0700 I like having the list of deleted functions. The person making the change log can always edit them out if they are not helpful. 993485 5 227287 darin 2014-03-22 06:56:16 -0700 Comment on attachment 227287 Patch Despite Alexey’s concerns, I like doing this. If it really gets in the way we can put it behind an option. But don’t we have some sort of regression test system for prepare-ChangeLog? I seem to remember there was one. This should be covered by tests in that system if we have it. 993728 6 llango.u-szeged 2014-03-24 01:03:07 -0700 (In reply to comment #5) > (From update of attachment 227287 [details]) > Despite Alexey’s concerns, I like doing this. If it really gets in the way we can put it behind an option. > > But don’t we have some sort of regression test system for prepare-ChangeLog? I seem to remember there was one. This should be covered by tests in that system if we have it. Not exactly for the prepare-ChangeLog, but only for the parser functions in it. Because we need a local change on source files, it's hard to write a unittest. 993745 7 227630 llango.u-szeged 2014-03-24 02:13:17 -0700 Created attachment 227630 patch for landing 993755 8 227630 commit-queue 2014-03-24 02:28:04 -0700 Comment on attachment 227630 patch for landing Clearing flags on attachment: 227630 Committed r166156: <http://trac.webkit.org/changeset/166156> 993756 9 commit-queue 2014-03-24 02:28:10 -0700 All reviewed patches have been landed. Closing bug. 227287 2014-03-20 06:46:02 -0700 2014-03-24 02:13:05 -0700 Patch bug-130508-20140320144540.patch text/plain 10621 llango.u-szeged U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1NDY2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTc0NmY0YjM2ODFhYzNkYzdlOWE5NDcyNjc2Y2Q0NzZi OGZkYjIyMS4uOGE0M2Q1NGRjOGJhMTc0ZGMwMzg0YjVhZTE5MTQ5MzkzYmI3ZTA5ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDE0LTAzLTIwICBMw6FzemzDsyBMYW5nw7MgIDxsbGFuZ28udS1zemVnZWRAcGFydG5l ci5zYW1zdW5nLmNvbT4KKworICAgICAgICBwcmVwYXJlLUNoYW5nZUxvZyBzaG91bGQgbGlzdCBm dW5jdGlvbnMgdGhhdCBoYXZlIGJlZW4gcmVtb3ZlZCB0b28uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA1MDgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgcHJlcGFyZS1DaGFuZ2VMb2cgZG9lcyBu b3QgbGlzdCB0aGUgZGVsZXRlZCBmdW5jdGlvbnMgaW4gdGhlIENoYW5nZWxvZy4KKyAgICAgICAg V2UgaGF2ZSB0byByZWFkIHRoZSBmdW5jdGlvbnMgYW5kIHRoZSBsaW5lIHJhbmdlcyBvZiB0aGVt IGZyb20gdGhlIHNvdXJjZQorICAgICAgICBiZWZvcmUgdGhlIGNoYW5nZSwgdGhlbiBzZWFyY2gg Zm9yIG92ZXJsYXBzIGJldHdlZW4gdGhlbSBhbmQgdGhlIGNoYW5nZWQKKyAgICAgICAgbGluZSBy YW5nZXMgZnJvbSBkaWZmLgorCisgICAgICAgICogU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZzoK KyAgICAgICAgKG9yaWdpbmFsRmlsZSk6IEdldCBvcmlnaW5hbCBzb3VyY2UgY29tbWFuZC4KKyAg ICAgICAgKGdlbmVyYXRlRnVuY3Rpb25MaXN0cyk6IENvbGxlY3QgZGVsZXRlZCBmdW5jdGlvbnMg dG9vLgorICAgICAgICAoZ2VuZXJhdGVGdW5jdGlvbkxpc3RzQnlSYW5nZXMpOiBEdXBsaWNhdGVk IGNvZGUgaXMgbW92ZWQgdG8gYSBzZXBhcmF0ZSBzdWJyb3V0aW5lLgorICAgICAgICAoZXh0cmFj dExpbmVSYW5nZUJlZm9yZUNoYW5nZSk6IEV4dHJhY3QgbGluZSByYW5nZXMgZnJvbSB0aGUgb3Jp Z2luYWwgc291cmNlIHRvIGdldAorICAgICAgICBkZWxldGVkIGZ1bmN0aW9ucyByYW5nZXMgdG9v LgorICAgICAgICAoZXh0cmFjdExpbmVSYW5nZSk6IFJlbmFtZWQgdG8gZXh0cmFjdExpbmVSYW5n ZUFmdGVyQ2hhbmdlLgorCiAyMDE0LTAzLTEyICBSeXVhbiBDaG9pICA8cnl1YW4uY2hvaUBzYW1z dW5nLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCBvbiB0aGUgRUZMIHBvcnQg d2hlbiB1c2VkIGxvd2VyIHZlcnNpb24gb2YgQVRLCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3ByZXBhcmUtQ2hhbmdlTG9nIGIvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwppbmRl eCA0MWQ2YjU2ZTQ4MzE0MmE5NDk2MDlmZTZiOWQ4ZWRkZTNlMmMwNjI5Li43ZmZhYzg1OTdkNzcy ODRlMGI1MWNlOTZlNzJlMmVkYjFiMGFkZWI5IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3By ZXBhcmUtQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKQEAg LTczLDEyICs3MywxNCBAQCBzdWIgZGV0ZXJtaW5lUHJvcGVydHlDaGFuZ2VzKCQkJCk7CiBzdWIg ZGlmZkNvbW1hbmQoJCQkJCk7CiBzdWIgZGlmZkZyb21Ub1N0cmluZygkJCQpOwogc3ViIGRpZmZI ZWFkZXJGb3JtYXQoKTsKLXN1YiBleHRyYWN0TGluZVJhbmdlKCQpOworc3ViIGV4dHJhY3RMaW5l UmFuZ2VBZnRlckNoYW5nZSgkKTsKK3N1YiBleHRyYWN0TGluZVJhbmdlQmVmb3JlQ2hhbmdlKCQp Owogc3ViIGZldGNoQnVnRGVzY3JpcHRpb25Gcm9tVVJMKCQkKTsKIHN1YiBmaW5kQ2hhbmdlTG9n cygkKTsKIHN1YiBmaW5kT3JpZ2luYWxGaWxlRnJvbVN2bigkKTsKIHN1YiBnZW5lcmF0ZUZpbGVM aXN0KFwlJCQkKTsKIHN1YiBnZW5lcmF0ZUZ1bmN0aW9uTGlzdHMoJCQkJCQpOworc3ViIGdlbmVy YXRlRnVuY3Rpb25MaXN0c0J5UmFuZ2VzKCQkJCQpOwogc3ViIGdlbmVyYXRlTmV3Q2hhbmdlTG9n cygkJCQkJCQkJCQkJCk7CiBzdWIgZ2V0TGF0ZXN0Q2hhbmdlTG9ncygkKTsKIHN1YiBnZXRfZnVu Y3Rpb25fbGluZV9yYW5nZXMoJCQpOwpAQCAtOTcsNiArOTksNyBAQCBzdWIgbWFpbigpOwogc3Vi IG1ldGhvZF9kZWNsX3RvX3NlbGVjdG9yKCQpOwogc3ViIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCQk KTsKIHN1YiBvcGVuQ2hhbmdlTG9ncygkKTsKK3N1YiBvcmlnaW5hbEZpbGUoJCQkJCk7CiBzdWIg cGx1cmFsaXplQW5kTGlzdCgkJEApOwogc3ViIHByaW50RGlmZigkJCQkKTsKIHN1YiBwcm9jZXNz UGF0aHMoXEApOwpAQCAtMjMwLDExICsyMzMsMjggQEAgc3ViIG1haW4oKQogICAgIHJldHVybiAw OwogfQogCitzdWIgb3JpZ2luYWxGaWxlKCQkJCQpCit7CisgICAgbXkgKCRmaWxlLCAkZ2l0Q29t bWl0LCAkZ2l0SW5kZXgsICRtZXJnZUJhc2UpID0gQF87CisKKyAgICBteSAkY29tbWFuZDsKKyAg ICBpZiAoaXNTVk4oKSkgeworICAgICAgICBteSAkZXNjYXBlZFBhdGhzU3RyaW5nID0gZXNjYXBl U3VidmVyc2lvblBhdGgoJGZpbGUpOworICAgICAgICAkY29tbWFuZCA9IFNWTiAuICIgY2F0ICRl c2NhcGVkUGF0aHNTdHJpbmciOworICAgIH0gZWxzaWYgKGlzR2l0KCkpIHsKKyAgICAgICAgJGNv bW1hbmQgPSBHSVQgLiAiIHNob3cgIiAuIGRpZmZGcm9tVG9TdHJpbmcoJGdpdENvbW1pdCwgJGdp dEluZGV4LCAkbWVyZ2VCYXNlKTsKKyAgICAgICAgJGNvbW1hbmQgLj0gIjokZmlsZSIgdW5sZXNz ICRnaXRDb21taXQgb3IgJG1lcmdlQmFzZTsKKyAgICB9CisKKyAgICByZXR1cm4gJGNvbW1hbmQ7 Cit9CisKIHN1YiBnZW5lcmF0ZUZ1bmN0aW9uTGlzdHMoJCQkJCQpCiB7CiAgICAgbXkgKCRjaGFu Z2VkRmlsZXMsICRmdW5jdGlvbkxpc3RzLCAkZ2l0Q29tbWl0LCAkZ2l0SW5kZXgsICRtZXJnZUJh c2UpID0gQF87CiAKLSAgICBteSAlY2hhbmdlZF9saW5lX3JhbmdlczsKKyAgICBteSAlbGluZV9y YW5nZXNfYWZ0ZXJfY2hhbmdlZDsKKyAgICBteSAlbGluZV9yYW5nZXNfYmVmb3JlX2NoYW5nZWQ7 CiAgICAgaWYgKEAkY2hhbmdlZEZpbGVzKSB7CiAgICAgICAgICMgRm9yIGVhY2ggZmlsZSwgYnVp bGQgYSBsaXN0IG9mIG1vZGlmaWVkIGxpbmVzLgogICAgICAgICAjIFVzZSBsaW5lIG51bWJlcnMg ZnJvbSB0aGUgImFmdGVyIiBzaWRlIG9mIGVhY2ggZGlmZi4KQEAgLTI0NCw5ICsyNjQsMTUgQEAg c3ViIGdlbmVyYXRlRnVuY3Rpb25MaXN0cygkJCQkJCkKICAgICAgICAgd2hpbGUgKDxESUZGPikg ewogICAgICAgICAgICAgJGZpbGUgPSBtYWtlRmlsZVBhdGhSZWxhdGl2ZSgkMSkgaWYgJF8gPX4g ZGlmZkhlYWRlckZvcm1hdCgpOwogICAgICAgICAgICAgaWYgKGRlZmluZWQgJGZpbGUpIHsKLSAg ICAgICAgICAgICAgICBteSAoJHN0YXJ0LCAkZW5kKSA9IGV4dHJhY3RMaW5lUmFuZ2UoJF8pOwot ICAgICAgICAgICAgICAgIGlmICgkc3RhcnQgPj0gMCAmJiAkZW5kID49IDApIHsKLSAgICAgICAg ICAgICAgICAgICAgcHVzaCBAeyRjaGFuZ2VkX2xpbmVfcmFuZ2VzeyRmaWxlfX0sIFsgJHN0YXJ0 LCAkZW5kIF07CisgICAgICAgICAgICAgICAgbXkgKCRiZWZvcmVfc3RhcnQsICRiZWZvcmVfZW5k KSA9IGV4dHJhY3RMaW5lUmFuZ2VCZWZvcmVDaGFuZ2UoJF8pOworICAgICAgICAgICAgICAgIGlm ICgkYmVmb3JlX3N0YXJ0ID49IDAgJiYgJGJlZm9yZV9lbmQgPj0gMCkgeworICAgICAgICAgICAg ICAgICAgICBwdXNoIEB7JGxpbmVfcmFuZ2VzX2JlZm9yZV9jaGFuZ2VkeyRmaWxlfX0sIFsgJGJl Zm9yZV9zdGFydCwgJGJlZm9yZV9lbmQgXTsKKyAgICAgICAgICAgICAgICB9IGVsc2lmICgvRE9f Tk9UX0NPTU1JVC8pIHsKKyAgICAgICAgICAgICAgICAgICAgcHJpbnQgU1RERVJSICJXQVJOSU5H OiBmaWxlICRmaWxlIGNvbnRhaW5zIHRoZSBzdHJpbmcgRE9fTk9UX0NPTU1JVCwgbGluZSAkLlxu IjsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgbXkgKCRhZnRlcl9zdGFydCwg JGFmdGVyX2VuZCkgPSBleHRyYWN0TGluZVJhbmdlQWZ0ZXJDaGFuZ2UoJF8pOworICAgICAgICAg ICAgICAgIGlmICgkYWZ0ZXJfc3RhcnQgPj0gMCAmJiAkYWZ0ZXJfZW5kID49IDApIHsKKyAgICAg ICAgICAgICAgICAgICAgcHVzaCBAeyRsaW5lX3Jhbmdlc19hZnRlcl9jaGFuZ2VkeyRmaWxlfX0s IFsgJGFmdGVyX3N0YXJ0LCAkYWZ0ZXJfZW5kIF07CiAgICAgICAgICAgICAgICAgfSBlbHNpZiAo L0RPX05PVF9DT01NSVQvKSB7CiAgICAgICAgICAgICAgICAgICAgIHByaW50IFNUREVSUiAiV0FS TklORzogZmlsZSAkZmlsZSBjb250YWlucyB0aGUgc3RyaW5nIERPX05PVF9DT01NSVQsIGxpbmUg JC5cbiI7CiAgICAgICAgICAgICAgICAgfQpAQCAtMjU2LDU4ICsyODIsODIgQEAgc3ViIGdlbmVy YXRlRnVuY3Rpb25MaXN0cygkJCQkJCkKICAgICB9CiAKICAgICAjIEZvciBlYWNoIHNvdXJjZSBm aWxlLCBjb252ZXJ0IGxpbmUgcmFuZ2UgdG8gZnVuY3Rpb24gbGlzdC4KLSAgICBpZiAoJWNoYW5n ZWRfbGluZV9yYW5nZXMpIHsKKyAgICBpZiAoJWxpbmVfcmFuZ2VzX2FmdGVyX2NoYW5nZWQgYW5k ICVsaW5lX3Jhbmdlc19iZWZvcmVfY2hhbmdlZCkgewogICAgICAgICBwcmludCBTVERFUlIgIiAg RXh0cmFjdGluZyBhZmZlY3RlZCBmdW5jdGlvbiBuYW1lcyBmcm9tIHNvdXJjZSBmaWxlcy5cbiI7 Ci0gICAgICAgIGZvcmVhY2ggbXkgJGZpbGUgKGtleXMgJWNoYW5nZWRfbGluZV9yYW5nZXMpIHsK KyAgICAgICAgZm9yZWFjaCBteSAkZmlsZSAoa2V5cyAlbGluZV9yYW5nZXNfYWZ0ZXJfY2hhbmdl ZCkgewogICAgICAgICAgICAgIyBGaW5kIGFsbCB0aGUgZnVuY3Rpb25zIGluIHRoZSBmaWxlLgog ICAgICAgICAgICAgb3BlbiBTT1VSQ0UsICRmaWxlIG9yIG5leHQ7CiAgICAgICAgICAgICBteSBA ZnVuY3Rpb25fcmFuZ2VzID0gZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzKFwqU09VUkNFLCAkZmls ZSk7CiAgICAgICAgICAgICBjbG9zZSBTT1VSQ0U7CiAKLSAgICAgICAgICAgICMgRmluZCBhbGwg dGhlIG1vZGlmaWVkIGZ1bmN0aW9ucy4KLSAgICAgICAgICAgIG15IEBmdW5jdGlvbnM7CisgICAg ICAgICAgICBteSBAY2hhbmdlX3JhbmdlcyA9IChAeyRsaW5lX3Jhbmdlc19hZnRlcl9jaGFuZ2Vk eyRmaWxlfX0sIFtdKTsKICAgICAgICAgICAgIG15ICVzYXdfZnVuY3Rpb247Ci0gICAgICAgICAg ICBteSBAY2hhbmdlX3JhbmdlcyA9IChAeyRjaGFuZ2VkX2xpbmVfcmFuZ2VzeyRmaWxlfX0sIFtd KTsKLSAgICAgICAgICAgIG15IEBjaGFuZ2VfcmFuZ2UgPSAoMCwgMCk7Ci0gICAgICAgICAgICBG VU5DVElPTjogZm9yZWFjaCBteSAkZnVuY3Rpb25fcmFuZ2VfcmVmIChAZnVuY3Rpb25fcmFuZ2Vz KSB7Ci0gICAgICAgICAgICAgICAgbXkgQGZ1bmN0aW9uX3JhbmdlID0gQCRmdW5jdGlvbl9yYW5n ZV9yZWY7Ci0KLSAgICAgICAgICAgICAgICAjIEZJWE1FOiBUaGlzIGlzIGEgaGFjay4gSWYgdGhl IGZ1bmN0aW9uIG5hbWUgaXMgZW1wdHksIHNraXAgaXQuCi0gICAgICAgICAgICAgICAgIyBUaGUg Y3BwLCBweXRob24sIGphdmFzY3JpcHQsIHBlcmwsIGNzcyBhbmQgamF2YSBwYXJzZXJzCi0gICAg ICAgICAgICAgICAgIyBhcmUgbm90IHBlcmZlY3RseSBpbXBsZW1lbnRlZCBhbmQgc29tZXRpbWVz IGZ1bmN0aW9uIG5hbWVzIGNhbm5vdCBiZSByZXRyaWV2ZWQKLSAgICAgICAgICAgICAgICAjIGNv cnJlY3RseS4gQXMgeW91IGNhbiBzZWUgaW4gZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzX1hYWFgo KSwgdGhvc2UgcGFyc2VycwotICAgICAgICAgICAgICAgICMgYXJlIG5vdCBpbnRlbmRlZCB0byBp bXBsZW1lbnQgcmVhbCBwYXJzZXJzIGJ1dCBpbnRlbmRlZCB0byBqdXN0IHJldHJpZXZlIGZ1bmN0 aW9uIG5hbWVzCi0gICAgICAgICAgICAgICAgIyBmb3IgbW9zdCBwcmFjdGljYWwgc3ludGF4ZXMu Ci0gICAgICAgICAgICAgICAgbmV4dCB1bmxlc3MgJGZ1bmN0aW9uX3JhbmdlWzJdOwotCi0gICAg ICAgICAgICAgICAgIyBBZHZhbmNlIHRvIHN1Y2Nlc3NpdmUgY2hhbmdlIHJhbmdlcy4KLSAgICAg ICAgICAgICAgICBmb3IgKDs7IEBjaGFuZ2VfcmFuZ2UgPSBAe3NoaWZ0IEBjaGFuZ2VfcmFuZ2Vz fSkgewotICAgICAgICAgICAgICAgICAgICBsYXN0IEZVTkNUSU9OIHVubGVzcyBAY2hhbmdlX3Jh bmdlOwotCi0gICAgICAgICAgICAgICAgICAgICMgSWYgcGFzdCB0aGlzIGZ1bmN0aW9uLCBtb3Zl IG9uIHRvIHRoZSBuZXh0IG9uZS4KLSAgICAgICAgICAgICAgICAgICAgbmV4dCBGVU5DVElPTiBp ZiAkY2hhbmdlX3JhbmdlWzBdID4gJGZ1bmN0aW9uX3JhbmdlWzFdOwotCi0gICAgICAgICAgICAg ICAgICAgICMgSWYgYW4gb3ZlcmxhcCB3aXRoIHRoaXMgZnVuY3Rpb24gcmFuZ2UsIHJlY29yZCB0 aGUgZnVuY3Rpb24gbmFtZS4KLSAgICAgICAgICAgICAgICAgICAgaWYgKCRjaGFuZ2VfcmFuZ2Vb MV0gPj0gJGZ1bmN0aW9uX3JhbmdlWzBdCi0gICAgICAgICAgICAgICAgICAgICAgICBhbmQgJGNo YW5nZV9yYW5nZVswXSA8PSAkZnVuY3Rpb25fcmFuZ2VbMV0pIHsKLSAgICAgICAgICAgICAgICAg ICAgICAgIGlmICghJHNhd19mdW5jdGlvbnskZnVuY3Rpb25fcmFuZ2VbMl19KSB7Ci0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgJHNhd19mdW5jdGlvbnskZnVuY3Rpb25fcmFuZ2VbMl19ID0g MTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBwdXNoIEBmdW5jdGlvbnMsICRmdW5jdGlv bl9yYW5nZVsyXTsKLSAgICAgICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAg ICAgICAgIG5leHQgRlVOQ1RJT047Ci0gICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAg ICAgICB9Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBteSBAZnVuY3Rpb25zID0gZ2VuZXJh dGVGdW5jdGlvbkxpc3RzQnlSYW5nZXMoJGZpbGUsIFxAY2hhbmdlX3JhbmdlcywgXEBmdW5jdGlv bl9yYW5nZXMsIFwlc2F3X2Z1bmN0aW9uKTsKIAotICAgICAgICAgICAgIyBGb3JtYXQgdGhlIGxp c3Qgb2YgZnVuY3Rpb25zIG5vdy4KKyAgICAgICAgICAgICMgRm9ybWF0IHRoZSBsaXN0IG9mIGZ1 bmN0aW9ucy4KICAgICAgICAgICAgIGlmIChAZnVuY3Rpb25zKSB7CiAgICAgICAgICAgICAgICAg JGZ1bmN0aW9uTGlzdHMtPnskZmlsZX0gPSAiIiBpZiAhZGVmaW5lZCAkZnVuY3Rpb25MaXN0cy0+ eyRmaWxlfTsKICAgICAgICAgICAgICAgICAkZnVuY3Rpb25MaXN0cy0+eyRmaWxlfSAuPSAiXG4g ICAgICAgICgiIC4gam9pbigiKTpcbiAgICAgICAgKCIsIEBmdW5jdGlvbnMpIC4gIik6IjsKICAg ICAgICAgICAgIH0KKworICAgICAgICAgICAgIyBGaW5kIHRoZSBkZWxldGVkIGZ1bmN0aW9ucyBp biB0aGUgb3JpZ2luYWwgZmlsZS4KKyAgICAgICAgICAgIG9wZW4gU09VUkNFLCAiLXwiLCBvcmln aW5hbEZpbGUoJGZpbGUsICRnaXRDb21taXQsICRnaXRJbmRleCwgJG1lcmdlQmFzZSkgb3IgbmV4 dDsKKyAgICAgICAgICAgICAgICBteSBAZGVsZXRlZF9mdW5jdGlvbl9yYW5nZXMgPSBnZXRfZnVu Y3Rpb25fbGluZV9yYW5nZXMoXCpTT1VSQ0UsICRmaWxlKTsKKyAgICAgICAgICAgIGNsb3NlIFNP VVJDRTsKKworICAgICAgICAgICAgQGNoYW5nZV9yYW5nZXMgPSAoQHskbGluZV9yYW5nZXNfYmVm b3JlX2NoYW5nZWR7JGZpbGV9fSwgW10pOworICAgICAgICAgICAgQGZ1bmN0aW9ucyA9IGdlbmVy YXRlRnVuY3Rpb25MaXN0c0J5UmFuZ2VzKCRmaWxlLCBcQGNoYW5nZV9yYW5nZXMsIFxAZGVsZXRl ZF9mdW5jdGlvbl9yYW5nZXMsIFwlc2F3X2Z1bmN0aW9uKTsKKworICAgICAgICAgICAgIyBGb3Jt YXQgdGhlIGxpc3Qgb2YgZGVsZXRlZCBmdW5jdGlvbnMuCisgICAgICAgICAgICBpZiAoQGZ1bmN0 aW9ucykgeworICAgICAgICAgICAgICAgICRmdW5jdGlvbkxpc3RzLT57JGZpbGV9ID0gIiIgaWYg IWRlZmluZWQgJGZ1bmN0aW9uTGlzdHMtPnskZmlsZX07CisgICAgICAgICAgICAgICAgJGZ1bmN0 aW9uTGlzdHMtPnskZmlsZX0gLj0gIlxuICAgICAgICAoIiAuIGpvaW4oIik6IERlbGV0ZWQuXG4g ICAgICAgICgiLCBAZnVuY3Rpb25zKSAuICIpOiBEZWxldGVkLiI7CisgICAgICAgICAgICB9CiAg ICAgICAgIH0KICAgICB9CiB9CiAKK3N1YiBnZW5lcmF0ZUZ1bmN0aW9uTGlzdHNCeVJhbmdlcygk JCQkKQoreworICAgIG15ICgkZmlsZSwgJGNoYW5nZWRfbGluZV9yYW5nZXMsICRmdW5jdGlvbl9y YW5nZXMsICRzYXdfZnVuY3Rpb24pID0gQF87CisKKyAgICAjIEZpbmQgYWxsIHRoZSBtb2RpZmll ZCBmdW5jdGlvbnMuCisgICAgbXkgQGZ1bmN0aW9uczsKKyAgICBteSBAY2hhbmdlX3JhbmdlcyA9 IEB7JGNoYW5nZWRfbGluZV9yYW5nZXN9OworICAgIG15IEBjaGFuZ2VfcmFuZ2UgPSAoMCwgMCk7 CisgICAgRlVOQ1RJT046IGZvcmVhY2ggbXkgJGZ1bmN0aW9uX3JhbmdlX3JlZiAoQHskZnVuY3Rp b25fcmFuZ2VzfSkgeworICAgICAgICBteSBAZnVuY3Rpb25fcmFuZ2UgPSBAeyRmdW5jdGlvbl9y YW5nZV9yZWZ9OworCisgICAgICAgICMgRklYTUU6IFRoaXMgaXMgYSBoYWNrLiBJZiB0aGUgZnVu Y3Rpb24gbmFtZSBpcyBlbXB0eSwgc2tpcCBpdC4KKyAgICAgICAgIyBUaGUgY3BwLCBweXRob24s IGphdmFzY3JpcHQsIHBlcmwsIGNzcyBhbmQgamF2YSBwYXJzZXJzCisgICAgICAgICMgYXJlIG5v dCBwZXJmZWN0bHkgaW1wbGVtZW50ZWQgYW5kIHNvbWV0aW1lcyBmdW5jdGlvbiBuYW1lcyBjYW5u b3QgYmUgcmV0cmlldmVkCisgICAgICAgICMgY29ycmVjdGx5LiBBcyB5b3UgY2FuIHNlZSBpbiBn ZXRfZnVuY3Rpb25fbGluZV9yYW5nZXNfWFhYWCgpLCB0aG9zZSBwYXJzZXJzCisgICAgICAgICMg YXJlIG5vdCBpbnRlbmRlZCB0byBpbXBsZW1lbnQgcmVhbCBwYXJzZXJzIGJ1dCBpbnRlbmRlZCB0 byBqdXN0IHJldHJpZXZlIGZ1bmN0aW9uIG5hbWVzCisgICAgICAgICMgZm9yIG1vc3QgcHJhY3Rp Y2FsIHN5bnRheGVzLgorICAgICAgICBuZXh0IHVubGVzcyAkZnVuY3Rpb25fcmFuZ2VbMl07CisK KyAgICAgICAgIyBBZHZhbmNlIHRvIHN1Y2Nlc3NpdmUgY2hhbmdlIHJhbmdlcy4KKyAgICAgICAg Zm9yICg7OyBAY2hhbmdlX3JhbmdlID0gQHtzaGlmdCBAY2hhbmdlX3Jhbmdlc30pIHsKKyAgICAg ICAgICAgIGxhc3QgRlVOQ1RJT04gdW5sZXNzIEBjaGFuZ2VfcmFuZ2U7CisKKyAgICAgICAgICAg ICMgSWYgcGFzdCB0aGlzIGZ1bmN0aW9uLCBtb3ZlIG9uIHRvIHRoZSBuZXh0IG9uZS4KKyAgICAg ICAgICAgIG5leHQgRlVOQ1RJT04gaWYgJGNoYW5nZV9yYW5nZVswXSA+ICRmdW5jdGlvbl9yYW5n ZVsxXTsKKworICAgICAgICAgICAgIyBJZiBhbiBvdmVybGFwIHdpdGggdGhpcyBmdW5jdGlvbiBy YW5nZSwgcmVjb3JkIHRoZSBmdW5jdGlvbiBuYW1lLgorICAgICAgICAgICAgaWYgKCRjaGFuZ2Vf cmFuZ2VbMV0gPj0gJGZ1bmN0aW9uX3JhbmdlWzBdCisgICAgICAgICAgICAgICAgYW5kICRjaGFu Z2VfcmFuZ2VbMF0gPD0gJGZ1bmN0aW9uX3JhbmdlWzFdKSB7CisgICAgICAgICAgICAgICAgaWYg KCEkc2F3X2Z1bmN0aW9uLT57JGZ1bmN0aW9uX3JhbmdlWzJdfSkgeworICAgICAgICAgICAgICAg ICAgICAkc2F3X2Z1bmN0aW9uLT57JGZ1bmN0aW9uX3JhbmdlWzJdfSA9IDE7CisgICAgICAgICAg ICAgICAgICAgIHB1c2ggQGZ1bmN0aW9ucywgJGZ1bmN0aW9uX3JhbmdlWzJdOworICAgICAgICAg ICAgICAgIH0KKyAgICAgICAgICAgICAgICBuZXh0IEZVTkNUSU9OOworICAgICAgICAgICAgfQor ICAgICAgICB9CisgICAgfQorCisgICAgcmV0dXJuIEBmdW5jdGlvbnM7Cit9CisKIHN1YiBjaGFu Z2VMb2dEYXRlKCQpCiB7CiAgICAgbXkgKCR0aW1lWm9uZSkgPSBAXzsKQEAgLTE4OTcsNyArMTk0 Nyw3IEBAIHN1YiBwcm9wZXJ0eUNoYW5nZURlc2NyaXB0aW9uKCQpCiAgICAgcmV0dXJuICRkZXNj cmlwdGlvbjsKIH0KIAotc3ViIGV4dHJhY3RMaW5lUmFuZ2UoJCkKK3N1YiBleHRyYWN0TGluZVJh bmdlQWZ0ZXJDaGFuZ2UoJCkKIHsKICAgICBteSAoJHN0cmluZykgPSBAXzsKIApAQCAtMTkxNCw2 ICsxOTY0LDIzIEBAIHN1YiBleHRyYWN0TGluZVJhbmdlKCQpCiAgICAgcmV0dXJuICgkc3RhcnQs ICRlbmQpOwogfQogCitzdWIgZXh0cmFjdExpbmVSYW5nZUJlZm9yZUNoYW5nZSgkKQoreworICAg IG15ICgkc3RyaW5nKSA9IEBfOworCisgICAgbXkgKCRzdGFydCwgJGVuZCkgPSAoLTEsIC0xKTsK KworICAgIGlmIChpc1NWTigpICYmICRzdHJpbmcgPX4gL14oXGQrKSgsKFxkKykpP1thY2RdXGQr KCxcZCspPy8pIHsKKyAgICAgICAgJHN0YXJ0ID0gJDE7CisgICAgICAgICRlbmQgPSAkMyB8fCAk MTsKKyAgICB9IGVsc2lmIChpc0dpdCgpICYmICRzdHJpbmcgPX4gL15AQCAtKFxkKykoLChcZCsp KT8gXCtcZCsoLFxkKyk/IEBALykgeworICAgICAgICAkc3RhcnQgPSAkMTsKKyAgICAgICAgJGVu ZCA9IGRlZmluZWQoJDMpID8gJDMgKyAkMSAtIDEgOiAkMTsKKyAgICB9CisKKyAgICByZXR1cm4g KCRzdGFydCwgJGVuZCk7Cit9CisKIHN1YiB0ZXN0TGlzdEZvckNoYW5nZUxvZyhAKQogewogICAg IG15IChAdGVzdHMpID0gQF87Cg== 227630 2014-03-24 02:13:17 -0700 2014-03-24 02:28:04 -0700 patch for landing bug-130508-20140324101256.patch text/plain 10837 llango.u-szeged U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MTUxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMGE5MzQ0YzdhYzhmZTI0YTNhNDgyOTYxODQyZjQzOWE5 N2UzMzQ0My4uYjIwMzg5NWY5YjcxY2QwODBmYmExNGIxNzk2N2MzZDRjMjJkMWY3ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDE0LTAzLTI0ICBMw6FzemzDsyBMYW5nw7MgIDxsbGFuZ28udS1zemVnZWRAcGFydG5l ci5zYW1zdW5nLmNvbT4KKworICAgICAgICBwcmVwYXJlLUNoYW5nZUxvZyBzaG91bGQgbGlzdCBm dW5jdGlvbnMgdGhhdCBoYXZlIGJlZW4gcmVtb3ZlZCB0b28uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA1MDgKKworICAgICAgICBSZXZpZXdlZCBi eSBEYXJpbiBBZGxlci4KKworICAgICAgICBUaGUgcHJlcGFyZS1DaGFuZ2VMb2cgZG9lcyBub3Qg bGlzdCB0aGUgZGVsZXRlZCBmdW5jdGlvbnMgaW4gdGhlIENoYW5nZWxvZy4KKyAgICAgICAgV2Ug aGF2ZSB0byByZWFkIHRoZSBmdW5jdGlvbnMgYW5kIHRoZSBsaW5lIHJhbmdlcyBvZiB0aGVtIGZy b20gdGhlIHNvdXJjZQorICAgICAgICBiZWZvcmUgdGhlIGNoYW5nZSwgdGhlbiBzZWFyY2ggZm9y IG92ZXJsYXBzIGJldHdlZW4gdGhlbSBhbmQgdGhlIGNoYW5nZWQKKyAgICAgICAgbGluZSByYW5n ZXMgZnJvbSBkaWZmLgorCisgICAgICAgICogU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZzoKKyAg ICAgICAgKG9yaWdpbmFsRmlsZSk6IEdldCBvcmlnaW5hbCBzb3VyY2UgY29tbWFuZC4KKyAgICAg ICAgKGdlbmVyYXRlRnVuY3Rpb25MaXN0cyk6IENvbGxlY3QgZGVsZXRlZCBmdW5jdGlvbnMgdG9v LgorICAgICAgICAoZ2VuZXJhdGVGdW5jdGlvbkxpc3RzQnlSYW5nZXMpOiBEdXBsaWNhdGVkIGNv ZGUgaXMgbW92ZWQgdG8gYSBzZXBhcmF0ZSBzdWJyb3V0aW5lLgorICAgICAgICAoZXh0cmFjdExp bmVSYW5nZUJlZm9yZUNoYW5nZSk6IEV4dHJhY3QgbGluZSByYW5nZXMgZnJvbSB0aGUgb3JpZ2lu YWwgc291cmNlIHRvIGdldAorICAgICAgICBkZWxldGVkIGZ1bmN0aW9ucyByYW5nZXMgdG9vLgor ICAgICAgICAoZXh0cmFjdExpbmVSYW5nZSk6IFJlbmFtZWQgdG8gZXh0cmFjdExpbmVSYW5nZUFm dGVyQ2hhbmdlLgorCiAyMDE0LTAzLTIzICBIeW93b24gS2ltICA8aHcxMDA4LmtpbUBzYW1zdW5n LmNvbT4KIAogICAgICAgICBNb3ZlIGFsbCBFRkwgdHlwZWRlZnMgaW50byBFZmxUeXBlZGVmcy5o LgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZyBiL1Rvb2xzL1Nj cmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKaW5kZXggNDFkNmI1NmU0ODMxNDJhOTQ5NjA5ZmU2Yjlk OGVkZGUzZTJjMDYyOS4uZDA4YzA1MDY4ZThkOGExNGVjMWI1ZDg1ZDczNGIxMTAxNTFhYzY1ZCAx MDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZworKysgYi9Ub29scy9T Y3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCkBAIC0zNSw3ICszNSw2IEBACiAKICMKICMgVE9ETzoK LSMgICBMaXN0IGZ1bmN0aW9ucyB0aGF0IGhhdmUgYmVlbiByZW1vdmVkIHRvby4KICMgICBEZWNp ZGUgd2hhdCBhIGdvb2QgbG9naWNhbCBvcmRlciBpcyBmb3IgdGhlIGNoYW5nZWQgZmlsZXMKICMg ICAgIG90aGVyIHRoYW4gYSBub3JtYWwgdGV4dCAic29ydCIgKHRvcCBsZXZlbCBmaXJzdD8pCiAj ICAgICAoZ3JvdXAgZGlyZWN0b3JpZXM/KSAoLmggYmVmb3JlIC5jPykKQEAgLTczLDEyICs3Miwx NCBAQCBzdWIgZGV0ZXJtaW5lUHJvcGVydHlDaGFuZ2VzKCQkJCk7CiBzdWIgZGlmZkNvbW1hbmQo JCQkJCk7CiBzdWIgZGlmZkZyb21Ub1N0cmluZygkJCQpOwogc3ViIGRpZmZIZWFkZXJGb3JtYXQo KTsKLXN1YiBleHRyYWN0TGluZVJhbmdlKCQpOworc3ViIGV4dHJhY3RMaW5lUmFuZ2VBZnRlckNo YW5nZSgkKTsKK3N1YiBleHRyYWN0TGluZVJhbmdlQmVmb3JlQ2hhbmdlKCQpOwogc3ViIGZldGNo QnVnRGVzY3JpcHRpb25Gcm9tVVJMKCQkKTsKIHN1YiBmaW5kQ2hhbmdlTG9ncygkKTsKIHN1YiBm aW5kT3JpZ2luYWxGaWxlRnJvbVN2bigkKTsKIHN1YiBnZW5lcmF0ZUZpbGVMaXN0KFwlJCQkKTsK IHN1YiBnZW5lcmF0ZUZ1bmN0aW9uTGlzdHMoJCQkJCQpOworc3ViIGdlbmVyYXRlRnVuY3Rpb25M aXN0c0J5UmFuZ2VzKCQkJCQpOwogc3ViIGdlbmVyYXRlTmV3Q2hhbmdlTG9ncygkJCQkJCQkJCQk JCk7CiBzdWIgZ2V0TGF0ZXN0Q2hhbmdlTG9ncygkKTsKIHN1YiBnZXRfZnVuY3Rpb25fbGluZV9y YW5nZXMoJCQpOwpAQCAtOTcsNiArOTgsNyBAQCBzdWIgbWFpbigpOwogc3ViIG1ldGhvZF9kZWNs X3RvX3NlbGVjdG9yKCQpOwogc3ViIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCQkKTsKIHN1YiBvcGVu Q2hhbmdlTG9ncygkKTsKK3N1YiBvcmlnaW5hbEZpbGUoJCQkJCk7CiBzdWIgcGx1cmFsaXplQW5k TGlzdCgkJEApOwogc3ViIHByaW50RGlmZigkJCQkKTsKIHN1YiBwcm9jZXNzUGF0aHMoXEApOwpA QCAtMjMwLDExICsyMzIsMjggQEAgc3ViIG1haW4oKQogICAgIHJldHVybiAwOwogfQogCitzdWIg b3JpZ2luYWxGaWxlKCQkJCQpCit7CisgICAgbXkgKCRmaWxlLCAkZ2l0Q29tbWl0LCAkZ2l0SW5k ZXgsICRtZXJnZUJhc2UpID0gQF87CisKKyAgICBteSAkY29tbWFuZDsKKyAgICBpZiAoaXNTVk4o KSkgeworICAgICAgICBteSAkZXNjYXBlZFBhdGhzU3RyaW5nID0gZXNjYXBlU3VidmVyc2lvblBh dGgoJGZpbGUpOworICAgICAgICAkY29tbWFuZCA9IFNWTiAuICIgY2F0ICRlc2NhcGVkUGF0aHNT dHJpbmciOworICAgIH0gZWxzaWYgKGlzR2l0KCkpIHsKKyAgICAgICAgJGNvbW1hbmQgPSBHSVQg LiAiIHNob3cgIiAuIGRpZmZGcm9tVG9TdHJpbmcoJGdpdENvbW1pdCwgJGdpdEluZGV4LCAkbWVy Z2VCYXNlKTsKKyAgICAgICAgJGNvbW1hbmQgLj0gIjokZmlsZSIgdW5sZXNzICRnaXRDb21taXQg b3IgJG1lcmdlQmFzZTsKKyAgICB9CisKKyAgICByZXR1cm4gJGNvbW1hbmQ7Cit9CisKIHN1YiBn ZW5lcmF0ZUZ1bmN0aW9uTGlzdHMoJCQkJCQpCiB7CiAgICAgbXkgKCRjaGFuZ2VkRmlsZXMsICRm dW5jdGlvbkxpc3RzLCAkZ2l0Q29tbWl0LCAkZ2l0SW5kZXgsICRtZXJnZUJhc2UpID0gQF87CiAK LSAgICBteSAlY2hhbmdlZF9saW5lX3JhbmdlczsKKyAgICBteSAlbGluZV9yYW5nZXNfYWZ0ZXJf Y2hhbmdlZDsKKyAgICBteSAlbGluZV9yYW5nZXNfYmVmb3JlX2NoYW5nZWQ7CiAgICAgaWYgKEAk Y2hhbmdlZEZpbGVzKSB7CiAgICAgICAgICMgRm9yIGVhY2ggZmlsZSwgYnVpbGQgYSBsaXN0IG9m IG1vZGlmaWVkIGxpbmVzLgogICAgICAgICAjIFVzZSBsaW5lIG51bWJlcnMgZnJvbSB0aGUgImFm dGVyIiBzaWRlIG9mIGVhY2ggZGlmZi4KQEAgLTI0NCw5ICsyNjMsMTUgQEAgc3ViIGdlbmVyYXRl RnVuY3Rpb25MaXN0cygkJCQkJCkKICAgICAgICAgd2hpbGUgKDxESUZGPikgewogICAgICAgICAg ICAgJGZpbGUgPSBtYWtlRmlsZVBhdGhSZWxhdGl2ZSgkMSkgaWYgJF8gPX4gZGlmZkhlYWRlckZv cm1hdCgpOwogICAgICAgICAgICAgaWYgKGRlZmluZWQgJGZpbGUpIHsKLSAgICAgICAgICAgICAg ICBteSAoJHN0YXJ0LCAkZW5kKSA9IGV4dHJhY3RMaW5lUmFuZ2UoJF8pOwotICAgICAgICAgICAg ICAgIGlmICgkc3RhcnQgPj0gMCAmJiAkZW5kID49IDApIHsKLSAgICAgICAgICAgICAgICAgICAg cHVzaCBAeyRjaGFuZ2VkX2xpbmVfcmFuZ2VzeyRmaWxlfX0sIFsgJHN0YXJ0LCAkZW5kIF07Cisg ICAgICAgICAgICAgICAgbXkgKCRiZWZvcmVfc3RhcnQsICRiZWZvcmVfZW5kKSA9IGV4dHJhY3RM aW5lUmFuZ2VCZWZvcmVDaGFuZ2UoJF8pOworICAgICAgICAgICAgICAgIGlmICgkYmVmb3JlX3N0 YXJ0ID49IDAgJiYgJGJlZm9yZV9lbmQgPj0gMCkgeworICAgICAgICAgICAgICAgICAgICBwdXNo IEB7JGxpbmVfcmFuZ2VzX2JlZm9yZV9jaGFuZ2VkeyRmaWxlfX0sIFsgJGJlZm9yZV9zdGFydCwg JGJlZm9yZV9lbmQgXTsKKyAgICAgICAgICAgICAgICB9IGVsc2lmICgvRE9fTk9UX0NPTU1JVC8p IHsKKyAgICAgICAgICAgICAgICAgICAgcHJpbnQgU1RERVJSICJXQVJOSU5HOiBmaWxlICRmaWxl IGNvbnRhaW5zIHRoZSBzdHJpbmcgRE9fTk9UX0NPTU1JVCwgbGluZSAkLlxuIjsKKyAgICAgICAg ICAgICAgICB9CisgICAgICAgICAgICAgICAgbXkgKCRhZnRlcl9zdGFydCwgJGFmdGVyX2VuZCkg PSBleHRyYWN0TGluZVJhbmdlQWZ0ZXJDaGFuZ2UoJF8pOworICAgICAgICAgICAgICAgIGlmICgk YWZ0ZXJfc3RhcnQgPj0gMCAmJiAkYWZ0ZXJfZW5kID49IDApIHsKKyAgICAgICAgICAgICAgICAg ICAgcHVzaCBAeyRsaW5lX3Jhbmdlc19hZnRlcl9jaGFuZ2VkeyRmaWxlfX0sIFsgJGFmdGVyX3N0 YXJ0LCAkYWZ0ZXJfZW5kIF07CiAgICAgICAgICAgICAgICAgfSBlbHNpZiAoL0RPX05PVF9DT01N SVQvKSB7CiAgICAgICAgICAgICAgICAgICAgIHByaW50IFNUREVSUiAiV0FSTklORzogZmlsZSAk ZmlsZSBjb250YWlucyB0aGUgc3RyaW5nIERPX05PVF9DT01NSVQsIGxpbmUgJC5cbiI7CiAgICAg ICAgICAgICAgICAgfQpAQCAtMjU2LDU4ICsyODEsODIgQEAgc3ViIGdlbmVyYXRlRnVuY3Rpb25M aXN0cygkJCQkJCkKICAgICB9CiAKICAgICAjIEZvciBlYWNoIHNvdXJjZSBmaWxlLCBjb252ZXJ0 IGxpbmUgcmFuZ2UgdG8gZnVuY3Rpb24gbGlzdC4KLSAgICBpZiAoJWNoYW5nZWRfbGluZV9yYW5n ZXMpIHsKKyAgICBpZiAoJWxpbmVfcmFuZ2VzX2FmdGVyX2NoYW5nZWQgYW5kICVsaW5lX3Jhbmdl c19iZWZvcmVfY2hhbmdlZCkgewogICAgICAgICBwcmludCBTVERFUlIgIiAgRXh0cmFjdGluZyBh ZmZlY3RlZCBmdW5jdGlvbiBuYW1lcyBmcm9tIHNvdXJjZSBmaWxlcy5cbiI7Ci0gICAgICAgIGZv cmVhY2ggbXkgJGZpbGUgKGtleXMgJWNoYW5nZWRfbGluZV9yYW5nZXMpIHsKKyAgICAgICAgZm9y ZWFjaCBteSAkZmlsZSAoa2V5cyAlbGluZV9yYW5nZXNfYWZ0ZXJfY2hhbmdlZCkgewogICAgICAg ICAgICAgIyBGaW5kIGFsbCB0aGUgZnVuY3Rpb25zIGluIHRoZSBmaWxlLgogICAgICAgICAgICAg b3BlbiBTT1VSQ0UsICRmaWxlIG9yIG5leHQ7CiAgICAgICAgICAgICBteSBAZnVuY3Rpb25fcmFu Z2VzID0gZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzKFwqU09VUkNFLCAkZmlsZSk7CiAgICAgICAg ICAgICBjbG9zZSBTT1VSQ0U7CiAKLSAgICAgICAgICAgICMgRmluZCBhbGwgdGhlIG1vZGlmaWVk IGZ1bmN0aW9ucy4KLSAgICAgICAgICAgIG15IEBmdW5jdGlvbnM7CisgICAgICAgICAgICBteSBA Y2hhbmdlX3JhbmdlcyA9IChAeyRsaW5lX3Jhbmdlc19hZnRlcl9jaGFuZ2VkeyRmaWxlfX0sIFtd KTsKICAgICAgICAgICAgIG15ICVzYXdfZnVuY3Rpb247Ci0gICAgICAgICAgICBteSBAY2hhbmdl X3JhbmdlcyA9IChAeyRjaGFuZ2VkX2xpbmVfcmFuZ2VzeyRmaWxlfX0sIFtdKTsKLSAgICAgICAg ICAgIG15IEBjaGFuZ2VfcmFuZ2UgPSAoMCwgMCk7Ci0gICAgICAgICAgICBGVU5DVElPTjogZm9y ZWFjaCBteSAkZnVuY3Rpb25fcmFuZ2VfcmVmIChAZnVuY3Rpb25fcmFuZ2VzKSB7Ci0gICAgICAg ICAgICAgICAgbXkgQGZ1bmN0aW9uX3JhbmdlID0gQCRmdW5jdGlvbl9yYW5nZV9yZWY7Ci0KLSAg ICAgICAgICAgICAgICAjIEZJWE1FOiBUaGlzIGlzIGEgaGFjay4gSWYgdGhlIGZ1bmN0aW9uIG5h bWUgaXMgZW1wdHksIHNraXAgaXQuCi0gICAgICAgICAgICAgICAgIyBUaGUgY3BwLCBweXRob24s IGphdmFzY3JpcHQsIHBlcmwsIGNzcyBhbmQgamF2YSBwYXJzZXJzCi0gICAgICAgICAgICAgICAg IyBhcmUgbm90IHBlcmZlY3RseSBpbXBsZW1lbnRlZCBhbmQgc29tZXRpbWVzIGZ1bmN0aW9uIG5h bWVzIGNhbm5vdCBiZSByZXRyaWV2ZWQKLSAgICAgICAgICAgICAgICAjIGNvcnJlY3RseS4gQXMg eW91IGNhbiBzZWUgaW4gZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzX1hYWFgoKSwgdGhvc2UgcGFy c2VycwotICAgICAgICAgICAgICAgICMgYXJlIG5vdCBpbnRlbmRlZCB0byBpbXBsZW1lbnQgcmVh bCBwYXJzZXJzIGJ1dCBpbnRlbmRlZCB0byBqdXN0IHJldHJpZXZlIGZ1bmN0aW9uIG5hbWVzCi0g ICAgICAgICAgICAgICAgIyBmb3IgbW9zdCBwcmFjdGljYWwgc3ludGF4ZXMuCi0gICAgICAgICAg ICAgICAgbmV4dCB1bmxlc3MgJGZ1bmN0aW9uX3JhbmdlWzJdOwotCi0gICAgICAgICAgICAgICAg IyBBZHZhbmNlIHRvIHN1Y2Nlc3NpdmUgY2hhbmdlIHJhbmdlcy4KLSAgICAgICAgICAgICAgICBm b3IgKDs7IEBjaGFuZ2VfcmFuZ2UgPSBAe3NoaWZ0IEBjaGFuZ2VfcmFuZ2VzfSkgewotICAgICAg ICAgICAgICAgICAgICBsYXN0IEZVTkNUSU9OIHVubGVzcyBAY2hhbmdlX3JhbmdlOwotCi0gICAg ICAgICAgICAgICAgICAgICMgSWYgcGFzdCB0aGlzIGZ1bmN0aW9uLCBtb3ZlIG9uIHRvIHRoZSBu ZXh0IG9uZS4KLSAgICAgICAgICAgICAgICAgICAgbmV4dCBGVU5DVElPTiBpZiAkY2hhbmdlX3Jh bmdlWzBdID4gJGZ1bmN0aW9uX3JhbmdlWzFdOwotCi0gICAgICAgICAgICAgICAgICAgICMgSWYg YW4gb3ZlcmxhcCB3aXRoIHRoaXMgZnVuY3Rpb24gcmFuZ2UsIHJlY29yZCB0aGUgZnVuY3Rpb24g bmFtZS4KLSAgICAgICAgICAgICAgICAgICAgaWYgKCRjaGFuZ2VfcmFuZ2VbMV0gPj0gJGZ1bmN0 aW9uX3JhbmdlWzBdCi0gICAgICAgICAgICAgICAgICAgICAgICBhbmQgJGNoYW5nZV9yYW5nZVsw XSA8PSAkZnVuY3Rpb25fcmFuZ2VbMV0pIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlmICgh JHNhd19mdW5jdGlvbnskZnVuY3Rpb25fcmFuZ2VbMl19KSB7Ci0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgJHNhd19mdW5jdGlvbnskZnVuY3Rpb25fcmFuZ2VbMl19ID0gMTsKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICBwdXNoIEBmdW5jdGlvbnMsICRmdW5jdGlvbl9yYW5nZVsyXTsK LSAgICAgICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAgICAgICAgIG5leHQg RlVOQ1RJT047Ci0gICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICB9Ci0gICAg ICAgICAgICB9CisgICAgICAgICAgICBteSBAZnVuY3Rpb25zID0gZ2VuZXJhdGVGdW5jdGlvbkxp c3RzQnlSYW5nZXMoJGZpbGUsIFxAY2hhbmdlX3JhbmdlcywgXEBmdW5jdGlvbl9yYW5nZXMsIFwl c2F3X2Z1bmN0aW9uKTsKIAotICAgICAgICAgICAgIyBGb3JtYXQgdGhlIGxpc3Qgb2YgZnVuY3Rp b25zIG5vdy4KKyAgICAgICAgICAgICMgRm9ybWF0IHRoZSBsaXN0IG9mIGZ1bmN0aW9ucy4KICAg ICAgICAgICAgIGlmIChAZnVuY3Rpb25zKSB7CiAgICAgICAgICAgICAgICAgJGZ1bmN0aW9uTGlz dHMtPnskZmlsZX0gPSAiIiBpZiAhZGVmaW5lZCAkZnVuY3Rpb25MaXN0cy0+eyRmaWxlfTsKICAg ICAgICAgICAgICAgICAkZnVuY3Rpb25MaXN0cy0+eyRmaWxlfSAuPSAiXG4gICAgICAgICgiIC4g am9pbigiKTpcbiAgICAgICAgKCIsIEBmdW5jdGlvbnMpIC4gIik6IjsKICAgICAgICAgICAgIH0K KworICAgICAgICAgICAgIyBGaW5kIHRoZSBkZWxldGVkIGZ1bmN0aW9ucyBpbiB0aGUgb3JpZ2lu YWwgZmlsZS4KKyAgICAgICAgICAgIG9wZW4gU09VUkNFLCAiLXwiLCBvcmlnaW5hbEZpbGUoJGZp bGUsICRnaXRDb21taXQsICRnaXRJbmRleCwgJG1lcmdlQmFzZSkgb3IgbmV4dDsKKyAgICAgICAg ICAgICAgICBteSBAZGVsZXRlZF9mdW5jdGlvbl9yYW5nZXMgPSBnZXRfZnVuY3Rpb25fbGluZV9y YW5nZXMoXCpTT1VSQ0UsICRmaWxlKTsKKyAgICAgICAgICAgIGNsb3NlIFNPVVJDRTsKKworICAg ICAgICAgICAgQGNoYW5nZV9yYW5nZXMgPSAoQHskbGluZV9yYW5nZXNfYmVmb3JlX2NoYW5nZWR7 JGZpbGV9fSwgW10pOworICAgICAgICAgICAgQGZ1bmN0aW9ucyA9IGdlbmVyYXRlRnVuY3Rpb25M aXN0c0J5UmFuZ2VzKCRmaWxlLCBcQGNoYW5nZV9yYW5nZXMsIFxAZGVsZXRlZF9mdW5jdGlvbl9y YW5nZXMsIFwlc2F3X2Z1bmN0aW9uKTsKKworICAgICAgICAgICAgIyBGb3JtYXQgdGhlIGxpc3Qg b2YgZGVsZXRlZCBmdW5jdGlvbnMuCisgICAgICAgICAgICBpZiAoQGZ1bmN0aW9ucykgeworICAg ICAgICAgICAgICAgICRmdW5jdGlvbkxpc3RzLT57JGZpbGV9ID0gIiIgaWYgIWRlZmluZWQgJGZ1 bmN0aW9uTGlzdHMtPnskZmlsZX07CisgICAgICAgICAgICAgICAgJGZ1bmN0aW9uTGlzdHMtPnsk ZmlsZX0gLj0gIlxuICAgICAgICAoIiAuIGpvaW4oIik6IERlbGV0ZWQuXG4gICAgICAgICgiLCBA ZnVuY3Rpb25zKSAuICIpOiBEZWxldGVkLiI7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAg ICB9CiB9CiAKK3N1YiBnZW5lcmF0ZUZ1bmN0aW9uTGlzdHNCeVJhbmdlcygkJCQkKQoreworICAg IG15ICgkZmlsZSwgJGNoYW5nZWRfbGluZV9yYW5nZXMsICRmdW5jdGlvbl9yYW5nZXMsICRzYXdf ZnVuY3Rpb24pID0gQF87CisKKyAgICAjIEZpbmQgYWxsIHRoZSBtb2RpZmllZCBmdW5jdGlvbnMu CisgICAgbXkgQGZ1bmN0aW9uczsKKyAgICBteSBAY2hhbmdlX3JhbmdlcyA9IEB7JGNoYW5nZWRf bGluZV9yYW5nZXN9OworICAgIG15IEBjaGFuZ2VfcmFuZ2UgPSAoMCwgMCk7CisgICAgRlVOQ1RJ T046IGZvcmVhY2ggbXkgJGZ1bmN0aW9uX3JhbmdlX3JlZiAoQHskZnVuY3Rpb25fcmFuZ2VzfSkg eworICAgICAgICBteSBAZnVuY3Rpb25fcmFuZ2UgPSBAeyRmdW5jdGlvbl9yYW5nZV9yZWZ9Owor CisgICAgICAgICMgRklYTUU6IFRoaXMgaXMgYSBoYWNrLiBJZiB0aGUgZnVuY3Rpb24gbmFtZSBp cyBlbXB0eSwgc2tpcCBpdC4KKyAgICAgICAgIyBUaGUgY3BwLCBweXRob24sIGphdmFzY3JpcHQs IHBlcmwsIGNzcyBhbmQgamF2YSBwYXJzZXJzCisgICAgICAgICMgYXJlIG5vdCBwZXJmZWN0bHkg aW1wbGVtZW50ZWQgYW5kIHNvbWV0aW1lcyBmdW5jdGlvbiBuYW1lcyBjYW5ub3QgYmUgcmV0cmll dmVkCisgICAgICAgICMgY29ycmVjdGx5LiBBcyB5b3UgY2FuIHNlZSBpbiBnZXRfZnVuY3Rpb25f bGluZV9yYW5nZXNfWFhYWCgpLCB0aG9zZSBwYXJzZXJzCisgICAgICAgICMgYXJlIG5vdCBpbnRl bmRlZCB0byBpbXBsZW1lbnQgcmVhbCBwYXJzZXJzIGJ1dCBpbnRlbmRlZCB0byBqdXN0IHJldHJp ZXZlIGZ1bmN0aW9uIG5hbWVzCisgICAgICAgICMgZm9yIG1vc3QgcHJhY3RpY2FsIHN5bnRheGVz LgorICAgICAgICBuZXh0IHVubGVzcyAkZnVuY3Rpb25fcmFuZ2VbMl07CisKKyAgICAgICAgIyBB ZHZhbmNlIHRvIHN1Y2Nlc3NpdmUgY2hhbmdlIHJhbmdlcy4KKyAgICAgICAgZm9yICg7OyBAY2hh bmdlX3JhbmdlID0gQHtzaGlmdCBAY2hhbmdlX3Jhbmdlc30pIHsKKyAgICAgICAgICAgIGxhc3Qg RlVOQ1RJT04gdW5sZXNzIEBjaGFuZ2VfcmFuZ2U7CisKKyAgICAgICAgICAgICMgSWYgcGFzdCB0 aGlzIGZ1bmN0aW9uLCBtb3ZlIG9uIHRvIHRoZSBuZXh0IG9uZS4KKyAgICAgICAgICAgIG5leHQg RlVOQ1RJT04gaWYgJGNoYW5nZV9yYW5nZVswXSA+ICRmdW5jdGlvbl9yYW5nZVsxXTsKKworICAg ICAgICAgICAgIyBJZiBhbiBvdmVybGFwIHdpdGggdGhpcyBmdW5jdGlvbiByYW5nZSwgcmVjb3Jk IHRoZSBmdW5jdGlvbiBuYW1lLgorICAgICAgICAgICAgaWYgKCRjaGFuZ2VfcmFuZ2VbMV0gPj0g JGZ1bmN0aW9uX3JhbmdlWzBdCisgICAgICAgICAgICAgICAgYW5kICRjaGFuZ2VfcmFuZ2VbMF0g PD0gJGZ1bmN0aW9uX3JhbmdlWzFdKSB7CisgICAgICAgICAgICAgICAgaWYgKCEkc2F3X2Z1bmN0 aW9uLT57JGZ1bmN0aW9uX3JhbmdlWzJdfSkgeworICAgICAgICAgICAgICAgICAgICAkc2F3X2Z1 bmN0aW9uLT57JGZ1bmN0aW9uX3JhbmdlWzJdfSA9IDE7CisgICAgICAgICAgICAgICAgICAgIHB1 c2ggQGZ1bmN0aW9ucywgJGZ1bmN0aW9uX3JhbmdlWzJdOworICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICAgICBuZXh0IEZVTkNUSU9OOworICAgICAgICAgICAgfQorICAgICAgICB9Cisg ICAgfQorCisgICAgcmV0dXJuIEBmdW5jdGlvbnM7Cit9CisKIHN1YiBjaGFuZ2VMb2dEYXRlKCQp CiB7CiAgICAgbXkgKCR0aW1lWm9uZSkgPSBAXzsKQEAgLTE4OTcsNyArMTk0Niw3IEBAIHN1YiBw cm9wZXJ0eUNoYW5nZURlc2NyaXB0aW9uKCQpCiAgICAgcmV0dXJuICRkZXNjcmlwdGlvbjsKIH0K IAotc3ViIGV4dHJhY3RMaW5lUmFuZ2UoJCkKK3N1YiBleHRyYWN0TGluZVJhbmdlQWZ0ZXJDaGFu Z2UoJCkKIHsKICAgICBteSAoJHN0cmluZykgPSBAXzsKIApAQCAtMTkxNCw2ICsxOTYzLDIzIEBA IHN1YiBleHRyYWN0TGluZVJhbmdlKCQpCiAgICAgcmV0dXJuICgkc3RhcnQsICRlbmQpOwogfQog CitzdWIgZXh0cmFjdExpbmVSYW5nZUJlZm9yZUNoYW5nZSgkKQoreworICAgIG15ICgkc3RyaW5n KSA9IEBfOworCisgICAgbXkgKCRzdGFydCwgJGVuZCkgPSAoLTEsIC0xKTsKKworICAgIGlmIChp c1NWTigpICYmICRzdHJpbmcgPX4gL14oXGQrKSgsKFxkKykpP1thY2RdXGQrKCxcZCspPy8pIHsK KyAgICAgICAgJHN0YXJ0ID0gJDE7CisgICAgICAgICRlbmQgPSAkMyB8fCAkMTsKKyAgICB9IGVs c2lmIChpc0dpdCgpICYmICRzdHJpbmcgPX4gL15AQCAtKFxkKykoLChcZCspKT8gXCtcZCsoLFxk Kyk/IEBALykgeworICAgICAgICAkc3RhcnQgPSAkMTsKKyAgICAgICAgJGVuZCA9IGRlZmluZWQo JDMpID8gJDMgKyAkMSAtIDEgOiAkMTsKKyAgICB9CisKKyAgICByZXR1cm4gKCRzdGFydCwgJGVu ZCk7Cit9CisKIHN1YiB0ZXN0TGlzdEZvckNoYW5nZUxvZyhAKQogewogICAgIG15IChAdGVzdHMp ID0gQF87Cg==