74266 2011-12-11 23:25:33 -0800 [Refactoring] In prepare-ChangeLog, move into a method the top-level code to show ChangeLogs diff and open ChangeLogs in an editor 2011-12-12 08:55:49 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 73531 1 haraken haraken aroben ddkilzer rniwa webkit.review.bot oldest_to_newest 519039 0 haraken 2011-12-11 23:25:33 -0800 We are planning to write unit-tests for prepare-ChangeLog in a run-leaks_unittest manner. This bug is one of the incremental refactorings to remove all top-level code and global variables from prepare-ChangeLog. FYI: After this patch is landed, I'll work on removing all global variables. 519042 1 118741 haraken 2011-12-11 23:33:07 -0800 Created attachment 118741 Patch 519044 2 118741 rniwa 2011-12-11 23:41:16 -0800 Comment on attachment 118741 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=118741&action=review > Tools/ChangeLog:3 > + [Refactoring] In prepare-ChangeLog, move into a method the top-level code to show ChangeLogs diff and open ChangeLogs in an editor Split this line into two lines? 519046 3 118742 haraken 2011-12-11 23:43:17 -0800 Created attachment 118742 patch for commit 519048 4 haraken 2011-12-11 23:43:42 -0800 (In reply to comment #2) > (From update of attachment 118741 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=118741&action=review > > > Tools/ChangeLog:3 > > + [Refactoring] In prepare-ChangeLog, move into a method the top-level code to show ChangeLogs diff and open ChangeLogs in an editor > > Split this line into two lines? Done. Thanks. 519061 5 118742 webkit.review.bot 2011-12-12 00:59:15 -0800 Comment on attachment 118742 patch for commit Clearing flags on attachment: 118742 Committed r102562: <http://trac.webkit.org/changeset/102562> 519246 6 ddkilzer 2011-12-12 08:55:49 -0800 Manually marking bug as RESOLVED/FIXED. 118741 2011-12-11 23:33:07 -0800 2011-12-11 23:41:15 -0800 Patch bug-74266-20111212163305.patch text/plain 5742 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNTU5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTcwMWM3YWY3MjY4Y2UwMWY3YTU1ODliMGVkYjg3ZmYz Yzk0NzdlZC4uYjc1ZTFkMzBmZTU2ZjQ1ZWU5NGUxMjM4YmI5N2RiZTBiMGRiN2UzMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1 IEBACiAyMDExLTEyLTExICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAor ICAgICAgICBbUmVmYWN0b3JpbmddIEluIHByZXBhcmUtQ2hhbmdlTG9nLCBtb3ZlIGludG8gYSBt ZXRob2QgdGhlIHRvcC1sZXZlbCBjb2RlIHRvIHNob3cgQ2hhbmdlTG9ncyBkaWZmIGFuZCBvcGVu IENoYW5nZUxvZ3MgaW4gYW4gZWRpdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD03NDI2NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFdlIGFyZSBwbGFubmluZyB0byB3cml0ZSB1bml0LXRlc3RzIGZvciBw cmVwYXJlLUNoYW5nZUxvZworICAgICAgICBpbiBhIHJ1bi1sZWFrc191bml0dGVzdCBtYW5uZXIu IFRoaXMgcGF0Y2ggaXMgb25lIG9mIHRoZSBpbmNyZW1lbnRhbAorICAgICAgICByZWZhY3Rvcmlu Z3MgdG8gcmVtb3ZlIGFsbCB0b3AtbGV2ZWwgY29kZSBhbmQgZ2xvYmFsIHZhcmlhYmxlcyBmcm9t CisgICAgICAgIHByZXBhcmUtQ2hhbmdlTG9nLgorCisgICAgICAgICogU2NyaXB0cy9wcmVwYXJl LUNoYW5nZUxvZzogTW92ZWQgdGhlIHRvcC1sZXZlbCBjb2RlIHRvIHNob3cgQ2hhbmdlTG9ncyBk aWZmIGludG8gcHJpbnREaWZmKCkuCisgICAgICAgIE1vdmVkIHRoZSB0b3AtbGV2ZWwgY29kZSB0 byBvcGVuIENoYW5nZUxvZ3MgaW4gYW4gZWRpdG9yIGludG8gb3BlbkNoYW5nZUxvZ3MoKS4KKyAg ICAgICAgUmVuYW1lZCBAY2hhbmdlZF9maWxlcyB0byBAY2hhbmdlZEZpbGVzLgorICAgICAgICBS ZW5hbWVkICVjb25mbGljdF9maWxlcyB0byAlY29uZmxpY3RGaWxlcy4KKyAgICAgICAgKGdlbmVy YXRlRnVuY3Rpb25MaXN0cyk6CisgICAgICAgIChwcmludERpZmYpOgorICAgICAgICAob3BlbkNo YW5nZUxvZ3MpOgorCisyMDExLTEyLTExICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVt Lm9yZz4KKwogICAgICAgICBbUmVmYWN0b3JpbmddIE1vdmUgdG9wLWxldmVsIGNvZGUgdG8gcmVz b2x2ZSBjb25mbGljdGVkIENoYW5nZUxvZ3MgaW50byBhIG1ldGhvZAogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQyNTcKIApkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZyBiL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFu Z2VMb2cKaW5kZXggYjVkMmE3ZDgyMzI3Yjk0NmIxZWIyYWY0ZDBlM2Q1YmMzZmRkNzgyNy4uNzVl ODUwZWIxZTg1YmRiZTA0MTg2MDY1ZWM3NjI4NGY1MmRlYjRiYyAxMDA3NTUKLS0tIGEvVG9vbHMv U2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZworKysgYi9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hh bmdlTG9nCkBAIC03Miw2ICs3Miw4IEBAIHN1YiBmaW5kQ2hhbmdlTG9ncyhcJSk7CiBzdWIgZ2V0 TGF0ZXN0Q2hhbmdlTG9ncygkKTsKIHN1YiByZXNvbHZlQ29uZmxpY3RlZENoYW5nZUxvZ3MoJCk7 CiBzdWIgZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCQkJFwlKTsKK3N1YiBwcmludERpZmYoXEApOwor c3ViIG9wZW5DaGFuZ2VMb2dzKCQpOwogc3ViIGZpcnN0RGlyZWN0b3J5T3JDd2QoKTsKIHN1YiBk aWZmRnJvbVRvU3RyaW5nKCk7CiBzdWIgZGlmZkNvbW1hbmQoQCk7CkBAIC0xNjQsMjYgKzE2Niwy NiBAQCBteSAkU1ZOID0gInN2biI7CiBteSAkR0lUID0gImdpdCI7CiAKICMgRmluZCB0aGUgbGlz dCBvZiBtb2RpZmllZCBmaWxlcwotbXkgQGNoYW5nZWRfZmlsZXM7CitteSBAY2hhbmdlZEZpbGVz OwogbXkgJWZ1bmN0aW9uTGlzdHM7Ci1teSBAY29uZmxpY3RfZmlsZXM7CitteSBAY29uZmxpY3RG aWxlczsKIAogbXkgJXN1cHBvcnRlZFRlc3RFeHRlbnNpb25zID0gbWFwIHsgJF8gPT4gMSB9IHF3 KGh0bWwgc2h0bWwgc3ZnIHhtbCB4aHRtbCBwbCBwaHApOwogCi1teSAkYWRkZWRSZWdyZXNzaW9u VGVzdHMgPSBnZW5lcmF0ZUZpbGVMaXN0KEBjaGFuZ2VkX2ZpbGVzLCBAY29uZmxpY3RfZmlsZXMs ICVmdW5jdGlvbkxpc3RzKTsKK215ICRhZGRlZFJlZ3Jlc3Npb25UZXN0cyA9IGdlbmVyYXRlRmls ZUxpc3QoQGNoYW5nZWRGaWxlcywgQGNvbmZsaWN0RmlsZXMsICVmdW5jdGlvbkxpc3RzKTsKIAot aWYgKCFAY2hhbmdlZF9maWxlcyAmJiAhQGNvbmZsaWN0X2ZpbGVzICYmICFrZXlzICVmdW5jdGlv bkxpc3RzKSB7CitpZiAoIUBjaGFuZ2VkRmlsZXMgJiYgIUBjb25mbGljdEZpbGVzICYmICFrZXlz ICVmdW5jdGlvbkxpc3RzKSB7CiAgICAgcHJpbnQgU1RERVJSICIgIE5vIGNoYW5nZXMgZm91bmQu XG4iOwogICAgIGV4aXQgMTsKIH0KIAotaWYgKEBjb25mbGljdF9maWxlcykgeworaWYgKEBjb25m bGljdEZpbGVzKSB7CiAgICAgcHJpbnQgU1RERVJSICIgIFRoZSBmb2xsb3dpbmcgZmlsZXMgaGF2 ZSBjb25mbGljdHMuIFJ1biBwcmVwYXJlLUNoYW5nZUxvZyBhZ2FpbiBhZnRlciBmaXhpbmcgdGhl IGNvbmZsaWN0czpcbiI7Ci0gICAgcHJpbnQgU1RERVJSIGpvaW4oIlxuIiwgQGNvbmZsaWN0X2Zp bGVzKSwgIlxuIjsKKyAgICBwcmludCBTVERFUlIgam9pbigiXG4iLCBAY29uZmxpY3RGaWxlcyks ICJcbiI7CiAgICAgZXhpdCAxOwogfQogCi1nZW5lcmF0ZUZ1bmN0aW9uTGlzdHMoQGNoYW5nZWRf ZmlsZXMsICVmdW5jdGlvbkxpc3RzKTsKK2dlbmVyYXRlRnVuY3Rpb25MaXN0cyhAY2hhbmdlZEZp bGVzLCAlZnVuY3Rpb25MaXN0cyk7CiAKICMgR2V0IHNvbWUgcGFyYW1ldGVycyBmb3IgdGhlIENo YW5nZUxvZyB3ZSBhcmUgYWJvdXQgdG8gd3JpdGUuCiBteSAkZGF0ZSA9IGNoYW5nZUxvZ0RhdGUo JGNoYW5nZUxvZ1RpbWVab25lKTsKQEAgLTIyMCwyOCArMjIyLDEzIEBAIGlmICgkd3JpdGVDaGFu Z2VMb2dzKSB7CiB9CiAKICMgV3JpdGUgb3V0IGFub3RoZXIgZGlmZi4KLWlmICgkc3Bld0RpZmYg JiYgQGNoYW5nZWRfZmlsZXMpIHsKLSAgICBwcmludCBTVERFUlIgIiAgUnVubmluZyBkaWZmIHRv IGhlbHAgeW91IHdyaXRlIHRoZSBDaGFuZ2VMb2cgZW50cmllcy5cbiI7Ci0gICAgbG9jYWwgJC8g PSB1bmRlZjsgIyBsb2NhbCBzbHVycCBtb2RlCi0gICAgb3BlbiBESUZGLCAiLXwiLCBjcmVhdGVQ YXRjaENvbW1hbmQoIiciIC4gam9pbiAoIicgJyIsIEBjaGFuZ2VkX2ZpbGVzKSAuICInIikgb3Ig ZGllICJUaGUgZGlmZiBmYWlsZWQ6ICQhLlxuIjsKLSAgICBwcmludCA8RElGRj47Ci0gICAgY2xv c2UgRElGRjsKK2lmICgkc3Bld0RpZmYgJiYgQGNoYW5nZWRGaWxlcykgeworICAgIHByaW50RGlm ZihAY2hhbmdlZEZpbGVzKTsKIH0KIAogIyBPcGVuIENoYW5nZUxvZ3MuCiBpZiAoJG9wZW5DaGFu Z2VMb2dzICYmIEAkY2hhbmdlTG9ncykgewotICAgIHByaW50IFNUREVSUiAiICBPcGVuaW5nIHRo ZSBlZGl0ZWQgQ2hhbmdlTG9nIGZpbGVzLlxuIjsKLSAgICBteSAkZWRpdG9yID0gJEVOVntDSEFO R0VfTE9HX0VESVRPUn07Ci0gICAgaWYgKCRlZGl0b3IpIHsKLSAgICAgICAgc3lzdGVtICgoc3Bs aXQgJyAnLCAkZWRpdG9yKSwgQCRjaGFuZ2VMb2dzKTsKLSAgICB9IGVsc2UgewotICAgICAgICAk ZWRpdG9yID0gJEVOVntDSEFOR0VfTE9HX0VESVRfQVBQTElDQVRJT059OwotICAgICAgICBpZiAo JGVkaXRvcikgewotICAgICAgICAgICAgc3lzdGVtICJvcGVuIiwgIi1hIiwgJGVkaXRvciwgQCRj aGFuZ2VMb2dzOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgc3lzdGVtICJvcGVuIiwg Ii1lIiwgQCRjaGFuZ2VMb2dzOwotICAgICAgICB9Ci0gICAgfQorICAgIG9wZW5DaGFuZ2VMb2dz KCRjaGFuZ2VMb2dzKTsKIH0KIAogIyBEb25lLgpAQCAtMjUwLDE1ICsyMzcsMTUgQEAgZXhpdDsK IAogc3ViIGdlbmVyYXRlRnVuY3Rpb25MaXN0cyhcQFwlKQogewotICAgIG15ICgkY2hhbmdlZF9m aWxlcywgJGZ1bmN0aW9uTGlzdHMpID0gQF87CisgICAgbXkgKCRjaGFuZ2VkRmlsZXMsICRmdW5j dGlvbkxpc3RzKSA9IEBfOwogCiAgICAgbXkgJWNoYW5nZWRfbGluZV9yYW5nZXM7Ci0gICAgaWYg KEAkY2hhbmdlZF9maWxlcykgeworICAgIGlmIChAJGNoYW5nZWRGaWxlcykgewogICAgICAgICAj IEZvciBlYWNoIGZpbGUsIGJ1aWxkIGEgbGlzdCBvZiBtb2RpZmllZCBsaW5lcy4KICAgICAgICAg IyBVc2UgbGluZSBudW1iZXJzIGZyb20gdGhlICJhZnRlciIgc2lkZSBvZiBlYWNoIGRpZmYuCiAg ICAgICAgIHByaW50IFNUREVSUiAiICBSZXZpZXdpbmcgZGlmZiB0byBkZXRlcm1pbmUgd2hpY2gg bGluZXMgY2hhbmdlZC5cbiI7CiAgICAgICAgIG15ICRmaWxlOwotICAgICAgICBvcGVuIERJRkYs ICItfCIsIGRpZmZDb21tYW5kKEAkY2hhbmdlZF9maWxlcykgb3IgZGllICJUaGUgZGlmZiBmYWls ZWQ6ICQhLlxuIjsKKyAgICAgICAgb3BlbiBESUZGLCAiLXwiLCBkaWZmQ29tbWFuZChAJGNoYW5n ZWRGaWxlcykgb3IgZGllICJUaGUgZGlmZiBmYWlsZWQ6ICQhLlxuIjsKICAgICAgICAgd2hpbGUg KDxESUZGPikgewogICAgICAgICAgICAgJGZpbGUgPSBtYWtlRmlsZVBhdGhSZWxhdGl2ZSgkMSkg aWYgJF8gPX4gZGlmZkhlYWRlckZvcm1hdCgpOwogICAgICAgICAgICAgaWYgKGRlZmluZWQgJGZp bGUpIHsKQEAgLTUzMCw2ICs1MTcsMzUgQEAgc3ViIGdlbmVyYXRlTmV3Q2hhbmdlTG9ncygkJCRc JSkKICAgICB9CiB9CiAKK3N1YiBwcmludERpZmYoXEApCit7CisgICAgbXkgKCRjaGFuZ2VkRmls ZXMpID0gQF87CisKKyAgICBwcmludCBTVERFUlIgIiAgUnVubmluZyBkaWZmIHRvIGhlbHAgeW91 IHdyaXRlIHRoZSBDaGFuZ2VMb2cgZW50cmllcy5cbiI7CisgICAgbG9jYWwgJC8gPSB1bmRlZjsg IyBsb2NhbCBzbHVycCBtb2RlCisgICAgb3BlbiBESUZGLCAiLXwiLCBjcmVhdGVQYXRjaENvbW1h bmQoIiciIC4gam9pbiAoIicgJyIsIEAkY2hhbmdlZEZpbGVzKSAuICInIikgb3IgZGllICJUaGUg ZGlmZiBmYWlsZWQ6ICQhLlxuIjsKKyAgICBwcmludCA8RElGRj47CisgICAgY2xvc2UgRElGRjsK K30KKworc3ViIG9wZW5DaGFuZ2VMb2dzKCQpCit7CisgICAgbXkgKCRjaGFuZ2VMb2dzKSA9IEBf OworCisgICAgcHJpbnQgU1RERVJSICIgIE9wZW5pbmcgdGhlIGVkaXRlZCBDaGFuZ2VMb2cgZmls ZXMuXG4iOworICAgIG15ICRlZGl0b3IgPSAkRU5We0NIQU5HRV9MT0dfRURJVE9SfTsKKyAgICBp ZiAoJGVkaXRvcikgeworICAgICAgICBzeXN0ZW0gKChzcGxpdCAnICcsICRlZGl0b3IpLCBAJGNo YW5nZUxvZ3MpOworICAgIH0gZWxzZSB7CisgICAgICAgICRlZGl0b3IgPSAkRU5We0NIQU5HRV9M T0dfRURJVF9BUFBMSUNBVElPTn07CisgICAgICAgIGlmICgkZWRpdG9yKSB7CisgICAgICAgICAg ICBzeXN0ZW0gIm9wZW4iLCAiLWEiLCAkZWRpdG9yLCBAJGNoYW5nZUxvZ3M7CisgICAgICAgIH0g ZWxzZSB7CisgICAgICAgICAgICBzeXN0ZW0gIm9wZW4iLCAiLWUiLCBAJGNoYW5nZUxvZ3M7Cisg ICAgICAgIH0KKyAgICB9Cit9CisKIHN1YiBnZXRfZnVuY3Rpb25fbGluZV9yYW5nZXMoJCQpCiB7 CiAgICAgbXkgKCRmaWxlX2hhbmRsZSwgJGZpbGVfbmFtZSkgPSBAXzsK 118742 2011-12-11 23:43:17 -0800 2011-12-12 00:59:15 -0800 patch for commit bug-74266-20111212164315.patch text/plain 5749 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNTU5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTcwMWM3YWY3MjY4Y2UwMWY3YTU1ODliMGVkYjg3ZmYz Yzk0NzdlZC4uMjBkOGU2YTEwODc5OTBkMjE1ZTgyMjJkYWRjNGNjYjU2NTA4YzQ5NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2 IEBACiAyMDExLTEyLTExICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAor ICAgICAgICBbUmVmYWN0b3JpbmddIEluIHByZXBhcmUtQ2hhbmdlTG9nLCBtb3ZlIGludG8gYSBt ZXRob2QgdGhlIHRvcC1sZXZlbCBjb2RlCisgICAgICAgIHRvIHNob3cgQ2hhbmdlTG9ncyBkaWZm IGFuZCBvcGVuIENoYW5nZUxvZ3MgaW4gYW4gZWRpdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDI2NgorCisgICAgICAgIFJldmlld2VkIGJ5IFJ5 b3N1a2UgTml3YS4KKworICAgICAgICBXZSBhcmUgcGxhbm5pbmcgdG8gd3JpdGUgdW5pdC10ZXN0 cyBmb3IgcHJlcGFyZS1DaGFuZ2VMb2cKKyAgICAgICAgaW4gYSBydW4tbGVha3NfdW5pdHRlc3Qg bWFubmVyLiBUaGlzIHBhdGNoIGlzIG9uZSBvZiB0aGUgaW5jcmVtZW50YWwKKyAgICAgICAgcmVm YWN0b3JpbmdzIHRvIHJlbW92ZSBhbGwgdG9wLWxldmVsIGNvZGUgYW5kIGdsb2JhbCB2YXJpYWJs ZXMgZnJvbQorICAgICAgICBwcmVwYXJlLUNoYW5nZUxvZy4KKworICAgICAgICAqIFNjcmlwdHMv cHJlcGFyZS1DaGFuZ2VMb2c6IE1vdmVkIHRoZSB0b3AtbGV2ZWwgY29kZSB0byBzaG93IENoYW5n ZUxvZ3MgZGlmZiBpbnRvIHByaW50RGlmZigpLgorICAgICAgICBNb3ZlZCB0aGUgdG9wLWxldmVs IGNvZGUgdG8gb3BlbiBDaGFuZ2VMb2dzIGluIGFuIGVkaXRvciBpbnRvIG9wZW5DaGFuZ2VMb2dz KCkuCisgICAgICAgIFJlbmFtZWQgQGNoYW5nZWRfZmlsZXMgdG8gQGNoYW5nZWRGaWxlcy4KKyAg ICAgICAgUmVuYW1lZCAlY29uZmxpY3RfZmlsZXMgdG8gJWNvbmZsaWN0RmlsZXMuCisgICAgICAg IChnZW5lcmF0ZUZ1bmN0aW9uTGlzdHMpOgorICAgICAgICAocHJpbnREaWZmKToKKyAgICAgICAg KG9wZW5DaGFuZ2VMb2dzKToKKworMjAxMS0xMi0xMSAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBj aHJvbWl1bS5vcmc+CisKICAgICAgICAgW1JlZmFjdG9yaW5nXSBNb3ZlIHRvcC1sZXZlbCBjb2Rl IHRvIHJlc29sdmUgY29uZmxpY3RlZCBDaGFuZ2VMb2dzIGludG8gYSBtZXRob2QKICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0MjU3CiAKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cgYi9Ub29scy9TY3JpcHRzL3ByZXBh cmUtQ2hhbmdlTG9nCmluZGV4IGI1ZDJhN2Q4MjMyN2I5NDZiMWViMmFmNGQwZTNkNWJjM2ZkZDc4 MjcuLjc1ZTg1MGViMWU4NWJkYmUwNDE4NjA2NWVjNzYyODRmNTJkZWI0YmMgMTAwNzU1Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKKysrIGIvVG9vbHMvU2NyaXB0cy9wcmVw YXJlLUNoYW5nZUxvZwpAQCAtNzIsNiArNzIsOCBAQCBzdWIgZmluZENoYW5nZUxvZ3MoXCUpOwog c3ViIGdldExhdGVzdENoYW5nZUxvZ3MoJCk7CiBzdWIgcmVzb2x2ZUNvbmZsaWN0ZWRDaGFuZ2VM b2dzKCQpOwogc3ViIGdlbmVyYXRlTmV3Q2hhbmdlTG9ncygkJCRcJSk7CitzdWIgcHJpbnREaWZm KFxAKTsKK3N1YiBvcGVuQ2hhbmdlTG9ncygkKTsKIHN1YiBmaXJzdERpcmVjdG9yeU9yQ3dkKCk7 CiBzdWIgZGlmZkZyb21Ub1N0cmluZygpOwogc3ViIGRpZmZDb21tYW5kKEApOwpAQCAtMTY0LDI2 ICsxNjYsMjYgQEAgbXkgJFNWTiA9ICJzdm4iOwogbXkgJEdJVCA9ICJnaXQiOwogCiAjIEZpbmQg dGhlIGxpc3Qgb2YgbW9kaWZpZWQgZmlsZXMKLW15IEBjaGFuZ2VkX2ZpbGVzOworbXkgQGNoYW5n ZWRGaWxlczsKIG15ICVmdW5jdGlvbkxpc3RzOwotbXkgQGNvbmZsaWN0X2ZpbGVzOworbXkgQGNv bmZsaWN0RmlsZXM7CiAKIG15ICVzdXBwb3J0ZWRUZXN0RXh0ZW5zaW9ucyA9IG1hcCB7ICRfID0+ IDEgfSBxdyhodG1sIHNodG1sIHN2ZyB4bWwgeGh0bWwgcGwgcGhwKTsKIAotbXkgJGFkZGVkUmVn cmVzc2lvblRlc3RzID0gZ2VuZXJhdGVGaWxlTGlzdChAY2hhbmdlZF9maWxlcywgQGNvbmZsaWN0 X2ZpbGVzLCAlZnVuY3Rpb25MaXN0cyk7CitteSAkYWRkZWRSZWdyZXNzaW9uVGVzdHMgPSBnZW5l cmF0ZUZpbGVMaXN0KEBjaGFuZ2VkRmlsZXMsIEBjb25mbGljdEZpbGVzLCAlZnVuY3Rpb25MaXN0 cyk7CiAKLWlmICghQGNoYW5nZWRfZmlsZXMgJiYgIUBjb25mbGljdF9maWxlcyAmJiAha2V5cyAl ZnVuY3Rpb25MaXN0cykgeworaWYgKCFAY2hhbmdlZEZpbGVzICYmICFAY29uZmxpY3RGaWxlcyAm JiAha2V5cyAlZnVuY3Rpb25MaXN0cykgewogICAgIHByaW50IFNUREVSUiAiICBObyBjaGFuZ2Vz IGZvdW5kLlxuIjsKICAgICBleGl0IDE7CiB9CiAKLWlmIChAY29uZmxpY3RfZmlsZXMpIHsKK2lm IChAY29uZmxpY3RGaWxlcykgewogICAgIHByaW50IFNUREVSUiAiICBUaGUgZm9sbG93aW5nIGZp bGVzIGhhdmUgY29uZmxpY3RzLiBSdW4gcHJlcGFyZS1DaGFuZ2VMb2cgYWdhaW4gYWZ0ZXIgZml4 aW5nIHRoZSBjb25mbGljdHM6XG4iOwotICAgIHByaW50IFNUREVSUiBqb2luKCJcbiIsIEBjb25m bGljdF9maWxlcyksICJcbiI7CisgICAgcHJpbnQgU1RERVJSIGpvaW4oIlxuIiwgQGNvbmZsaWN0 RmlsZXMpLCAiXG4iOwogICAgIGV4aXQgMTsKIH0KIAotZ2VuZXJhdGVGdW5jdGlvbkxpc3RzKEBj aGFuZ2VkX2ZpbGVzLCAlZnVuY3Rpb25MaXN0cyk7CitnZW5lcmF0ZUZ1bmN0aW9uTGlzdHMoQGNo YW5nZWRGaWxlcywgJWZ1bmN0aW9uTGlzdHMpOwogCiAjIEdldCBzb21lIHBhcmFtZXRlcnMgZm9y IHRoZSBDaGFuZ2VMb2cgd2UgYXJlIGFib3V0IHRvIHdyaXRlLgogbXkgJGRhdGUgPSBjaGFuZ2VM b2dEYXRlKCRjaGFuZ2VMb2dUaW1lWm9uZSk7CkBAIC0yMjAsMjggKzIyMiwxMyBAQCBpZiAoJHdy aXRlQ2hhbmdlTG9ncykgewogfQogCiAjIFdyaXRlIG91dCBhbm90aGVyIGRpZmYuCi1pZiAoJHNw ZXdEaWZmICYmIEBjaGFuZ2VkX2ZpbGVzKSB7Ci0gICAgcHJpbnQgU1RERVJSICIgIFJ1bm5pbmcg ZGlmZiB0byBoZWxwIHlvdSB3cml0ZSB0aGUgQ2hhbmdlTG9nIGVudHJpZXMuXG4iOwotICAgIGxv Y2FsICQvID0gdW5kZWY7ICMgbG9jYWwgc2x1cnAgbW9kZQotICAgIG9wZW4gRElGRiwgIi18Iiwg Y3JlYXRlUGF0Y2hDb21tYW5kKCInIiAuIGpvaW4gKCInICciLCBAY2hhbmdlZF9maWxlcykgLiAi JyIpIG9yIGRpZSAiVGhlIGRpZmYgZmFpbGVkOiAkIS5cbiI7Ci0gICAgcHJpbnQgPERJRkY+Owot ICAgIGNsb3NlIERJRkY7CitpZiAoJHNwZXdEaWZmICYmIEBjaGFuZ2VkRmlsZXMpIHsKKyAgICBw cmludERpZmYoQGNoYW5nZWRGaWxlcyk7CiB9CiAKICMgT3BlbiBDaGFuZ2VMb2dzLgogaWYgKCRv cGVuQ2hhbmdlTG9ncyAmJiBAJGNoYW5nZUxvZ3MpIHsKLSAgICBwcmludCBTVERFUlIgIiAgT3Bl bmluZyB0aGUgZWRpdGVkIENoYW5nZUxvZyBmaWxlcy5cbiI7Ci0gICAgbXkgJGVkaXRvciA9ICRF TlZ7Q0hBTkdFX0xPR19FRElUT1J9OwotICAgIGlmICgkZWRpdG9yKSB7Ci0gICAgICAgIHN5c3Rl bSAoKHNwbGl0ICcgJywgJGVkaXRvciksIEAkY2hhbmdlTG9ncyk7Ci0gICAgfSBlbHNlIHsKLSAg ICAgICAgJGVkaXRvciA9ICRFTlZ7Q0hBTkdFX0xPR19FRElUX0FQUExJQ0FUSU9OfTsKLSAgICAg ICAgaWYgKCRlZGl0b3IpIHsKLSAgICAgICAgICAgIHN5c3RlbSAib3BlbiIsICItYSIsICRlZGl0 b3IsIEAkY2hhbmdlTG9nczsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHN5c3RlbSAi b3BlbiIsICItZSIsIEAkY2hhbmdlTG9nczsKLSAgICAgICAgfQotICAgIH0KKyAgICBvcGVuQ2hh bmdlTG9ncygkY2hhbmdlTG9ncyk7CiB9CiAKICMgRG9uZS4KQEAgLTI1MCwxNSArMjM3LDE1IEBA IGV4aXQ7CiAKIHN1YiBnZW5lcmF0ZUZ1bmN0aW9uTGlzdHMoXEBcJSkKIHsKLSAgICBteSAoJGNo YW5nZWRfZmlsZXMsICRmdW5jdGlvbkxpc3RzKSA9IEBfOworICAgIG15ICgkY2hhbmdlZEZpbGVz LCAkZnVuY3Rpb25MaXN0cykgPSBAXzsKIAogICAgIG15ICVjaGFuZ2VkX2xpbmVfcmFuZ2VzOwot ICAgIGlmIChAJGNoYW5nZWRfZmlsZXMpIHsKKyAgICBpZiAoQCRjaGFuZ2VkRmlsZXMpIHsKICAg ICAgICAgIyBGb3IgZWFjaCBmaWxlLCBidWlsZCBhIGxpc3Qgb2YgbW9kaWZpZWQgbGluZXMuCiAg ICAgICAgICMgVXNlIGxpbmUgbnVtYmVycyBmcm9tIHRoZSAiYWZ0ZXIiIHNpZGUgb2YgZWFjaCBk aWZmLgogICAgICAgICBwcmludCBTVERFUlIgIiAgUmV2aWV3aW5nIGRpZmYgdG8gZGV0ZXJtaW5l IHdoaWNoIGxpbmVzIGNoYW5nZWQuXG4iOwogICAgICAgICBteSAkZmlsZTsKLSAgICAgICAgb3Bl biBESUZGLCAiLXwiLCBkaWZmQ29tbWFuZChAJGNoYW5nZWRfZmlsZXMpIG9yIGRpZSAiVGhlIGRp ZmYgZmFpbGVkOiAkIS5cbiI7CisgICAgICAgIG9wZW4gRElGRiwgIi18IiwgZGlmZkNvbW1hbmQo QCRjaGFuZ2VkRmlsZXMpIG9yIGRpZSAiVGhlIGRpZmYgZmFpbGVkOiAkIS5cbiI7CiAgICAgICAg IHdoaWxlICg8RElGRj4pIHsKICAgICAgICAgICAgICRmaWxlID0gbWFrZUZpbGVQYXRoUmVsYXRp dmUoJDEpIGlmICRfID1+IGRpZmZIZWFkZXJGb3JtYXQoKTsKICAgICAgICAgICAgIGlmIChkZWZp bmVkICRmaWxlKSB7CkBAIC01MzAsNiArNTE3LDM1IEBAIHN1YiBnZW5lcmF0ZU5ld0NoYW5nZUxv Z3MoJCQkXCUpCiAgICAgfQogfQogCitzdWIgcHJpbnREaWZmKFxAKQoreworICAgIG15ICgkY2hh bmdlZEZpbGVzKSA9IEBfOworCisgICAgcHJpbnQgU1RERVJSICIgIFJ1bm5pbmcgZGlmZiB0byBo ZWxwIHlvdSB3cml0ZSB0aGUgQ2hhbmdlTG9nIGVudHJpZXMuXG4iOworICAgIGxvY2FsICQvID0g dW5kZWY7ICMgbG9jYWwgc2x1cnAgbW9kZQorICAgIG9wZW4gRElGRiwgIi18IiwgY3JlYXRlUGF0 Y2hDb21tYW5kKCInIiAuIGpvaW4gKCInICciLCBAJGNoYW5nZWRGaWxlcykgLiAiJyIpIG9yIGRp ZSAiVGhlIGRpZmYgZmFpbGVkOiAkIS5cbiI7CisgICAgcHJpbnQgPERJRkY+OworICAgIGNsb3Nl IERJRkY7Cit9CisKK3N1YiBvcGVuQ2hhbmdlTG9ncygkKQoreworICAgIG15ICgkY2hhbmdlTG9n cykgPSBAXzsKKworICAgIHByaW50IFNUREVSUiAiICBPcGVuaW5nIHRoZSBlZGl0ZWQgQ2hhbmdl TG9nIGZpbGVzLlxuIjsKKyAgICBteSAkZWRpdG9yID0gJEVOVntDSEFOR0VfTE9HX0VESVRPUn07 CisgICAgaWYgKCRlZGl0b3IpIHsKKyAgICAgICAgc3lzdGVtICgoc3BsaXQgJyAnLCAkZWRpdG9y KSwgQCRjaGFuZ2VMb2dzKTsKKyAgICB9IGVsc2UgeworICAgICAgICAkZWRpdG9yID0gJEVOVntD SEFOR0VfTE9HX0VESVRfQVBQTElDQVRJT059OworICAgICAgICBpZiAoJGVkaXRvcikgeworICAg ICAgICAgICAgc3lzdGVtICJvcGVuIiwgIi1hIiwgJGVkaXRvciwgQCRjaGFuZ2VMb2dzOworICAg ICAgICB9IGVsc2UgeworICAgICAgICAgICAgc3lzdGVtICJvcGVuIiwgIi1lIiwgQCRjaGFuZ2VM b2dzOworICAgICAgICB9CisgICAgfQorfQorCiBzdWIgZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2Vz KCQkKQogewogICAgIG15ICgkZmlsZV9oYW5kbGUsICRmaWxlX25hbWUpID0gQF87Cg==