10342 2006-08-10 23:37:48 -0700 prepare-ChangeLog only shows removed files but not added files when files are moved 2007-05-28 14:04:12 -0700 1 1 1 Unclassified WebKit Tools / Tests 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 ddkilzer webkit-unassigned ap aroben dev+webkit ggaren oldest_to_newest 52214 0 ddkilzer 2006-08-10 23:37:48 -0700 The prepare-ChangeLog script apparently only shows the removed files, not the added files, when "svn move" is used to move source files. It should be smart enough to note the moved files (with to/from paths) when generating the ChangeLog. 38709 1 ddkilzer 2006-12-31 05:52:04 -0800 *** Bug 12021 has been marked as a duplicate of this bug. *** 8964 2 14756 ddkilzer 2007-05-28 05:48:06 -0700 Created attachment 14756 Patch v1 Proposed fix. See ChangeLog for details. 8958 3 14756 darin 2007-05-28 09:59:02 -0700 Comment on attachment 14756 Patch v1 Looks fine. r=me 8914 4 ddkilzer 2007-05-28 14:04:12 -0700 $ svn commit WebKitTools/ChangeLog WebKitTools/Scripts/prepare-ChangeLog Sending WebKitTools/ChangeLog Sending WebKitTools/Scripts/prepare-ChangeLog Transmitting file data .. Committed revision 21850. 14756 2007-05-28 05:48:06 -0700 2007-05-28 09:59:02 -0700 Patch v1 bug-10342-v1.diff text/plain 9846 ddkilzer SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDIxODM0KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMDctMDUtMjggIERhdmlkIEtpbHplciAgPGRk a2lsemVyQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgLSBmaXggaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTAzNDIKKyAgICAgICAgICBwcmVwYXJlLUNoYW5nZUxvZyBvbmx5IHNob3dzIHJlbW92ZWQgZmls ZXMgYnV0IG5vdCBhZGRlZCBmaWxlcyB3aGVuIGZpbGVzIGFyZSBtb3ZlZAorICAgICAgICAtIGZp eCBwcmVwYXJlLUNoYW5nZUxvZyBwYXJ0IG9mIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzNDA4CisgICAgICAgICAgcHJlcGFyZS1DaGFuZ2VMb2cgYW5kIHN2bi1jcmVh dGUtcGF0Y2ggZG9uJ3Qgc2hvdyByZXBsYWNlZCBmaWxlcworCisgICAgICAgIFN3aXRjaGVkIG1l dGhvZCB1c2VkIHRvIGZpbmQgbGlzdCBvZiBjaGFuZ2VkIGZpbGVzIGZyb20gImRpZmYiIHRvICJz dGF0dXMiLiAgVGhpcworICAgICAgICBtYWtlcyBhZGRlZCBhbmQgcmVwbGFjZWQgZmlsZXMgd2l0 aCBoaXN0b3J5IGFwcGVhciBpbiB0aGUgY2hhbmdlZCBmaWxlIGxpc3QuICBBZGRlZAorICAgICAg ICBjaGVjayBmb3IgIisiIGluIG91dHB1dCBmcm9tIHRoZSBzdm4gc3RhdHVzIGNvbW1hbmQgdG8g ZGV0ZWN0IGZpbGUgaGlzdG9yeSwgYW5kCisgICAgICAgIGhhbmRsZSBpdCBpbiB0aGUgZ2VuZXJh dGVGaWxlTGlzdChcQFxAXCUpIGFuZCBpbiBzdGF0dXNEZXNjcmlwdGlvbigkJCkgc3Vicm91dGlu ZXMuCisKKyAgICAgICAgKiBTY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nOgorICAgICAgICAoZGlm ZkNvbW1hbmQoQCkpOiBTd2l0Y2hlZCBhcmd1bWVudCBmcm9tIGhhc2ggcmVmIHRvIGFycmF5IHRv IG1hdGNoIHN0YXR1c0NvbW1hbmQoQCkuCisgICAgICAgIChzdGF0dXNDb21tYW5kKEApKTogU3dp dGNoZWQgYXJndW1lbnQgZnJvbSBhcnJheSByZWYgdG8gYXJyYXkuICBOZWNlc3NhcnkgdG8gdXNl CisgICAgICAgIHRoZSBvdXRwdXQgb2YgImtleXMgJHBhdGhzIiB3aXRob3V0IGNyZWF0aW5nIGEg dGVtcG9yYXJ5IGFycmF5IHZhcmlhYmxlLgorICAgICAgICAoZmluZE9yaWdpbmFsRmlsZUZyb21T dm4oJCkpOiBBZGRlZC4gIEJhc2VkIG9uIGZpbmRTb3VyY2VGaWxlQW5kUmV2aXNpb24oJCkKKyAg ICAgICAgc3Vicm91dGluZSBpbiBzdm4tY3JlYXRlLXBhdGNoLgorICAgICAgICAoZ2VuZXJhdGVG aWxlTGlzdChcQFxAXCUpKTogQWRkZWQuICBFeHRyYWN0ZWQgZnJvbSBtYWluIGJvZHkgb2Ygc2Ny aXB0LiAgUnVucyBzdGF0dXMKKyAgICAgICAgY29tbWFuZCB1c2luZyBjb21tYW5kLWxpbmUgYXJn dW1lbnRzIGluc3RlYWQgb2YgbGlzdCBvZiBjaGFuZ2VkIGZpbGVzIGZyb20gdGhlIGRpZmYKKyAg ICAgICAgY29tbWFuZC4gIENoYW5nZWQgc3ZuIHJlZ2V4IHRvIG9ubHkgYWNjZXB0IGZpbGUgc3Rh dHVzZXMgdGhhdCB3ZSBrbm93IGhvdyB0byBoYW5kbGUuCisgICAgICAgIElkZW50aWZ5IG9yaWdp bmFsIGZpbGUgd2hlbiBhbiBhZGRlZC9yZXBsYWNlZCBzdGF0dXMgaXMgcHJlc2VudC4KKyAgICAg ICAgKHN0YXR1c0Rlc2NyaXB0aW9uKCQkKSk6IEhhbmRsZWQgYWRkZWQvcmVwbGFjZWQgc3RhdHVz ZXMgd2l0aCBoaXN0b3J5LiAgQWRkZWQKKyAgICAgICAgZmFsbC10aHJvdWdoIHJldHVybiBzdGF0 ZW1lbnQuCisKIDIwMDctMDUtMjUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNv bT4KIAogICAgICAgICBGaXggYnVpbGQuCkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL3ByZXBh cmUtQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1D aGFuZ2VMb2cJKHJldmlzaW9uIDIxODMzKQorKysgV2ViS2l0VG9vbHMvU2NyaXB0cy9wcmVwYXJl LUNoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtNTYsMTQgKzU2LDE1IEBAIHVzZSB3YXJuaW5n czsKIAogdXNlIEZpbGU6OkJhc2VuYW1lOwogdXNlIEZpbGU6OlNwZWM7Ci11c2UgRmlsZTo6VGVt cDsKIHVzZSBGaW5kQmluOwogdXNlIEdldG9wdDo6TG9uZzsKIAotc3ViIGRpZmZDb21tYW5kKFwl KTsKLXN1YiBzdGF0dXNDb21tYW5kKFxAKTsKK3N1YiBkaWZmQ29tbWFuZChAKTsKK3N1YiBzdGF0 dXNDb21tYW5kKEApOwogc3ViIGNyZWF0ZVBhdGNoQ29tbWFuZCgkKTsKIHN1YiBkaWZmSGVhZGVy Rm9ybWF0KCk7CitzdWIgZmluZE9yaWdpbmFsRmlsZUZyb21Tdm4oJCk7CitzdWIgZ2VuZXJhdGVG aWxlTGlzdChcQFxAXCUpOwogc3ViIGlzTW9kaWZpZWRPckFkZGVkU3RhdHVzKCQpOwogc3ViIGlz Q29uZmxpY3RTdGF0dXMoJCk7CiBzdWIgc3RhdHVzRGVzY3JpcHRpb24oJCQpOwpAQCAtMTEyLDcw ICsxMTMsOSBAQCBteSAkR0lUID0gImdpdCI7CiAKIG15ICRjaGFuZ2VkTGF5b3V0VGVzdHMgPSAw OwogCi1teSAkRElGRk9VVCA9IG5ldyBGaWxlOjpUZW1wKFRFTVBMQVRFID0+IGJhc2VuYW1lKCQw KSAuICItWFhYWFhYWFgiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBESVIgPT4gKCRF TlZ7J1RNUERJUid9IHx8ICIvdG1wIiksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNV RkZJWCA9PiAiLmRpZmYiKTsKLW15ICRkaWZmVGVtcEZpbGUgPSAkRElGRk9VVC0+ZmlsZW5hbWUo KTsKLW15IEBkaWZmRmlsZXM7Ci0KLXByaW50IFNUREVSUiAiICBSdW5uaW5nIGRpZmYgdG8gZmlu ZCBjaGFuZ2VkLCBhZGRlZCwgb3IgcmVtb3ZlZCBmaWxlcy5cbiI7Ci1vcGVuIERJRkYsICItfCIs IGRpZmZDb21tYW5kKCVwYXRocykgb3IgZGllICJUaGUgZGlmZiBmYWlsZWQ6ICQhLlxuIjsKLQot d2hpbGUgKDxESUZGPikgewotICAgIHByaW50ICRESUZGT1VUICRfOwotICAgIHB1c2ggQGRpZmZG aWxlcywgJDEgaWYgJF8gPX4gZGlmZkhlYWRlckZvcm1hdCgpOwotfQotY2xvc2UgRElGRjsKLWNs b3NlICRESUZGT1VUOwotCi1pZiAoQGRpZmZGaWxlcykgewotICAgIHByaW50IFNUREVSUiAiICBS dW5uaW5nIHN0YXR1cyBvbiBjaGFuZ2VkLCBhZGRlZCwgb3IgcmVtb3ZlZCBmaWxlcy5cbiI7Ci0g ICAgb3BlbiBTVEFULCAiLXwiLCBzdGF0dXNDb21tYW5kKEBkaWZmRmlsZXMpIG9yIGRpZSAiVGhl IHN0YXR1cyBmYWlsZWQ6ICQhLlxuIjsKLSAgICBteSAkaW5HaXRDb21taXRTZWN0aW9uID0gMDsK LSAgICB3aGlsZSAoPFNUQVQ+KSB7Ci0gICAgICAgIG15ICRzdGF0dXM7Ci0gICAgICAgIG15ICRv cmlnaW5hbDsKLSAgICAgICAgbXkgJGZpbGU7Ci0KLSAgICAgICAgaWYgKGlzU1ZOKCkpIHsKLSAg ICAgICAgICAgIGlmICgvXihbQS1aXSkuK1xzKyguKykkLykgewotICAgICAgICAgICAgICAgICAg JHN0YXR1cyA9ICQxOwotICAgICAgICAgICAgICAgICAgJGZpbGUgPSAkMjsKLSAgICAgICAgICAg IH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgcHJpbnQ7ICAjIGVycm9yIG91dHB1dCBmcm9tIHN2 biBzdGF0Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0gZWxzaWYgKGlzR2l0KCkpIHsKLSAgICAg ICAgICAgIGlmICgvXiMgQ2hhbmdlcyB0byBiZSBjb21taXR0ZWQ6JC8gfHwgL14jIENoYW5nZWQg YnV0IG5vdCB1cGRhdGVkOiQvKSB7Ci0gICAgICAgICAgICAgICAgJGluR2l0Q29tbWl0U2VjdGlv biA9IDE7Ci0gICAgICAgICAgICAgICAgbmV4dDsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAg IGxhc3QgaWYgJGluR2l0Q29tbWl0U2VjdGlvbiAmJiAvXiMgXFMvOworZ2VuZXJhdGVGaWxlTGlz dChAY2hhbmdlZF9maWxlcywgQGNvbmZsaWN0X2ZpbGVzLCAlZnVuY3Rpb25fbGlzdHMpOwogCi0g ICAgICAgICAgICBpZiAoJGluR2l0Q29tbWl0U2VjdGlvbiAmJiAvXiNccysoW146XSspOlxzKygo LispIC0+ICk/KC4rKSQvKSB7Ci0gICAgICAgICAgICAgICAgJHN0YXR1cyA9ICQxOwotICAgICAg ICAgICAgICAgICRvcmlnaW5hbCA9ICQzOwotICAgICAgICAgICAgICAgICRmaWxlID0gJDQ7Ci0g ICAgICAgICAgICB9Ci0gICAgICAgIH0KLQotICAgICAgICBuZXh0IHVubGVzcyAkc3RhdHVzOwot Ci0gICAgICAgICRmaWxlID0gbWFrZUZpbGVQYXRoUmVsYXRpdmUoJGZpbGUpOwotCi0gICAgICAg IGlmIChpc01vZGlmaWVkT3JBZGRlZFN0YXR1cygkc3RhdHVzKSkgewotICAgICAgICAgICAgbXkg QGNvbXBvbmVudHMgPSBGaWxlOjpTcGVjLT5zcGxpdGRpcigkZmlsZSk7Ci0gICAgICAgICAgICAk Y2hhbmdlZExheW91dFRlc3RzID0gMSBpZiAkY29tcG9uZW50c1swXSBlcSAiTGF5b3V0VGVzdHMi OwotICAgICAgICAgICAgcHVzaCBAY2hhbmdlZF9maWxlcywgJGZpbGUgaWYgJGNvbXBvbmVudHNb JCNjb21wb25lbnRzXSBuZSAiQ2hhbmdlTG9nIjsKLSAgICAgICAgfSBlbHNpZiAoaXNDb25mbGlj dFN0YXR1cygkc3RhdHVzKSkgewotICAgICAgICAgICAgcHVzaCBAY29uZmxpY3RfZmlsZXMsICRm aWxlOwotICAgICAgICB9Ci0gICAgICAgIG15ICRkZXNjcmlwdGlvbiA9IHN0YXR1c0Rlc2NyaXB0 aW9uKCRzdGF0dXMsICRvcmlnaW5hbCk7Ci0gICAgICAgICRmdW5jdGlvbl9saXN0c3skZmlsZX0g PSAkZGVzY3JpcHRpb24gaWYgZGVmaW5lZCAkZGVzY3JpcHRpb247Ci0gICAgfQotICAgIGNsb3Nl IFNUQVQ7Ci19Ci0KLWlmICghQGRpZmZGaWxlcyB8fCAhJWZ1bmN0aW9uX2xpc3RzKSB7CitpZiAo IUBjaGFuZ2VkX2ZpbGVzICYmICFAY29uZmxpY3RfZmlsZXMgfHwgISVmdW5jdGlvbl9saXN0cykg ewogICAgIHByaW50IFNUREVSUiAiICBObyBjaGFuZ2VzIGZvdW5kLlxuIjsKICAgICBleGl0IDE7 CiB9CkBAIC0xOTMsNyArMTMzLDcgQEAgaWYgKEBjaGFuZ2VkX2ZpbGVzKSB7CiAgICAgIyBVc2Ug bGluZSBudW1iZXJzIGZyb20gdGhlICJhZnRlciIgc2lkZSBvZiBlYWNoIGRpZmYuCiAgICAgcHJp bnQgU1RERVJSICIgIFJldmlld2luZyBkaWZmIHRvIGRldGVybWluZSB3aGljaCBsaW5lcyBjaGFu Z2VkLlxuIjsKICAgICBteSAkZmlsZTsKLSAgICBvcGVuIERJRkYsICI8ICRkaWZmVGVtcEZpbGUi IG9yIGRpZSAiT3BlbmluZyAkZGlmZlRlbXBGaWxlIGZhaWxlZDogJCEuXG4iOworICAgIG9wZW4g RElGRiwgIi18IiwgZGlmZkNvbW1hbmQoQGNoYW5nZWRfZmlsZXMpIG9yIGRpZSAiVGhlIGRpZmYg ZmFpbGVkOiAkIS5cbiI7CiAgICAgd2hpbGUgKDxESUZGPikgewogICAgICAgICAkZmlsZSA9IG1h a2VGaWxlUGF0aFJlbGF0aXZlKCQxKSBpZiAkXyA9fiBkaWZmSGVhZGVyRm9ybWF0KCk7CiAgICAg ICAgIGlmIChkZWZpbmVkICRmaWxlKSB7CkBAIC0zMzMsOCArMjczLDkgQEAgZm9yZWFjaCBteSAk cHJlZml4IChzb3J0IGtleXMgJWZpbGVzKSB7CiAjIFdyaXRlIG91dCBhbm90aGVyIGRpZmYuCiBp ZiAoJHNwZXdEaWZmICYmIEBjaGFuZ2VkX2ZpbGVzKSB7CiAgICAgcHJpbnQgU1RERVJSICIgIFJ1 bm5pbmcgZGlmZiB0byBoZWxwIHlvdSB3cml0ZSB0aGUgQ2hhbmdlTG9nIGVudHJpZXMuXG4iOwor ICAgIGxvY2FsICQvID0gdW5kZWY7ICMgbG9jYWwgc2x1cnAgbW9kZQogICAgIG9wZW4gRElGRiwg Ii18IiwgY3JlYXRlUGF0Y2hDb21tYW5kKCRjaGFuZ2VkX2ZpbGVzX3N0cmluZykgb3IgZGllICJU aGUgZGlmZiBmYWlsZWQ6ICQhLlxuIjsKLSAgICB3aGlsZSAoPERJRkY+KSB7IHByaW50OyB9Cisg ICAgcHJpbnQgPERJRkY+OwogICAgIGNsb3NlIERJRkY7CiB9CiAKQEAgLTkyMiw5ICs4NjMsOSBA QCBzdWIgcHJvY2Vzc1BhdGhzKFxAKQogICAgIHJldHVybiAlcmVzdWx0OwogfQogCi1zdWIgZGlm ZkNvbW1hbmQoXCUpCitzdWIgZGlmZkNvbW1hbmQoQCkKIHsKLSAgICBteSAoJHBhdGhzKSA9IEBf OworICAgIG15IEBwYXRocyA9IEBfOwogCiAgICAgbXkgJHByZWZpeDsKICAgICBpZiAoaXNTVk4o KSkgewpAQCAtOTMzLDE0ICs4NzQsMTQgQEAgc3ViIGRpZmZDb21tYW5kKFwlKQogICAgICAgICAk cHJlZml4ID0gIiRHSVQgZGlmZiBIRUFEIC0tIjsKICAgICB9CiAKLSAgICByZXR1cm4gIiRwcmVm aXggJyIgLiBqb2luKCInICciLCBrZXlzICV7JHBhdGhzfSkgLiAiJyI7CisgICAgcmV0dXJuICIk cHJlZml4ICciIC4gam9pbigiJyAnIiwgQHBhdGhzKSAuICInIjsKIH0KIAotc3ViIHN0YXR1c0Nv bW1hbmQoXEApCitzdWIgc3RhdHVzQ29tbWFuZChAKQogewotICAgIG15ICgkZmlsZXMpID0gQF87 CisgICAgbXkgQGZpbGVzID0gQF87CiAKLSAgICBteSAkZmlsZXNTdHJpbmcgPSAiJyIgLiBqb2lu ICgiJyAnIiwgQHskZmlsZXN9KSAuICInIjsKKyAgICBteSAkZmlsZXNTdHJpbmcgPSAiJyIgLiBq b2luICgiJyAnIiwgQGZpbGVzKSAuICInIjsKICAgICBteSAkY29tbWFuZDsKICAgICBpZiAoaXNT Vk4oKSkgewogICAgICAgICAkY29tbWFuZCA9ICIkU1ZOIHN0YXQgJGZpbGVzU3RyaW5nIjsKQEAg LTk2Nyw2ICs5MDgsODAgQEAgc3ViIGRpZmZIZWFkZXJGb3JtYXQoKQogICAgIHJldHVybiBxci9e ZGlmZiAtLWdpdCBhXC8uKyBiXC8oLispJC8gaWYgaXNHaXQoKTsKIH0KIAorc3ViIGZpbmRPcmln aW5hbEZpbGVGcm9tU3ZuKCQpCit7CisgICAgbXkgKCRmaWxlKSA9IEBfOworICAgIG15ICRiYXNl VXJsOworICAgIG9wZW4gSU5GTywgIiRTVk4gaW5mbyAuIHwiIG9yIGRpZTsKKyAgICB3aGlsZSAo PElORk8+KSB7CisgICAgICAgIGlmICgvXlVSTDogKC4rKS8pIHsKKyAgICAgICAgICAgICRiYXNl VXJsID0gJDE7CisgICAgICAgICAgICBsYXN0OworICAgICAgICB9CisgICAgfQorICAgIGNsb3Nl IElORk87CisgICAgbXkgJHNvdXJjZUZpbGU7CisgICAgb3BlbiBJTkZPLCAiJFNWTiBpbmZvICck ZmlsZScgfCIgb3IgZGllOworICAgIHdoaWxlICg8SU5GTz4pIHsKKyAgICAgICAgaWYgKC9eQ29w aWVkIEZyb20gVVJMOiAoLispLykgeworICAgICAgICAgICAgJHNvdXJjZUZpbGUgPSBGaWxlOjpT cGVjLT5hYnMycmVsKCQxLCAkYmFzZVVybCk7CisgICAgICAgICAgICBsYXN0OworICAgICAgICB9 CisgICAgfQorICAgIGNsb3NlIElORk87CisgICAgcmV0dXJuICRzb3VyY2VGaWxlOworfQorCitz dWIgZ2VuZXJhdGVGaWxlTGlzdChcQFxAXCUpCit7CisgICAgbXkgKCRjaGFuZ2VkRmlsZXMsICRj b25mbGljdEZpbGVzLCAkZnVuY3Rpb25MaXN0cykgPSBAXzsKKyAgICBwcmludCBTVERFUlIgIiAg UnVubmluZyBzdGF0dXMgdG8gZmluZCBjaGFuZ2VkLCBhZGRlZCwgb3IgcmVtb3ZlZCBmaWxlcy5c biI7CisgICAgb3BlbiBTVEFULCAiLXwiLCBzdGF0dXNDb21tYW5kKGtleXMgJXBhdGhzKSBvciBk aWUgIlRoZSBzdGF0dXMgZmFpbGVkOiAkIS5cbiI7CisgICAgbXkgJGluR2l0Q29tbWl0U2VjdGlv biA9IDA7CisgICAgd2hpbGUgKDxTVEFUPikgeworICAgICAgICBteSAkc3RhdHVzOworICAgICAg ICBteSAkb3JpZ2luYWw7CisgICAgICAgIG15ICRmaWxlOworCisgICAgICAgIGlmIChpc1NWTigp KSB7CisgICAgICAgICAgICBpZiAoL14oW0FDRE1SXSkuezV9ICguKykkLykgeworICAgICAgICAg ICAgICAgICRzdGF0dXMgPSAkMTsKKyAgICAgICAgICAgICAgICAkZmlsZSA9ICQyOworICAgICAg ICAgICAgICAgICRvcmlnaW5hbCA9IGZpbmRPcmlnaW5hbEZpbGVGcm9tU3ZuKCRmaWxlKSBpZiBz dWJzdHIoJF8sIDMsIDEpIGVxICIrIjsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAg ICAgICAgcHJpbnQ7ICAjIGVycm9yIG91dHB1dCBmcm9tIHN2biBzdGF0CisgICAgICAgICAgICB9 CisgICAgICAgIH0gZWxzaWYgKGlzR2l0KCkpIHsKKyAgICAgICAgICAgIGlmICgvXiMgQ2hhbmdl cyB0byBiZSBjb21taXR0ZWQ6JC8gfHwgL14jIENoYW5nZWQgYnV0IG5vdCB1cGRhdGVkOiQvKSB7 CisgICAgICAgICAgICAgICAgJGluR2l0Q29tbWl0U2VjdGlvbiA9IDE7CisgICAgICAgICAgICAg ICAgbmV4dDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGxhc3QgaWYgJGluR2l0Q29tbWl0 U2VjdGlvbiAmJiAvXiMgXFMvOworCisgICAgICAgICAgICBpZiAoJGluR2l0Q29tbWl0U2VjdGlv biAmJiAvXiNccysoW146XSspOlxzKygoLispIC0+ICk/KC4rKSQvKSB7CisgICAgICAgICAgICAg ICAgJHN0YXR1cyA9ICQxOworICAgICAgICAgICAgICAgICRvcmlnaW5hbCA9ICQzOworICAgICAg ICAgICAgICAgICRmaWxlID0gJDQ7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAg ICBuZXh0IHVubGVzcyAkc3RhdHVzOworCisgICAgICAgICRmaWxlID0gbWFrZUZpbGVQYXRoUmVs YXRpdmUoJGZpbGUpOworCisgICAgICAgIGlmIChpc01vZGlmaWVkT3JBZGRlZFN0YXR1cygkc3Rh dHVzKSkgeworICAgICAgICAgICAgbXkgQGNvbXBvbmVudHMgPSBGaWxlOjpTcGVjLT5zcGxpdGRp cigkZmlsZSk7CisgICAgICAgICAgICAkY2hhbmdlZExheW91dFRlc3RzID0gMSBpZiAkY29tcG9u ZW50c1swXSBlcSAiTGF5b3V0VGVzdHMiOworICAgICAgICAgICAgcHVzaCBAeyRjaGFuZ2VkRmls ZXN9LCAkZmlsZSBpZiAkY29tcG9uZW50c1skI2NvbXBvbmVudHNdIG5lICJDaGFuZ2VMb2ciOwor ICAgICAgICB9IGVsc2lmIChpc0NvbmZsaWN0U3RhdHVzKCRzdGF0dXMpKSB7CisgICAgICAgICAg ICBwdXNoIEB7JGNvbmZsaWN0RmlsZXN9LCAkZmlsZTsKKyAgICAgICAgfQorICAgICAgICBteSAk ZGVzY3JpcHRpb24gPSBzdGF0dXNEZXNjcmlwdGlvbigkc3RhdHVzLCAkb3JpZ2luYWwpOworICAg ICAgICAkZnVuY3Rpb25MaXN0cy0+eyRmaWxlfSA9ICRkZXNjcmlwdGlvbiBpZiBkZWZpbmVkICRk ZXNjcmlwdGlvbjsKKyAgICB9CisgICAgY2xvc2UgU1RBVDsKK30KKwogc3ViIGlzTW9kaWZpZWRP ckFkZGVkU3RhdHVzKCQpCiB7CiAgICAgbXkgKCRzdGF0dXMpID0gQF87CkBAIC0xMDA5LDEwICsx MDI0LDEwIEBAIHN1YiBzdGF0dXNEZXNjcmlwdGlvbigkJCkKICAgICBteSAoJHN0YXR1cywgJG9y aWdpbmFsKSA9IEBfOwogCiAgICAgbXkgJXN2biA9ICgKLSAgICAgICAgIkEiID0+ICIgQWRkZWQu IiwKKyAgICAgICAgIkEiID0+IGRlZmluZWQgJG9yaWdpbmFsID8gIiBDb3BpZWQgZnJvbSBcJXMu IiA6ICIgQWRkZWQuIiwKICAgICAgICAgIkQiID0+ICIgUmVtb3ZlZC4iLAogICAgICAgICAiTSIg PT4gIiIsCi0gICAgICAgICJSIiA9PiAiIFJlcGxhY2VkLiIsCisgICAgICAgICJSIiA9PiBkZWZp bmVkICRvcmlnaW5hbCA/ICIgUmVwbGFjZWQgd2l0aCBcJXMuIiA6ICIgUmVwbGFjZWQuIiwKICAg ICApOwogICAgIG15ICVnaXQgPSAoCiAgICAgICAgICJjb3BpZWQiID0+ICIgQ29waWVkIGZyb20g XCVzLiIsCkBAIC0xMDIyLDggKzEwMzcsOSBAQCBzdWIgc3RhdHVzRGVzY3JpcHRpb24oJCQpCiAg ICAgICAgICJyZW5hbWVkIiA9PiAiIFJlbmFtZWQgZnJvbSBcJXMuIiwKICAgICApOwogCi0gICAg cmV0dXJuICRzdm57JHN0YXR1c30gaWYgaXNTVk4oKSAmJiBleGlzdHMgJHN2bnskc3RhdHVzfTsK KyAgICByZXR1cm4gc3ByaW50Zigkc3ZueyRzdGF0dXN9LCAkb3JpZ2luYWwpIGlmIGlzU1ZOKCkg JiYgZXhpc3RzICRzdm57JHN0YXR1c307CiAgICAgcmV0dXJuIHNwcmludGYoJGdpdHskc3RhdHVz fSwgJG9yaWdpbmFsKSBpZiBpc0dpdCgpICYmIGV4aXN0cyAkZ2l0eyRzdGF0dXN9OworICAgIHJl dHVybiB1bmRlZjsKIH0KIAogc3ViIGV4dHJhY3RMaW5lUmFuZ2UoJCkK