27184 SearchLocale 2009-07-11 15:22:54 -0700 Text searching with ICU should take the user’s default locale into account 2009-07-12 13:35:24 -0700 1 1 1 Unclassified WebKit Text 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 darin darin darin mitz oldest_to_newest 131144 0 darin 2009-07-11 15:22:54 -0700 The text search done in TextIterator.cpp with ICU’s usearch should take the user’s default locale into account. <rdar://problem/6812121> 131173 1 32628 darin 2009-07-12 09:30:10 -0700 Created attachment 32628 patch 131196 2 darin 2009-07-12 13:35:24 -0700 http://trac.webkit.org/changeset/45762 I wonder if I should consider AppleCollationOrder, which is set as "Order for sorted lists" in the International Language panel of System Preferences on Mac OS X. 32628 2009-07-12 09:30:10 -0700 2009-07-12 10:08:10 -0700 patch SearchLocalePatch.txt text/plain 12863 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NTc1OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDggQEAKKzIwMDktMDctMTIgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRleHQg c2VhcmNoaW5nIHdpdGggSUNVIHNob3VsZCB0YWtlIHRoZSB1c2VyJ3MgZGVmYXVsdCBsb2NhbGUg aW50byBhY2NvdW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yNzE4NAorCisgICAgICAgIE5vIHNpbXBsZSB3YXkgdG8gdGVzdCB0aGlzIHNpbmNlIGl0 J3MgZGVwZW5kZW50IG9uIHVzZXIgbG9jYWxlLgorICAgICAgICBBZnRlciB0aGlzLCB0aGUgdXNl cidzIGRlZmF1bHQgbG9jYWxlIGlzIHVzZWQgb25seSBvbiBNYWMuCisKKyAgICAgICAgKiBlZGl0 aW5nL1RleHRJdGVyYXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVTZWFyY2hlcik6 IFBhc3MgcmVzdWx0IG9mIHRoZSBjdXJyZW50U2VhcmNoTG9jYWxlSUQKKyAgICAgICAgZnVuY3Rp b24gYXMgdGhlIGxvY2FsZS4KKworICAgICAgICAqIHBsYXRmb3JtL3RleHQvVGV4dEJyZWFrSXRl cmF0b3JJbnRlcm5hbElDVS5oOiBBZGRlZCBkZWNsYXJhdGlvbiBvZgorICAgICAgICBjdXJyZW50 U2VhcmNoTG9jYWxlSUQgZnVuY3Rpb24uCisKKyAgICAgICAgKiBwbGF0Zm9ybS90ZXh0L2FuZHJv aWQvVGV4dEJyZWFrSXRlcmF0b3JJbnRlcm5hbElDVS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpj dXJyZW50U2VhcmNoTG9jYWxlSUQpOiBBZGRlZC4gUmV0dXJucyB0aGUgZW1wdHkgc3RyaW5nLgor ICAgICAgICAqIHBsYXRmb3JtL3RleHQvY2hyb21pdW0vVGV4dEJyZWFrSXRlcmF0b3JJbnRlcm5h bElDVUNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmN1cnJlbnRTZWFyY2hMb2NhbGVJ RCk6IERpdHRvLgorICAgICAgICAqIHBsYXRmb3JtL3RleHQvZ3RrL1RleHRCcmVha0l0ZXJhdG9y SW50ZXJuYWxJQ1VHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3VycmVudFNlYXJjaExvY2Fs ZUlEKTogRGl0dG8uCisKKyAgICAgICAgKiBwbGF0Zm9ybS90ZXh0L21hYy9UZXh0QnJlYWtJdGVy YXRvckludGVybmFsSUNVTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6dGV4dEJyZWFrTG9jYWxl UHJlZmVyZW5jZSk6IEFkZGVkLiBSZXR1cm5zIHRoZSB2YWx1ZSBvZgorICAgICAgICB0aGUgQXBw bGVUZXh0QnJlYWtMb2NhbGUgcHJlZmVyZW5jZS4KKyAgICAgICAgKFdlYkNvcmU6OnRvcExhbmd1 YWdlUHJlZmVyZW5jZSk6IEFkZGVkLiBSZXR1cm5zIHRoZSB2YWx1ZSBvZiB0aGUKKyAgICAgICAg Zmlyc3QgaXRlbSBpbiB0aGUgQXBwbGVMYW5ndWFnZXMgcHJlZmVyZW5jZS4KKyAgICAgICAgKFdl YkNvcmU6OmNhbm9uaWNhbExhbmd1YWdlSWRlbnRpZmllcik6IEFkZGVkLiBDb3ZlciBmb3IgdGhl CisgICAgICAgIENGTG9jYWxlQ3JlYXRlQ2Fub25pY2FsTGFuZ3VhZ2VJZGVudGlmaWVyRnJvbVN0 cmluZyBmdW5jdGlvbi4KKyAgICAgICAgKFdlYkNvcmU6OmdldExvY2FsZSk6IEFkZGVkLiBUcmFu c2ZlcnMgdGhlIGxvY2FsZSBmcm9tIGEgQ0ZTdHJpbmdSZWYKKyAgICAgICAgaW50byBhIGJ1ZmZl ci4KKyAgICAgICAgKFdlYkNvcmU6OmdldFNlYXJjaExvY2FsZSk6IEFkZGVkLiBDYWxscyB0b3BM YW5ndWFnZVByZWZlcmVuY2UsCisgICAgICAgIGNhbm9uaWNhbExhbmd1YWdlSWRlbnRpZmllciwg YW5kIGdldExvY2FsZS4KKyAgICAgICAgKFdlYkNvcmU6OmN1cnJlbnRTZWFyY2hMb2NhbGVJRCk6 IEFkZGVkLiBDYWxscyBnZXRTZWFyY2hMb2NhbGUgb25jZS4KKyAgICAgICAgKFdlYkNvcmU6Omdl dFRleHRCcmVha0xvY2FsZSk6IENoYW5nZWQgdG8gY2FsbAorICAgICAgICB0ZXh0QnJlYWtMb2Nh bGVQcmVmZXJlbmNlLCB0b3BMYW5ndWFnZVByZWZlcmVuY2UsCisgICAgICAgIGNhbm9uaWNhbExh bmd1YWdlSWRlbnRpZmllciwgYW5kIGdldExvY2FsZS4KKworICAgICAgICAqIHBsYXRmb3JtL3Rl eHQvd2luL1RleHRCcmVha0l0ZXJhdG9ySW50ZXJuYWxJQ1VXaW4uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Y3VycmVudFNlYXJjaExvY2FsZUlEKTogQWRkZWQuIFJldHVybnMgdGhlIGVtcHR5IHN0 cmluZy4KKyAgICAgICAgKiBwbGF0Zm9ybS93eC9UZW1wb3JhcnlMaW5rU3R1YnMuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Y3VycmVudFNlYXJjaExvY2FsZUlEKTogRGl0dG8uCisKIDIwMDktMDct MTEgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBTaW1vbiBGcmFzZXIuCkluZGV4OiBXZWJDb3JlL2VkaXRpbmcvVGV4dEl0ZXJhdG9yLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcvVGV4dEl0ZXJhdG9yLmNwcAkocmV2aXNpb24g NDU3NTkpCisrKyBXZWJDb3JlL2VkaXRpbmcvVGV4dEl0ZXJhdG9yLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNDIsNiArNDIsNyBAQAogI2luY2x1ZGUgInZpc2libGVfdW5pdHMuaCIKIAogI2lmIFVT RShJQ1VfVU5JQ09ERSkgJiYgIVVDT05GSUdfTk9fQ09MTEFUSU9OCisjaW5jbHVkZSAiVGV4dEJy ZWFrSXRlcmF0b3JJbnRlcm5hbElDVS5oIgogI2luY2x1ZGUgPHVuaWNvZGUvdXNlYXJjaC5oPgog I2VuZGlmCiAKQEAgLTE0MDUsMTMgKzE0MDYsOSBAQCBzdGF0aWMgVVN0cmluZ1NlYXJjaCogY3Jl YXRlU2VhcmNoZXIoKQogICAgIC8vIFByb3ZpZGUgYSBub24tZW1wdHkgcGF0dGVybiBhbmQgbm9u LWVtcHR5IHRleHQgc28gdXNlYXJjaF9vcGVuIHdpbGwgbm90IGZhaWwsCiAgICAgLy8gYnV0IGl0 IGRvZXNuJ3QgbWF0dGVyIGV4YWN0bHkgd2hhdCBpdCBpcywgc2luY2Ugd2UgZG9uJ3QgcGVyZm9y bSBhbnkgc2VhcmNoZXMKICAgICAvLyB3aXRob3V0IHNldHRpbmcgYm90aCB0aGUgcGF0dGVybiBh bmQgdGhlIHRleHQuCi0KLSAgICAvLyBQYXNzIGVtcHR5IHN0cmluZyBmb3IgdGhlIGxvY2FsZSBm b3Igbm93IHRvIGdldCB0aGUgVW5pY29kZSBDb2xsYXRpb24gQWxnb3JpdGhtLAotICAgIC8vIHJh dGhlciB0aGFuIHNvbWV0aGluZyBsb2NhbGUtc3BlY2lmaWMuCi0KICAgICBVRXJyb3JDb2RlIHN0 YXR1cyA9IFVfWkVST19FUlJPUjsKLSAgICBVU3RyaW5nU2VhcmNoKiBzZWFyY2hlciA9IHVzZWFy Y2hfb3BlbigmbmV3bGluZUNoYXJhY3RlciwgMSwgJm5ld2xpbmVDaGFyYWN0ZXIsIDEsICIiLCAw LCAmc3RhdHVzKTsKLSAgICBBU1NFUlQoc3RhdHVzID09IFVfWkVST19FUlJPUik7CisgICAgVVN0 cmluZ1NlYXJjaCogc2VhcmNoZXIgPSB1c2VhcmNoX29wZW4oJm5ld2xpbmVDaGFyYWN0ZXIsIDEs ICZuZXdsaW5lQ2hhcmFjdGVyLCAxLCBjdXJyZW50U2VhcmNoTG9jYWxlSUQoKSwgMCwgJnN0YXR1 cyk7CisgICAgQVNTRVJUKHN0YXR1cyA9PSBVX1pFUk9fRVJST1IgfHwgc3RhdHVzID09IFVfVVNJ TkdfRkFMTEJBQ0tfV0FSTklORyk7CiAgICAgcmV0dXJuIHNlYXJjaGVyOwogfQogCkluZGV4OiBX ZWJDb3JlL3BsYXRmb3JtL3RleHQvVGV4dEJyZWFrSXRlcmF0b3JJbnRlcm5hbElDVS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vdGV4dC9UZXh0QnJlYWtJdGVyYXRvckludGVybmFs SUNVLmgJKHJldmlzaW9uIDQ1NzU5KQorKysgV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1RleHRCcmVh a0l0ZXJhdG9ySW50ZXJuYWxJQ1UuaAkod29ya2luZyBjb3B5KQpAQCAtMjEsMTAgKzIxLDEyIEBA CiAjaWZuZGVmIFRleHRCcmVha0l0ZXJhdG9ySW50ZXJuYWxJQ1VfaAogI2RlZmluZSBUZXh0QnJl YWtJdGVyYXRvckludGVybmFsSUNVX2gKIAotI2luY2x1ZGUgPHd0Zi91bmljb2RlL1VuaWNvZGUu aD4KKy8vIEZJWE1FOiBOb3cgdGhhdCB0aGlzIGhhbmRsZXMgbG9jYWxlcyBmb3IgSUNVLCBub3Qg anVzdCBmb3IgdGV4dCBicmVha2luZywKKy8vIHRoaXMgZmlsZSBhbmQgdGhlIHZhcmlvdXMgaW1w bGVtZW50YXRpb24gZmlsZXMgc2hvdWxkIGJlIHJlbmFtZWQuCiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAorICAgIGNvbnN0IGNoYXIqIGN1cnJlbnRTZWFyY2hMb2NhbGVJRCgpOwogICAgIGNvbnN0 IGNoYXIqIGN1cnJlbnRUZXh0QnJlYWtMb2NhbGVJRCgpOwogCiB9CkluZGV4OiBXZWJDb3JlL3Bs YXRmb3JtL3RleHQvYW5kcm9pZC9UZXh0QnJlYWtJdGVyYXRvckludGVybmFsSUNVLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL3RleHQvYW5kcm9pZC9UZXh0QnJlYWtJdGVyYXRv ckludGVybmFsSUNVLmNwcAkocmV2aXNpb24gNDU3NTkpCisrKyBXZWJDb3JlL3BsYXRmb3JtL3Rl eHQvYW5kcm9pZC9UZXh0QnJlYWtJdGVyYXRvckludGVybmFsSUNVLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjgsOCArMjgsMTUgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitjb25zdCBjaGFy KiBjdXJyZW50U2VhcmNoTG9jYWxlSUQoKQoreworICAgIC8vIEZJWE1FOiBTaG91bGQgdXNlIHN5 c3RlbSBsb2NhbGUuCisgICAgcmV0dXJuICIiOworfQorCiBjb25zdCBjaGFyKiBjdXJyZW50VGV4 dEJyZWFrTG9jYWxlSUQoKQogeworICAgIC8vIEZJWE1FOiBTaG91bGQgdXNlIHN5c3RlbSBsb2Nh bGUuCiAgICAgcmV0dXJuICJlbl91cyI7CiB9CiAKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vdGV4 dC9jaHJvbWl1bS9UZXh0QnJlYWtJdGVyYXRvckludGVybmFsSUNVQ2hyb21pdW0uY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vdGV4dC9jaHJvbWl1bS9UZXh0QnJlYWtJdGVyYXRv ckludGVybmFsSUNVQ2hyb21pdW0uY3BwCShyZXZpc2lvbiA0NTc1OSkKKysrIFdlYkNvcmUvcGxh dGZvcm0vdGV4dC9jaHJvbWl1bS9UZXh0QnJlYWtJdGVyYXRvckludGVybmFsSUNVQ2hyb21pdW0u Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNCw4ICsyNCwxNSBAQAogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKK2NvbnN0IGNoYXIqIGN1cnJlbnRTZWFyY2hMb2NhbGVJRCgpCit7CisgICAgLy8gRklY TUU6IFNob3VsZCB1c2Ugc3lzdGVtIGxvY2FsZS4KKyAgICByZXR1cm4gIiI7Cit9CisKIGNvbnN0 IGNoYXIqIGN1cnJlbnRUZXh0QnJlYWtMb2NhbGVJRCgpCiB7CisgICAgLy8gRklYTUU6IFNob3Vs ZCB1c2Ugc3lzdGVtIGxvY2FsZS4KICAgICByZXR1cm4gImVuX3VzIjsKIH0KIApJbmRleDogV2Vi Q29yZS9wbGF0Zm9ybS90ZXh0L2d0ay9UZXh0QnJlYWtJdGVyYXRvckludGVybmFsSUNVR3RrLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL3RleHQvZ3RrL1RleHRCcmVha0l0ZXJh dG9ySW50ZXJuYWxJQ1VHdGsuY3BwCShyZXZpc2lvbiA0NTc1OSkKKysrIFdlYkNvcmUvcGxhdGZv cm0vdGV4dC9ndGsvVGV4dEJyZWFrSXRlcmF0b3JJbnRlcm5hbElDVUd0ay5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTIyLDggKzIyLDE1IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY29uc3Qg Y2hhciogY3VycmVudFNlYXJjaExvY2FsZUlEKCkKK3sKKyAgICAvLyBGSVhNRTogU2hvdWxkIHVz ZSBzeXN0ZW0gbG9jYWxlLgorICAgIHJldHVybiAiIjsKK30KKwogY29uc3QgY2hhciogY3VycmVu dFRleHRCcmVha0xvY2FsZUlEKCkKIHsKKyAgICAvLyBGSVhNRTogU2hvdWxkIHVzZSBzeXN0ZW0g bG9jYWxlLgogICAgIHJldHVybiAiZW5fdXMiOwogfQogCkluZGV4OiBXZWJDb3JlL3BsYXRmb3Jt L3RleHQvbWFjL1RleHRCcmVha0l0ZXJhdG9ySW50ZXJuYWxJQ1VNYWMubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L21hYy9UZXh0QnJlYWtJdGVyYXRvckludGVybmFsSUNV TWFjLm1tCShyZXZpc2lvbiA0NTc1OSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vdGV4dC9tYWMvVGV4 dEJyZWFrSXRlcmF0b3JJbnRlcm5hbElDVU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsx LDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA5IEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNh biByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCiAgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9m IHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAtMjEsNDEgKzIxLDc5IEBACiAjaW5j bHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiVGV4dEJyZWFrSXRlcmF0b3JJbnRlcm5hbElDVS5o IgogCisjaW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK IHN0YXRpYyBjb25zdCBpbnQgbWF4TG9jYWxlU3RyaW5nTGVuZ3RoID0gMzI7CiAKLS8vIFRoaXMg Y29kZSB3YXMgc3dpcGVkIGZyb20gdGhlIENhcmJvbkNvcmUgVW5pY29kZVV0aWxpdGllcy4gT25l IGNoYW5nZSBmcm9tIHRoYXQgaXMgdG8gdXNlIHRoZSBlbXB0eQotLy8gc3RyaW5nIGluc3RlYWQg b2YgdGhlICJvbGQgbG9jYWxlIG1vZGVsIiBhcyB0aGUgdWx0aW1hdGUgZmFsbGJhY2suIFRoaXMg Y2hhbmdlIGlzIHBlciB0aGUgVW5pY29kZVV0aWxpdGllcwotLy8gZW5naW5lZXIuCi1zdGF0aWMg dm9pZCBnZXRUZXh0QnJlYWtMb2NhbGUoY2hhciBsb2NhbGVTdHJpbmdCdWZmZXJbbWF4TG9jYWxl U3RyaW5nTGVuZ3RoXSkKK3N0YXRpYyBpbmxpbmUgUmV0YWluUHRyPENGU3RyaW5nUmVmPiB0ZXh0 QnJlYWtMb2NhbGVQcmVmZXJlbmNlKCkKIHsKLSAgICAvLyBFbXB0eSBzdHJpbmcgbWVhbnMgInJv b3QgbG9jYWxlIiwgd2hpY2ggaXMgd2hhdCB3ZSB1c2UgaWYgd2UgY2FuJ3QgdXNlIGEgcHJlZi4K KyAgICBSZXRhaW5QdHI8Q0ZQcm9wZXJ0eUxpc3RSZWY+IGxvY2FsZShBZG9wdENGLCBDRlByZWZl cmVuY2VzQ29weVZhbHVlKENGU1RSKCJBcHBsZVRleHRCcmVha0xvY2FsZSIpLAorICAgICAgICBr Q0ZQcmVmZXJlbmNlc0FueUFwcGxpY2F0aW9uLCBrQ0ZQcmVmZXJlbmNlc0N1cnJlbnRVc2VyLCBr Q0ZQcmVmZXJlbmNlc0FueUhvc3QpKTsKKyAgICBpZiAoIWxvY2FsZSB8fCBDRkdldFR5cGVJRChs b2NhbGUuZ2V0KCkpICE9IENGU3RyaW5nR2V0VHlwZUlEKCkpCisgICAgICAgIHJldHVybiAwOwor ICAgIHJldHVybiBzdGF0aWNfY2FzdDxDRlN0cmluZ1JlZj4obG9jYWxlLmdldCgpKTsKK30KIAot ICAgIC8vIFdlIGdldCB0aGUgcGFydHMgc3RyaW5nIGZyb20gQXBwbGVUZXh0QnJlYWtMb2NhbGUg cHJlZi4KLSAgICAvLyBJZiB0aGF0IGZhaWxzIHRoZW4gbG9vayBmb3IgdGhlIGZpcnN0IGxhbmd1 YWdlIGluIHRoZSBBcHBsZUxhbmd1YWdlcyBwcmVmLgotICAgIENGU3RyaW5nUmVmIHByZWZMb2Nh bGVTdHIgPSAoQ0ZTdHJpbmdSZWYpQ0ZQcmVmZXJlbmNlc0NvcHlWYWx1ZShDRlNUUigiQXBwbGVU ZXh0QnJlYWtMb2NhbGUiKSwKLSAgICAgICAga0NGUHJlZmVyZW5jZXNBbnlBcHBsaWNhdGlvbiwg a0NGUHJlZmVyZW5jZXNDdXJyZW50VXNlciwga0NGUHJlZmVyZW5jZXNBbnlIb3N0KTsKLSAgICBp ZiAoIXByZWZMb2NhbGVTdHIpIHsKLSAgICAgICAgQ0ZBcnJheVJlZiBhcHBsZUxhbmdBcnIgPSAo Q0ZBcnJheVJlZilDRlByZWZlcmVuY2VzQ29weVZhbHVlKENGU1RSKCJBcHBsZUxhbmd1YWdlcyIp LAotICAgICAgICAgICAga0NGUHJlZmVyZW5jZXNBbnlBcHBsaWNhdGlvbiwga0NGUHJlZmVyZW5j ZXNDdXJyZW50VXNlciwga0NGUHJlZmVyZW5jZXNBbnlIb3N0KTsKLSAgICAgICAgaWYgKGFwcGxl TGFuZ0FycikgIHsKLSAgICAgICAgICAgIC8vIFRha2UgdGhlIHRvcG1vc3QgbGFuZ3VhZ2UuIFJl dGFpbiBzbyB0aGF0IHdlIGNhbiBibGluZGx5IHJlbGVhc2UgbGF0ZXIuICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgCi0gICAgICAgICAgICBwcmVmTG9jYWxlU3RyID0g KENGU3RyaW5nUmVmKUNGQXJyYXlHZXRWYWx1ZUF0SW5kZXgoYXBwbGVMYW5nQXJyLCAwKTsKLSAg ICAgICAgICAgIGlmIChwcmVmTG9jYWxlU3RyKQotICAgICAgICAgICAgICAgIENGUmV0YWluKHBy ZWZMb2NhbGVTdHIpOyAKLSAgICAgICAgICAgIENGUmVsZWFzZShhcHBsZUxhbmdBcnIpOwotICAg ICAgICB9Ci0gICAgfQotICAgIGlmIChwcmVmTG9jYWxlU3RyKSB7Ci0gICAgICAgIC8vIENhbm9u aWNhbGl6ZSBwcmVmIHN0cmluZyBpbiBjYXNlIGl0IGlzIG5vdCBpbiB0aGUgY2Fub25pY2FsIGZv cm1hdC4KLSAgICAgICAgQ0ZTdHJpbmdSZWYgY2Fub25Mb2NhbGVDRlN0ciA9IENGTG9jYWxlQ3Jl YXRlQ2Fub25pY2FsTGFuZ3VhZ2VJZGVudGlmaWVyRnJvbVN0cmluZyhrQ0ZBbGxvY2F0b3JEZWZh dWx0LCBwcmVmTG9jYWxlU3RyKTsKLSAgICAgICAgaWYgKGNhbm9uTG9jYWxlQ0ZTdHIpIHsKLSAg ICAgICAgICAgIENGU3RyaW5nR2V0Q1N0cmluZyhjYW5vbkxvY2FsZUNGU3RyLCBsb2NhbGVTdHJp bmdCdWZmZXIsIG1heExvY2FsZVN0cmluZ0xlbmd0aCwga0NGU3RyaW5nRW5jb2RpbmdBU0NJSSk7 Ci0gICAgICAgICAgICBDRlJlbGVhc2UoY2Fub25Mb2NhbGVDRlN0cik7Ci0gICAgICAgIH0KLSAg ICAgICAgQ0ZSZWxlYXNlKHByZWZMb2NhbGVTdHIpOworc3RhdGljIFJldGFpblB0cjxDRlN0cmlu Z1JlZj4gdG9wTGFuZ3VhZ2VQcmVmZXJlbmNlKCkKK3sKKyAgICBSZXRhaW5QdHI8Q0ZQcm9wZXJ0 eUxpc3RSZWY+IGxhbmd1YWdlcyhBZG9wdENGLCBDRlByZWZlcmVuY2VzQ29weVZhbHVlKENGU1RS KCJBcHBsZUxhbmd1YWdlcyIpLAorICAgICAgICBrQ0ZQcmVmZXJlbmNlc0FueUFwcGxpY2F0aW9u LCBrQ0ZQcmVmZXJlbmNlc0N1cnJlbnRVc2VyLCBrQ0ZQcmVmZXJlbmNlc0FueUhvc3QpKTsKKyAg ICBpZiAoIWxhbmd1YWdlcyB8fCBDRkdldFR5cGVJRChsYW5ndWFnZXMuZ2V0KCkpICE9IENGQXJy YXlHZXRUeXBlSUQoKSkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgQ0ZBcnJheVJlZiBsYW5ndWFn ZXNBcnJheSA9IHN0YXRpY19jYXN0PENGQXJyYXlSZWY+KGxhbmd1YWdlcy5nZXQoKSk7CisgICAg aWYgKENGQXJyYXlHZXRDb3VudChsYW5ndWFnZXNBcnJheSkgPCAxKQorICAgICAgICByZXR1cm4g MDsKKyAgICBjb25zdCB2b2lkKiB2YWx1ZSA9IENGQXJyYXlHZXRWYWx1ZUF0SW5kZXgobGFuZ3Vh Z2VzQXJyYXksIDApOworICAgIGlmICghdmFsdWUgfHwgQ0ZHZXRUeXBlSUQodmFsdWUpICE9IENG U3RyaW5nR2V0VHlwZUlEKCkpCisgICAgICAgIHJldHVybiAwOworICAgIHJldHVybiBzdGF0aWNf Y2FzdDxDRlN0cmluZ1JlZj4odmFsdWUpOworfQorCitzdGF0aWMgUmV0YWluUHRyPENGU3RyaW5n UmVmPiBjYW5vbmljYWxMYW5ndWFnZUlkZW50aWZpZXIoQ0ZTdHJpbmdSZWYgbG9jYWxlKQorewor ICAgIGlmICghbG9jYWxlKQorICAgICAgICByZXR1cm4gMDsKKyAgICBSZXRhaW5QdHI8Q0ZTdHJp bmdSZWY+IGNhbm9uaWNhbExvY2FsZShBZG9wdENGLAorICAgICAgICBDRkxvY2FsZUNyZWF0ZUNh bm9uaWNhbExhbmd1YWdlSWRlbnRpZmllckZyb21TdHJpbmcoa0NGQWxsb2NhdG9yRGVmYXVsdCwg bG9jYWxlKSk7CisgICAgaWYgKCFjYW5vbmljYWxMb2NhbGUpCisgICAgICAgIHJldHVybiBsb2Nh bGU7CisgICAgcmV0dXJuIGNhbm9uaWNhbExvY2FsZTsKK30KKworc3RhdGljIHZvaWQgZ2V0TG9j YWxlKENGU3RyaW5nUmVmIGxvY2FsZSwgY2hhciBsb2NhbGVTdHJpbmdCdWZmZXJbbWF4TG9jYWxl U3RyaW5nTGVuZ3RoXSkKK3sKKyAgICAvLyBFbXB0eSBzdHJpbmcgbWVhbnMgInJvb3QgbG9jYWxl IiwgYW5kIHRoYXQgaXMgd2hhdCB3ZSB1c2UgaWYgd2UgY2FuJ3QgZ2V0IGEgcHJlZmVyZW5jZS4K KyAgICBsb2NhbGVTdHJpbmdCdWZmZXJbMF0gPSAwOworICAgIGlmICghbG9jYWxlKQorICAgICAg ICByZXR1cm47CisgICAgQ0ZTdHJpbmdHZXRDU3RyaW5nKGxvY2FsZSwgbG9jYWxlU3RyaW5nQnVm ZmVyLCBtYXhMb2NhbGVTdHJpbmdMZW5ndGgsIGtDRlN0cmluZ0VuY29kaW5nQVNDSUkpOworfQor CitzdGF0aWMgdm9pZCBnZXRTZWFyY2hMb2NhbGUoY2hhciBsb2NhbGVTdHJpbmdCdWZmZXJbbWF4 TG9jYWxlU3RyaW5nTGVuZ3RoXSkKK3sKKyAgICBnZXRMb2NhbGUoY2Fub25pY2FsTGFuZ3VhZ2VJ ZGVudGlmaWVyKHRvcExhbmd1YWdlUHJlZmVyZW5jZSgpLmdldCgpKS5nZXQoKSwgbG9jYWxlU3Ry aW5nQnVmZmVyKTsKK30KKworY29uc3QgY2hhciogY3VycmVudFNlYXJjaExvY2FsZUlEKCkKK3sK KyAgICBzdGF0aWMgY2hhciBsb2NhbGVTdHJpbmdCdWZmZXJbbWF4TG9jYWxlU3RyaW5nTGVuZ3Ro XTsKKyAgICBzdGF0aWMgYm9vbCBnb3RTZWFyY2hMb2NhbGUgPSBmYWxzZTsKKyAgICBpZiAoIWdv dFNlYXJjaExvY2FsZSkgeworICAgICAgICBnZXRTZWFyY2hMb2NhbGUobG9jYWxlU3RyaW5nQnVm ZmVyKTsKKyAgICAgICAgZ290U2VhcmNoTG9jYWxlID0gdHJ1ZTsKICAgICB9CisgICAgcmV0dXJu IGxvY2FsZVN0cmluZ0J1ZmZlcjsKK30KKworc3RhdGljIHZvaWQgZ2V0VGV4dEJyZWFrTG9jYWxl KGNoYXIgbG9jYWxlU3RyaW5nQnVmZmVyW21heExvY2FsZVN0cmluZ0xlbmd0aF0pCit7CisgICAg Ly8gSWYgdGhlcmUgaXMgbm8gdGV4dCBicmVhayBsb2NhbGUsIHVzZSB0aGUgdG9wIGxhbmd1YWdl IHByZWZlcmVuY2UuCisgICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBsb2NhbGUgPSB0ZXh0QnJl YWtMb2NhbGVQcmVmZXJlbmNlKCk7CisgICAgaWYgKCFsb2NhbGUpCisgICAgICAgIGxvY2FsZSA9 IHRvcExhbmd1YWdlUHJlZmVyZW5jZSgpOworICAgIGdldExvY2FsZShjYW5vbmljYWxMYW5ndWFn ZUlkZW50aWZpZXIobG9jYWxlLmdldCgpKS5nZXQoKSwgbG9jYWxlU3RyaW5nQnVmZmVyKTsKIH0K IAogY29uc3QgY2hhciogY3VycmVudFRleHRCcmVha0xvY2FsZUlEKCkKSW5kZXg6IFdlYkNvcmUv cGxhdGZvcm0vdGV4dC93aW4vVGV4dEJyZWFrSXRlcmF0b3JJbnRlcm5hbElDVVdpbi5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L3dpbi9UZXh0QnJlYWtJdGVyYXRvcklu dGVybmFsSUNVV2luLmNwcAkocmV2aXNpb24gNDU3NTkpCisrKyBXZWJDb3JlL3BsYXRmb3JtL3Rl eHQvd2luL1RleHRCcmVha0l0ZXJhdG9ySW50ZXJuYWxJQ1VXaW4uY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yMyw2ICsyMywxMiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NvbnN0IGNoYXIq IGN1cnJlbnRTZWFyY2hMb2NhbGVJRCgpCit7CisgICAgLy8gRklYTUU6IFNob3VsZCB1c2Ugc3lz dGVtIGxvY2FsZS4KKyAgICByZXR1cm4gIiI7Cit9CisKIGNvbnN0IGNoYXIqIGN1cnJlbnRUZXh0 QnJlYWtMb2NhbGVJRCgpCiB7CiAgICAgLy8gVXNpbmcgZW5fVVNfUE9TSVggbm93IHNvIHdvcmQg c2VsZWN0aW9uIGluIGFkZHJlc3MgZmllbGQgd29ya3MgYXMgZXhwZWN0ZWQgYXMgYmVmb3JlIChk b3VibGUtY2xpY2tpbmcKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vd3gvVGVtcG9yYXJ5TGlua1N0 dWJzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL3d4L1RlbXBvcmFyeUxpbmtT dHVicy5jcHAJKHJldmlzaW9uIDQ1NzU5KQorKysgV2ViQ29yZS9wbGF0Zm9ybS93eC9UZW1wb3Jh cnlMaW5rU3R1YnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDcsNiArMTQ3LDcgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogZmxvYXQgdXNlcklkbGVUaW1lKCkgeyBub3RJbXBsZW1lbnRlZCgpOyBy ZXR1cm4gRkxUX01BWDsgfSAvLyByZXR1cm4gYW4gYXJiaXRyYXJpbHkgaGlnaCB1c2VySWRsZVRp bWUgc28gdGhhdCByZWxlYXNpbmcgcGFnZXMgZnJvbSB0aGUgcGFnZSBjYWNoZSBpc24ndCBwb3N0 cG9uZWQKIHZvaWQgZ2V0U3VwcG9ydGVkS2V5U2l6ZXMoVmVjdG9yPFN0cmluZz4mKSB7IG5vdElt cGxlbWVudGVkKCk7IH0KIFN0cmluZyBzaWduZWRQdWJsaWNLZXlBbmRDaGFsbGVuZ2VTdHJpbmco dW5zaWduZWQga2V5U2l6ZUluZGV4LCBjb25zdCBTdHJpbmcgJmNoYWxsZW5nZVN0cmluZywgY29u c3QgS1VSTCAmdXJsKSB7IHJldHVybiBTdHJpbmcoKTsgfQorY29uc3QgY2hhciogY3VycmVudFNl YXJjaExvY2FsZUlEKCkgeyBub3RJbXBsZW1lbnRlZCgpOyByZXR1cm4gImVuX3VzIjsgfQogY29u c3QgY2hhciogY3VycmVudFRleHRCcmVha0xvY2FsZUlEKCkgeyBub3RJbXBsZW1lbnRlZCgpOyBy ZXR1cm4gImVuX3VzIjsgfQogCiBTdHJpbmcgS1VSTDo6ZmlsZVN5c3RlbVBhdGgoKSBjb25zdCB7 IG5vdEltcGxlbWVudGVkKCk7IHJldHVybiBTdHJpbmcoKTsgfQo=