74497 2011-12-14 04:17:03 -0800 [Refactoring] In prepare-ChangeLog, make several global variables be used only through parameter passing 2011-12-15 15:14:01 -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 520841 0 haraken 2011-12-14 04:17:03 -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. Global variables in prepare-ChangeLog can be categorized as follows: [A: Constant variables] $changeLogTimeZone $SVN $GIT %supportedTestExtensions [B: Arguments] $bugDescription $bugNumber $name $emailAddress $mergeBase $gitCommit $gitIndex $gitReviewer $openChangeLogs $writeChangeLogs $showHelp $spewDiff $updateChangeLogs $parseOptionsResult [C: Global variables that are used many times here and there] $isSVN $isGit [D: Global variables that are used only a few times] %paths $changedFiles $conflictFiles $functionLists $addedRegressionTests $bugURL $filesInChangeLog $prefixes $changeLogs In this bug, we remove several global variables in [B]. Accurately, we make $bugDescription, $bugNumber, $name, $emailAddress, $gitReviewer and $writeChangeLogs be used only through parameter passing. I'll remove all global variables completely in the next bug. 520842 1 119200 haraken 2011-12-14 04:22:57 -0800 Created attachment 119200 Patch 521821 2 119412 haraken 2011-12-15 04:29:28 -0800 Created attachment 119412 rebased patch 522258 3 119412 webkit.review.bot 2011-12-15 15:13:57 -0800 Comment on attachment 119412 rebased patch Clearing flags on attachment: 119412 Committed r102988: <http://trac.webkit.org/changeset/102988> 522259 4 webkit.review.bot 2011-12-15 15:14:01 -0800 All reviewed patches have been landed. Closing bug. 119200 2011-12-14 04:22:57 -0800 2011-12-15 04:29:24 -0800 Patch bug-74497-20111214212256.patch text/plain 5050 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNzYzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzQ5MmNmYmFiNzEyMGZhM2RjM2VhMGJiYWMxNTA4ZGU0 ZDFlMmFkOS4uNWU5YmE4MGE3MjdlMTA4MmVmZTZlMmRmMGRkY2Y5NTNhZmJmNjE2MSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4 IEBACiAyMDExLTEyLTE0ICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAor ICAgICAgICBbUmVmYWN0b3JpbmddIEluIHByZXBhcmUtQ2hhbmdlTG9nLCBtYWtlIHNldmVyYWwg Z2xvYmFsIHZhcmlhYmxlcyBiZSB1c2VkIG9ubHkgdGhyb3VnaCBwYXJhbWV0ZXIgcGFzc2luZwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQ0OTcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBhcmUgcGxh bm5pbmcgdG8gd3JpdGUgdW5pdC10ZXN0cyBmb3IgcHJlcGFyZS1DaGFuZ2VMb2cgaW4gYSBydW4t bGVha3NfdW5pdHRlc3QKKyAgICAgICAgbWFubmVyLiBUaGlzIGJ1ZyBpcyBvbmUgb2YgdGhlIGlu Y3JlbWVudGFsIHJlZmFjdG9yaW5ncyB0byByZW1vdmUgYWxsIHRvcC1sZXZlbAorICAgICAgICBj b2RlIGFuZCBnbG9iYWwgdmFyaWFibGVzIGZyb20gcHJlcGFyZS1DaGFuZ2VMb2cuIEluIHRoaXMg cGF0Y2gsCisgICAgICAgIHdlIG1ha2UgdGhlIGZvbGxvd2luZyBnbG9iYWwgdmFyaWFibGVzIGJl IHVzZWQgb25seSB0aHJvdWdoIHBhcmFtZXRlciBwYXNzaW5nLgorICAgICAgICAgICAgLSAkYnVn RGVzY3JpcHRpb24KKyAgICAgICAgICAgIC0gJGJ1Z051bWJlcgorICAgICAgICAgICAgLSAkbmFt ZQorICAgICAgICAgICAgLSAkZW1haWxBZGRyZXNzCisgICAgICAgICAgICAtICRnaXRSZXZpZXdl cgorICAgICAgICAgICAgLSAkd3JpdGVDaGFuZ2VMb2dzCisKKyAgICAgICAgKiBTY3JpcHRzL3By ZXBhcmUtQ2hhbmdlTG9nOgorICAgICAgICAoZmV0Y2hCdWdEZXNjcmlwdGlvbkZyb21VUkwpOgor ICAgICAgICAoZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKToKKyAgICAgICAgKHJldmlld2VyQW5kRGVz Y3JpcHRpb25Gb3JHaXRDb21taXQpOgorCisyMDExLTEyLTE0ICBLZW50YXJvIEhhcmEgIDxoYXJh a2VuQGNocm9taXVtLm9yZz4KKwogICAgICAgICBbUmVmYWN0b3JpbmddIEluIHByZXBhcmUtQ2hh bmdlTG9nLCBtYWtlICRpc0dpdCBhbmQgJGlzU1ZOIGJlIHVzZWQgb25seQogICAgICAgICB0aHJv dWdoIHBhcmFtZXRlciBwYXNzaW5nCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03NDQ4NQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNo YW5nZUxvZyBiL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKaW5kZXggZmEyYzc0MWIw YTAyZTM0ZGVmZWNjMzMzZWFkMTZiMzllMzhkMDE0ZS4uNjc0ODE0YWU2Yzg2NzQwNTQ3NjhlNGRl MGFiYTQ1ODZmOGJkODlmOCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5n ZUxvZworKysgYi9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCkBAIC02NywxMSArNjcs MTEgQEAgdXNlIFZDU1V0aWxzOwogc3ViIGNoYW5nZUxvZ0RhdGUoJCk7CiBzdWIgY2hhbmdlTG9n RW1haWxBZGRyZXNzRnJvbUFyZ3MoJCk7CiBzdWIgY2hhbmdlTG9nTmFtZUZyb21BcmdzKCQpOwot c3ViIGZldGNoQnVnRGVzY3JpcHRpb25Gcm9tVVJMKCQpOworc3ViIGZldGNoQnVnRGVzY3JpcHRp b25Gcm9tVVJMKCQkKTsKIHN1YiBmaW5kQ2hhbmdlTG9ncygkKTsKIHN1YiBnZXRMYXRlc3RDaGFu Z2VMb2dzKCQpOwogc3ViIHJlc29sdmVDb25mbGljdGVkQ2hhbmdlTG9ncygkKTsKLXN1YiBnZW5l cmF0ZU5ld0NoYW5nZUxvZ3MoJCQkJCQpOworc3ViIGdlbmVyYXRlTmV3Q2hhbmdlTG9ncygkJCQk JCQkJCQkKTsKIHN1YiBwcmludERpZmYoJCQkKTsKIHN1YiBvcGVuQ2hhbmdlTG9ncygkKTsKIHN1 YiBmaXJzdERpcmVjdG9yeU9yQ3dkKFwlKTsKQEAgLTEwMSw3ICsxMDEsNyBAQCBzdWIgZ2V0X2Z1 bmN0aW9uX2xpbmVfcmFuZ2VzX2Zvcl9wZXJsKCQkKTsKIHN1YiBnZXRfc2VsZWN0b3JfbGluZV9y YW5nZXNfZm9yX2NzcygkJCk7CiBzdWIgbWV0aG9kX2RlY2xfdG9fc2VsZWN0b3IoJCk7CiBzdWIg cHJvY2Vzc1BhdGhzKFxAKTsKLXN1YiByZXZpZXdlckFuZERlc2NyaXB0aW9uRm9yR2l0Q29tbWl0 KCQpOworc3ViIHJldmlld2VyQW5kRGVzY3JpcHRpb25Gb3JHaXRDb21taXQoJCQpOwogc3ViIG5v cm1hbGl6ZUxpbmVFbmRpbmdzKCQkKTsKIHN1YiBkZWNvZGVFbnRpdGllcygkKTsKIApAQCAtMjAz LDcgKzIwMyw3IEBAIGlmICgkYnVnTnVtYmVyKSB7CiB9CiAKIGlmICgkYnVnTnVtYmVyICYmICEk YnVnRGVzY3JpcHRpb24pIHsKLSAgICAkYnVnRGVzY3JpcHRpb24gPSBmZXRjaEJ1Z0Rlc2NyaXB0 aW9uRnJvbVVSTCgkYnVnVVJMKTsKKyAgICAkYnVnRGVzY3JpcHRpb24gPSBmZXRjaEJ1Z0Rlc2Ny aXB0aW9uRnJvbVVSTCgkYnVnVVJMLCAkYnVnTnVtYmVyKTsKIH0KIAogbXkgKCRmaWxlc0luQ2hh bmdlTG9nLCAkcHJlZml4ZXMpID0gZmluZENoYW5nZUxvZ3MoJGZ1bmN0aW9uTGlzdHMpOwpAQCAt MjE1LDcgKzIxNSw3IEBAIGlmIChAJGNoYW5nZUxvZ3MgJiYgJHVwZGF0ZUNoYW5nZUxvZ3MgJiYg JGlzU1ZOKSB7CiAgICAgcmVzb2x2ZUNvbmZsaWN0ZWRDaGFuZ2VMb2dzKCRjaGFuZ2VMb2dzKTsK IH0KIAotZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCRwcmVmaXhlcywgJGZpbGVzSW5DaGFuZ2VMb2cs ICRhZGRlZFJlZ3Jlc3Npb25UZXN0cywgJGZ1bmN0aW9uTGlzdHMsICRidWdVUkwpOworZ2VuZXJh dGVOZXdDaGFuZ2VMb2dzKCRwcmVmaXhlcywgJGZpbGVzSW5DaGFuZ2VMb2csICRhZGRlZFJlZ3Jl c3Npb25UZXN0cywgJGZ1bmN0aW9uTGlzdHMsICRidWdVUkwsICRidWdEZXNjcmlwdGlvbiwgJG5h bWUsICRlbWFpbEFkZHJlc3MsICRnaXRSZXZpZXdlciwgJHdyaXRlQ2hhbmdlTG9ncyk7CiAKIGlm ICgkd3JpdGVDaGFuZ2VMb2dzKSB7CiAgICAgcHJpbnQgU1RERVJSICItLSBQbGVhc2UgcmVtZW1i ZXIgdG8gaW5jbHVkZSBhIGRldGFpbGVkIGRlc2NyaXB0aW9uIGluIHlvdXIgQ2hhbmdlTG9nIGVu dHJ5LiAtLVxuLS0gU2VlIDxodHRwOi8vd2Via2l0Lm9yZy9jb2RpbmcvY29udHJpYnV0aW5nLmh0 bWw+IGZvciBtb3JlIGluZm8gLS1cbiI7CkBAIC0zMzgsOSArMzM4LDkgQEAgc3ViIGNoYW5nZUxv Z0VtYWlsQWRkcmVzc0Zyb21BcmdzKCQpCiAgICAgcmV0dXJuICRlbWFpbEFkZHJlc3NGcm9tQXJn cyB8fCBjaGFuZ2VMb2dFbWFpbEFkZHJlc3MoKTsKIH0KIAotc3ViIGZldGNoQnVnRGVzY3JpcHRp b25Gcm9tVVJMKCQpCitzdWIgZmV0Y2hCdWdEZXNjcmlwdGlvbkZyb21VUkwoJCQpCiB7Ci0gICAg bXkgKCRidWdVUkwpID0gQF87CisgICAgbXkgKCRidWdVUkwsICRidWdOdW1iZXIpID0gQF87CiAK ICAgICBteSAkYnVnWE1MVVJMID0gIiRidWdVUkwmY3R5cGU9eG1sIjsKICAgICAjIFBlcmwgaGFz IG5vIGJ1aWx0IGluIFhNTCBwcm9jZXNzaW5nLCBzbyB3ZSdsbCBmZXRjaCBhbmQgcGFyc2Ugd2l0 aCBjdXJsIGFuZCBncmVwCkBAIC00NTQsOSArNDU0LDkgQEAgc3ViIHJlc29sdmVDb25mbGljdGVk Q2hhbmdlTG9ncygkKQogICAgIGNsb3NlIFJFU09MVkU7CiB9CiAKLXN1YiBnZW5lcmF0ZU5ld0No YW5nZUxvZ3MoJCQkJCQpCitzdWIgZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCQkJCQkJCQkJCQpCiB7 Ci0gICAgbXkgKCRwcmVmaXhlcywgJGZpbGVzSW5DaGFuZ2VMb2csICRhZGRlZFJlZ3Jlc3Npb25U ZXN0cywgJGZ1bmN0aW9uTGlzdHMsICRidWdVUkwpID0gQF87CisgICAgbXkgKCRwcmVmaXhlcywg JGZpbGVzSW5DaGFuZ2VMb2csICRhZGRlZFJlZ3Jlc3Npb25UZXN0cywgJGZ1bmN0aW9uTGlzdHMs ICRidWdVUkwsICRidWdEZXNjcmlwdGlvbiwgJG5hbWUsICRlbWFpbEFkZHJlc3MsICRnaXRSZXZp ZXdlciwgJHdyaXRlQ2hhbmdlTG9ncykgPSBAXzsKIAogICAgICMgR2VuZXJhdGUgbmV3IENoYW5n ZUxvZyBlbnRyaWVzIGFuZCAob3B0aW9uYWxseSkgd3JpdGUgb3V0IG5ldyBDaGFuZ2VMb2cgZmls ZXMuCiAgICAgZm9yZWFjaCBteSAkcHJlZml4IChAJHByZWZpeGVzKSB7CkBAIC00ODUsNyArNDg1 LDcgQEAgc3ViIGdlbmVyYXRlTmV3Q2hhbmdlTG9ncygkJCQkJCkKICAgICAgICAgbXkgJGRhdGUg PSBjaGFuZ2VMb2dEYXRlKCRjaGFuZ2VMb2dUaW1lWm9uZSk7CiAgICAgICAgIHByaW50IENIQU5H RV9MT0cgbm9ybWFsaXplTGluZUVuZGluZ3MoIiRkYXRlICAkbmFtZSAgPCRlbWFpbEFkZHJlc3M+ XG5cbiIsICRlbmRsKTsKIAotICAgICAgICBteSAoJHJldmlld2VyLCAkZGVzY3JpcHRpb24pID0g cmV2aWV3ZXJBbmREZXNjcmlwdGlvbkZvckdpdENvbW1pdCgkZ2l0Q29tbWl0KSBpZiAkZ2l0Q29t bWl0OworICAgICAgICBteSAoJHJldmlld2VyLCAkZGVzY3JpcHRpb24pID0gcmV2aWV3ZXJBbmRE ZXNjcmlwdGlvbkZvckdpdENvbW1pdCgkZ2l0Q29tbWl0LCAkZ2l0UmV2aWV3ZXIpIGlmICRnaXRD b21taXQ7CiAgICAgICAgICRyZXZpZXdlciA9ICJOT0JPRFkgKE9PIiAuICJQUyEpIiBpZiAhJHJl dmlld2VyOwogCiAgICAgICAgIHByaW50IENIQU5HRV9MT0cgbm9ybWFsaXplTGluZUVuZGluZ3Mo JGRlc2NyaXB0aW9uIC4gIlxuIiwgJGVuZGwpIGlmICRkZXNjcmlwdGlvbjsKQEAgLTE4MjIsOSAr MTgyMiw5IEBAIHN1YiB0ZXN0TGlzdEZvckNoYW5nZUxvZyhAKQogICAgIHJldHVybiAkbGlzdDsK IH0KIAotc3ViIHJldmlld2VyQW5kRGVzY3JpcHRpb25Gb3JHaXRDb21taXQoJCkKK3N1YiByZXZp ZXdlckFuZERlc2NyaXB0aW9uRm9yR2l0Q29tbWl0KCQkKQogewotICAgIG15ICgkY29tbWl0KSA9 IEBfOworICAgIG15ICgkY29tbWl0LCAkZ2l0UmV2aWV3ZXIpID0gQF87CiAKICAgICBteSAkZGVz Y3JpcHRpb24gPSAnJzsKICAgICBteSAkcmV2aWV3ZXI7Cg== 119412 2011-12-15 04:29:28 -0800 2011-12-15 15:13:57 -0800 rebased patch bug-74497-20111215212927.patch text/plain 4933 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyOTEzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjczNjdlMTkwY2ZiZmI1Y2ZhNGY0NDVmOTI4MmExZWRh MTNkMTE4NC4uYzgwMGVjM2ZiYmMxMTQ1N2Q5MDZhMTNhYTg0YzZiY2YxMzc0ZDM1ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDExLTEyLTE1ICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBbUmVmYWN0b3JpbmddIEluIHByZXBhcmUtQ2hhbmdlTG9nLCBtYWtlIHNldmVyYWwg Z2xvYmFsIHZhcmlhYmxlcyBiZSB1c2VkIG9ubHkgdGhyb3VnaCBwYXJhbWV0ZXIgcGFzc2luZwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQ0OTcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBhcmUgcGxh bm5pbmcgdG8gd3JpdGUgdW5pdC10ZXN0cyBmb3IgcHJlcGFyZS1DaGFuZ2VMb2cgaW4gYSBydW4t bGVha3NfdW5pdHRlc3QKKyAgICAgICAgbWFubmVyLiBUaGlzIGJ1ZyBpcyBvbmUgb2YgdGhlIGlu Y3JlbWVudGFsIHJlZmFjdG9yaW5ncyB0byByZW1vdmUgYWxsIHRvcC1sZXZlbAorICAgICAgICBj b2RlIGFuZCBnbG9iYWwgdmFyaWFibGVzIGZyb20gcHJlcGFyZS1DaGFuZ2VMb2cuIEluIHRoaXMg cGF0Y2gsCisgICAgICAgIHdlIG1ha2UgdGhlIGZvbGxvd2luZyBnbG9iYWwgdmFyaWFibGVzIGJl IHVzZWQgb25seSB0aHJvdWdoIHBhcmFtZXRlciBwYXNzaW5nLgorICAgICAgICAgICAgLSAkYnVn RGVzY3JpcHRpb24KKyAgICAgICAgICAgIC0gJGJ1Z051bWJlcgorICAgICAgICAgICAgLSAkbmFt ZQorICAgICAgICAgICAgLSAkZW1haWxBZGRyZXNzCisgICAgICAgICAgICAtICRnaXRSZXZpZXdl cgorICAgICAgICAgICAgLSAkd3JpdGVDaGFuZ2VMb2dzCisKKyAgICAgICAgKiBTY3JpcHRzL3By ZXBhcmUtQ2hhbmdlTG9nOgorICAgICAgICAoZmV0Y2hCdWdEZXNjcmlwdGlvbkZyb21VUkwpOgor ICAgICAgICAoZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKToKKyAgICAgICAgKHJldmlld2VyQW5kRGVz Y3JpcHRpb25Gb3JHaXRDb21taXQpOgorCiAyMDExLTEyLTE1ICBBbGV4YW5kZXIgRsOmcsO4eSAg PGFoZkAweDkwLmRrPgogCiAgICAgICAgIFtRdF0gUXRXZWJLaXQgZmFpbHMgdG8gYnVpbGQgb24g TWFjIE9TIFggYWZ0ZXIgcjEwMjc3NgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9wcmVwYXJl LUNoYW5nZUxvZyBiL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKaW5kZXggZTc5YTUx ZTA1YjYwOTdmMGI0MGNmNjhjN2E1OTUyNzU4NGY3YTlmYS4uZGZlZmEzODU5MDkxYzZkOTdhYzQw MWQxZjJmYmMwYjE3ZDQ4MmI4YyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNo YW5nZUxvZworKysgYi9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCkBAIC02NywxMSAr NjcsMTEgQEAgdXNlIFZDU1V0aWxzOwogc3ViIGNoYW5nZUxvZ0RhdGUoJCk7CiBzdWIgY2hhbmdl TG9nRW1haWxBZGRyZXNzRnJvbUFyZ3MoJCk7CiBzdWIgY2hhbmdlTG9nTmFtZUZyb21BcmdzKCQp Owotc3ViIGZldGNoQnVnRGVzY3JpcHRpb25Gcm9tVVJMKCQpOworc3ViIGZldGNoQnVnRGVzY3Jp cHRpb25Gcm9tVVJMKCQkKTsKIHN1YiBmaW5kQ2hhbmdlTG9ncygkKTsKIHN1YiBnZXRMYXRlc3RD aGFuZ2VMb2dzKCQpOwogc3ViIHJlc29sdmVDb25mbGljdGVkQ2hhbmdlTG9ncygkKTsKLXN1YiBn ZW5lcmF0ZU5ld0NoYW5nZUxvZ3MoJCQkJCQpOworc3ViIGdlbmVyYXRlTmV3Q2hhbmdlTG9ncygk JCQkJCQkJCQkKTsKIHN1YiBwcmludERpZmYoJCk7CiBzdWIgb3BlbkNoYW5nZUxvZ3MoJCk7CiBz dWIgZGlmZkZyb21Ub1N0cmluZygpOwpAQCAtMTAwLDcgKzEwMCw3IEBAIHN1YiBnZXRfZnVuY3Rp b25fbGluZV9yYW5nZXNfZm9yX3BlcmwoJCQpOwogc3ViIGdldF9zZWxlY3Rvcl9saW5lX3Jhbmdl c19mb3JfY3NzKCQkKTsKIHN1YiBtZXRob2RfZGVjbF90b19zZWxlY3RvcigkKTsKIHN1YiBwcm9j ZXNzUGF0aHMoXEApOwotc3ViIHJldmlld2VyQW5kRGVzY3JpcHRpb25Gb3JHaXRDb21taXQoJCk7 CitzdWIgcmV2aWV3ZXJBbmREZXNjcmlwdGlvbkZvckdpdENvbW1pdCgkJCk7CiBzdWIgbm9ybWFs aXplTGluZUVuZGluZ3MoJCQpOwogc3ViIGRlY29kZUVudGl0aWVzKCQpOwogCkBAIC0yMDEsNyAr MjAxLDcgQEAgaWYgKCRidWdOdW1iZXIpIHsKIH0KIAogaWYgKCRidWdOdW1iZXIgJiYgISRidWdE ZXNjcmlwdGlvbikgewotICAgICRidWdEZXNjcmlwdGlvbiA9IGZldGNoQnVnRGVzY3JpcHRpb25G cm9tVVJMKCRidWdVUkwpOworICAgICRidWdEZXNjcmlwdGlvbiA9IGZldGNoQnVnRGVzY3JpcHRp b25Gcm9tVVJMKCRidWdVUkwsICRidWdOdW1iZXIpOwogfQogCiBteSAoJGZpbGVzSW5DaGFuZ2VM b2csICRwcmVmaXhlcykgPSBmaW5kQ2hhbmdlTG9ncygkZnVuY3Rpb25MaXN0cyk7CkBAIC0yMTMs NyArMjEzLDcgQEAgaWYgKEAkY2hhbmdlTG9ncyAmJiAkdXBkYXRlQ2hhbmdlTG9ncyAmJiBpc1NW TigpKSB7CiAgICAgcmVzb2x2ZUNvbmZsaWN0ZWRDaGFuZ2VMb2dzKCRjaGFuZ2VMb2dzKTsKIH0K IAotZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCRwcmVmaXhlcywgJGZpbGVzSW5DaGFuZ2VMb2csICRh ZGRlZFJlZ3Jlc3Npb25UZXN0cywgJGZ1bmN0aW9uTGlzdHMsICRidWdVUkwpOworZ2VuZXJhdGVO ZXdDaGFuZ2VMb2dzKCRwcmVmaXhlcywgJGZpbGVzSW5DaGFuZ2VMb2csICRhZGRlZFJlZ3Jlc3Np b25UZXN0cywgJGZ1bmN0aW9uTGlzdHMsICRidWdVUkwsICRidWdEZXNjcmlwdGlvbiwgJG5hbWUs ICRlbWFpbEFkZHJlc3MsICRnaXRSZXZpZXdlciwgJHdyaXRlQ2hhbmdlTG9ncyk7CiAKIGlmICgk d3JpdGVDaGFuZ2VMb2dzKSB7CiAgICAgcHJpbnQgU1RERVJSICItLSBQbGVhc2UgcmVtZW1iZXIg dG8gaW5jbHVkZSBhIGRldGFpbGVkIGRlc2NyaXB0aW9uIGluIHlvdXIgQ2hhbmdlTG9nIGVudHJ5 LiAtLVxuLS0gU2VlIDxodHRwOi8vd2Via2l0Lm9yZy9jb2RpbmcvY29udHJpYnV0aW5nLmh0bWw+ IGZvciBtb3JlIGluZm8gLS1cbiI7CkBAIC0zMzYsOSArMzM2LDkgQEAgc3ViIGNoYW5nZUxvZ0Vt YWlsQWRkcmVzc0Zyb21BcmdzKCQpCiAgICAgcmV0dXJuICRlbWFpbEFkZHJlc3NGcm9tQXJncyB8 fCBjaGFuZ2VMb2dFbWFpbEFkZHJlc3MoKTsKIH0KIAotc3ViIGZldGNoQnVnRGVzY3JpcHRpb25G cm9tVVJMKCQpCitzdWIgZmV0Y2hCdWdEZXNjcmlwdGlvbkZyb21VUkwoJCQpCiB7Ci0gICAgbXkg KCRidWdVUkwpID0gQF87CisgICAgbXkgKCRidWdVUkwsICRidWdOdW1iZXIpID0gQF87CiAKICAg ICBteSAkYnVnWE1MVVJMID0gIiRidWdVUkwmY3R5cGU9eG1sIjsKICAgICAjIFBlcmwgaGFzIG5v IGJ1aWx0IGluIFhNTCBwcm9jZXNzaW5nLCBzbyB3ZSdsbCBmZXRjaCBhbmQgcGFyc2Ugd2l0aCBj dXJsIGFuZCBncmVwCkBAIC00NTIsOSArNDUyLDkgQEAgc3ViIHJlc29sdmVDb25mbGljdGVkQ2hh bmdlTG9ncygkKQogICAgIGNsb3NlIFJFU09MVkU7CiB9CiAKLXN1YiBnZW5lcmF0ZU5ld0NoYW5n ZUxvZ3MoJCQkJCQpCitzdWIgZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCQkJCQkJCQkJCQpCiB7Ci0g ICAgbXkgKCRwcmVmaXhlcywgJGZpbGVzSW5DaGFuZ2VMb2csICRhZGRlZFJlZ3Jlc3Npb25UZXN0 cywgJGZ1bmN0aW9uTGlzdHMsICRidWdVUkwpID0gQF87CisgICAgbXkgKCRwcmVmaXhlcywgJGZp bGVzSW5DaGFuZ2VMb2csICRhZGRlZFJlZ3Jlc3Npb25UZXN0cywgJGZ1bmN0aW9uTGlzdHMsICRi dWdVUkwsICRidWdEZXNjcmlwdGlvbiwgJG5hbWUsICRlbWFpbEFkZHJlc3MsICRnaXRSZXZpZXdl ciwgJHdyaXRlQ2hhbmdlTG9ncykgPSBAXzsKIAogICAgICMgR2VuZXJhdGUgbmV3IENoYW5nZUxv ZyBlbnRyaWVzIGFuZCAob3B0aW9uYWxseSkgd3JpdGUgb3V0IG5ldyBDaGFuZ2VMb2cgZmlsZXMu CiAgICAgZm9yZWFjaCBteSAkcHJlZml4IChAJHByZWZpeGVzKSB7CkBAIC00ODMsNyArNDgzLDcg QEAgc3ViIGdlbmVyYXRlTmV3Q2hhbmdlTG9ncygkJCQkJCkKICAgICAgICAgbXkgJGRhdGUgPSBj aGFuZ2VMb2dEYXRlKCRjaGFuZ2VMb2dUaW1lWm9uZSk7CiAgICAgICAgIHByaW50IENIQU5HRV9M T0cgbm9ybWFsaXplTGluZUVuZGluZ3MoIiRkYXRlICAkbmFtZSAgPCRlbWFpbEFkZHJlc3M+XG5c biIsICRlbmRsKTsKIAotICAgICAgICBteSAoJHJldmlld2VyLCAkZGVzY3JpcHRpb24pID0gcmV2 aWV3ZXJBbmREZXNjcmlwdGlvbkZvckdpdENvbW1pdCgkZ2l0Q29tbWl0KSBpZiAkZ2l0Q29tbWl0 OworICAgICAgICBteSAoJHJldmlld2VyLCAkZGVzY3JpcHRpb24pID0gcmV2aWV3ZXJBbmREZXNj cmlwdGlvbkZvckdpdENvbW1pdCgkZ2l0Q29tbWl0LCAkZ2l0UmV2aWV3ZXIpIGlmICRnaXRDb21t aXQ7CiAgICAgICAgICRyZXZpZXdlciA9ICJOT0JPRFkgKE9PIiAuICJQUyEpIiBpZiAhJHJldmll d2VyOwogCiAgICAgICAgIHByaW50IENIQU5HRV9MT0cgbm9ybWFsaXplTGluZUVuZGluZ3MoJGRl c2NyaXB0aW9uIC4gIlxuIiwgJGVuZGwpIGlmICRkZXNjcmlwdGlvbjsKQEAgLTE4MDQsOSArMTgw NCw5IEBAIHN1YiB0ZXN0TGlzdEZvckNoYW5nZUxvZyhAKQogICAgIHJldHVybiAkbGlzdDsKIH0K IAotc3ViIHJldmlld2VyQW5kRGVzY3JpcHRpb25Gb3JHaXRDb21taXQoJCkKK3N1YiByZXZpZXdl ckFuZERlc2NyaXB0aW9uRm9yR2l0Q29tbWl0KCQkKQogewotICAgIG15ICgkY29tbWl0KSA9IEBf OworICAgIG15ICgkY29tbWl0LCAkZ2l0UmV2aWV3ZXIpID0gQF87CiAKICAgICBteSAkZGVzY3Jp cHRpb24gPSAnJzsKICAgICBteSAkcmV2aWV3ZXI7Cg==