10632 2006-08-29 14:21:19 -0700 Objective-C DOM should use the @property syntax for DOM attributes 2006-08-29 15:18:05 -0700 1 1 1 Unclassified WebKit WebKit API 420+ Mac OS X 10.4 RESOLVED FIXED P2 Minor --- 1 timothy webkit-unassigned oldest_to_newest 54183 0 timothy 2006-08-29 14:21:19 -0700 We should use @propery for the ObjC DOM bindings now that we are auto-generating them. 54189 1 10306 timothy 2006-08-29 14:44:23 -0700 Created attachment 10306 Patch to do this 54190 2 10306 eric 2006-08-29 14:49:44 -0700 Comment on attachment 10306 Patch to do this Looks great! r=me. 54191 3 timothy 2006-08-29 15:18:05 -0700 Landed in r16100. 10306 2006-08-29 14:44:23 -0700 2006-08-29 14:49:44 -0700 Patch to do this 10632.patch text/plain 11465 timothy SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDE2MDk5 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMDYtMDgt MjkgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAxMDYzMjogT2JqZWN0aXZlLUMg RE9NIHNob3VsZCB1c2UgdGhlIEBwcm9wZXJ0eSBzeW50YXggZm9yIERPTSBhdHRyaWJ1dGVzCisg ICAgICAgIGh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2 MzIKKworICAgICAgICBHZW5lcmF0ZSBAcHJvcGVydHkgd2hlbiBNQUNPU1hfREVQTE9ZTUVOVF9U QVJHRVQgaXMgPj0gMTAuNS4KKyAgICAgICAgVGhpcyBpcyBiYWNrd2FyZHMgY29tcGF0aWJsZSB3 aXRoIHRoZSBnZXR0ZXIvc2V0dGVyIG1ldGhvZHMuCisgICAgICAgIEdlbmVyYXRlIHNldHRlciBh cmd1bWVudHMgd2l0aCBhICJuZXciIHByZWZpeCB0byBhdm9pZCB0aGUgcHJvcGVydHkKKyAgICAg ICAgbmFtZSBjb25mbGljdCB3YXJuaW5nLiBBbHNvIHJlbW92ZXMgc29tZSB3aGl0ZXNwYWNlIGFu ZCB0aGUgY29tbWVudHMKKyAgICAgICAgdGhhdCB3ZSBhZGRlZCB0byB0aGUgaGVhZGVycy4gVGhp cyBtYWtlcyB0aGUgaGVhZGVycyBsb29rIGxpa2Ugd2hhdCB3ZSBzaGlwIG5vdy4KKworICAgICAg ICAqIGJpbmRpbmdzL29iamMvRE9NQ1NTLm1tOgorICAgICAgICAoLVtET01Eb2N1bWVudCBnZXRD b21wdXRlZFN0eWxlOjpdKTogcmVuYW1lZCBhIGxvY2FsIHZhcmlhYmxlIHRvIGF2b2lkIHRoZSBw cm9wZXJ0eSBuYW1lIGNvbmZsaWN0LgorICAgICAgICAoLVtET01Eb2N1bWVudCBnZXRNYXRjaGVk Q1NTUnVsZXM6Ol0pOiBkaXR0by4KKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5l cmF0b3JPYmpDLnBtOiBnZW5lcmF0ZSBAcHJvcGVydHkgaW4gdGhlIGhlYWRlcnMuCisKIDIwMDYt MDgtMzAgIE5pa29sYXMgWmltbWVybWFubiAgPHppbW1lcm1hbm5Aa2RlLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBhbmQgbGFuZGVkIGJ5IEFuZGVycy4KSW5kZXg6IGJpbmRpbmdzL29iamMvRE9N Q1NTLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIGJpbmRpbmdzL29iamMvRE9NQ1NTLm1tCShyZXZpc2lvbiAx NjA5OCkKKysrIGJpbmRpbmdzL29iamMvRE9NQ1NTLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yNDg4 LDI0ICsyNDg4LDI0IEBAIHZvaWQgcmVtb3ZlV3JhcHBlckZvclJHQihSR0JBMzIgdmFsdWUpCiAt IChET01DU1NTdHlsZURlY2xhcmF0aW9uICopZ2V0Q29tcHV0ZWRTdHlsZTooRE9NRWxlbWVudCAq KWVsdCA6KE5TU3RyaW5nICopcHNldWRvRWx0CiB7CiAgICAgRWxlbWVudCogZWxlbWVudCA9IFtl bHQgX2VsZW1lbnRdOwotICAgIEFic3RyYWN0VmlldyogZGVmYXVsdFZpZXcgPSBbc2VsZiBfZG9j dW1lbnRdLT5kZWZhdWx0VmlldygpOworICAgIEFic3RyYWN0VmlldyogZHYgPSBbc2VsZiBfZG9j dW1lbnRdLT5kZWZhdWx0VmlldygpOwogICAgIFN0cmluZyBwc2V1ZG9FbHRTdHJpbmcocHNldWRv RWx0KTsKICAgICAKLSAgICBpZiAoIWRlZmF1bHRWaWV3KQorICAgIGlmICghZHYpCiAgICAgICAg IHJldHVybiBuaWw7CiAgICAgCi0gICAgcmV0dXJuIFtET01DU1NTdHlsZURlY2xhcmF0aW9uIF9z dHlsZURlY2xhcmF0aW9uV2l0aDpkZWZhdWx0Vmlldy0+Z2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50 LCBwc2V1ZG9FbHRTdHJpbmcuaW1wbCgpKS5nZXQoKV07CisgICAgcmV0dXJuIFtET01DU1NTdHls ZURlY2xhcmF0aW9uIF9zdHlsZURlY2xhcmF0aW9uV2l0aDpkdi0+Z2V0Q29tcHV0ZWRTdHlsZShl bGVtZW50LCBwc2V1ZG9FbHRTdHJpbmcuaW1wbCgpKS5nZXQoKV07CiB9CiAKIC0gKERPTUNTU1J1 bGVMaXN0ICopZ2V0TWF0Y2hlZENTU1J1bGVzOihET01FbGVtZW50ICopZWx0IDooTlNTdHJpbmcg Kilwc2V1ZG9FbHQKIHsKLSAgICBBYnN0cmFjdFZpZXcqIGRlZmF1bHRWaWV3ID0gW3NlbGYgX2Rv Y3VtZW50XS0+ZGVmYXVsdFZpZXcoKTsKKyAgICBBYnN0cmFjdFZpZXcqIGR2ID0gW3NlbGYgX2Rv Y3VtZW50XS0+ZGVmYXVsdFZpZXcoKTsKIAotICAgIGlmICghZGVmYXVsdFZpZXcpCisgICAgaWYg KCFkdikKICAgICAgICAgcmV0dXJuIG5pbDsKICAgICAKICAgICAvLyBUaGUgcGFyYW1ldGVyIG9m ICJmYWxzZSIgaXMgaGFuZHkgZm9yIHRoZSBET00gaW5zcGVjdG9yIGFuZCBsZXRzIHVzIHNlZSB1 c2VyIGFnZW50IGFuZCB1c2VyIHJ1bGVzLgotICAgIHJldHVybiBbRE9NQ1NTUnVsZUxpc3QgX3J1 bGVMaXN0V2l0aDpkZWZhdWx0Vmlldy0+Z2V0TWF0Y2hlZENTU1J1bGVzKFtlbHQgX2VsZW1lbnRd LCBTdHJpbmcocHNldWRvRWx0KS5pbXBsKCksIGZhbHNlKS5nZXQoKV07CisgICAgcmV0dXJuIFtE T01DU1NSdWxlTGlzdCBfcnVsZUxpc3RXaXRoOmR2LT5nZXRNYXRjaGVkQ1NTUnVsZXMoW2VsdCBf ZWxlbWVudF0sIFN0cmluZyhwc2V1ZG9FbHQpLmltcGwoKSwgZmFsc2UpLmdldCgpXTsKIH0KIAog QGVuZApJbmRleDogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yT2JqQy5wbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JPYmpDLnBtCShyZXZpc2lvbiAx NjA5OCkKKysrIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvck9iakMucG0JKHdvcmtpbmcg Y29weSkKQEAgLTM3LDcgKzM3LDYgQEAgbXkgJWhlYWRlckZvcndhcmREZWNsYXJhdGlvbnNGb3JQ cm90b2NvbAogbXkgJGV4Y2VwdGlvbkluaXQgPSAiV2ViQ29yZTo6RXhjZXB0aW9uQ29kZSBlYyA9 IDA7IjsKIG15ICRleGNlcHRpb25SYWlzZU9uRXJyb3IgPSAicmFpc2VPbkRPTUVycm9yKGVjKTsi OwogCi0KICMgRGVmYXVsdCBMaWNlbmNlIFRlbXBsYXRlcwogbXkgJGhlYWRlckxpY2VuY2VUZW1w bGF0ZSA9IDw8ICJFT0YiOwogLyoKQEAgLTM5NSw3ICszOTQsNiBAQCBzdWIgQWRkSW5jbHVkZXNG b3JUeXBlCiAgICAgICAgICRpbXBsSW5jbHVkZXN7IkRPTUltcGxlbWVudGF0aW9uRnJvbnQuaCJ9 ID0gMTsKICAgICB9CiAKLQogICAgICMgQWRkIHR5cGUgc3BlY2lmaWMgaW50ZXJuYWwgdHlwZXMu CiAgICAgJGltcGxJbmNsdWRlc3siRE9NSFRNTEludGVybmFsLmgifSA9IDEgaWYgKCR0eXBlID1+ IC9eSFRNTC8pOwogCkBAIC00MzksNiArNDM3LDcgQEAgc3ViIEdlbmVyYXRlSGVhZGVyCiAgICAg ICAgICAgICAKICAgICAgICAgICAgIHB1c2goQGhlYWRlckNvbnN0YW50cywgJG91dHB1dCk7CiAg ICAgICAgIH0KKwogICAgICAgICBteSAkY29tYmluZWRDb25zdGFudHMgPSBqb2luKCIsXG4iLCBA aGVhZGVyQ29uc3RhbnRzKTsKIAogICAgICAgICAjIEZJWE1FOiB0aGUgZm9ybWF0dGluZyBvZiB0 aGUgZW51bXMgc2hvdWxkIGxpbmUgdXAgdGhlIGVxdWFsIHNpZ25zLgpAQCAtNDc1LDMwICs0NzQs MzggQEAgc3ViIEdlbmVyYXRlSGVhZGVyCiAgICAgICAgICAgICBteSAkYXR0cmlidXRlSXNSZWFk b25seSA9ICgkYXR0cmlidXRlLT50eXBlID1+IC9ecmVhZG9ubHkvKTsKICAgICAgICAgICAgIG15 ICRjYXRhZ29yeSA9ICRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57 Ik9iakNDYXRhZ29yeSJ9OwogCi0gICAgICAgICAgICAjIC0gR0VUVEVSCi0gICAgICAgICAgICBt eSAkZ2V0dGVyID0gIi0gKCIgLiAkYXR0cmlidXRlVHlwZSAuICIpIiAuICRhdHRyaWJ1dGVOYW1l IC4gIjtcbiI7Ci0gICAgICAgICAgICAKLSAgICAgICAgICAgIGlmICgkY2F0YWdvcnkpIHsKLSAg ICAgICAgICAgICAgICBwdXNoKEB7ICRoYXNoT2ZDYXRhZ29yaWVzeyRjYXRhZ29yeX0gfSwgJGdl dHRlcik7CisgICAgICAgICAgICBpZiAoJEVOVnsiTUFDT1NYX0RFUExPWU1FTlRfVEFSR0VUIn0g Pj0gMTAuNSkgeworICAgICAgICAgICAgICAgIG15ICRwcm9wZXJ0eSA9ICJcQHByb3BlcnR5IiAu ICgkYXR0cmlidXRlSXNSZWFkb25seSA/ICIocmVhZG9ubHkpIiA6ICIiKSAuICIgIiAuICRhdHRy aWJ1dGVUeXBlIC4gKCRhdHRyaWJ1dGVUeXBlID1+IC9cKiQvID8gIiIgOiAiICIpIC4gJGF0dHJp YnV0ZU5hbWUgLiAiO1xuIjsKKworICAgICAgICAgICAgICAgIGlmICgkY2F0YWdvcnkpIHsKKyAg ICAgICAgICAgICAgICAgICAgcHVzaChAeyAkaGFzaE9mQ2F0YWdvcmllc3skY2F0YWdvcnl9IH0s ICRwcm9wZXJ0eSk7CisgICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAg ICAgcHVzaChAaGVhZGVyQXR0cmlidXRlcywgJHByb3BlcnR5KTsKKyAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIHB1c2goQGhlYWRlckF0dHJp YnV0ZXMsICRnZXR0ZXIpOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICMgLSBHRVRU RVIKKyAgICAgICAgICAgICAgICBteSAkZ2V0dGVyID0gIi0gKCIgLiAkYXR0cmlidXRlVHlwZSAu ICIpIiAuICRhdHRyaWJ1dGVOYW1lIC4gIjtcbiI7CiAKLSAgICAgICAgICAgIAotICAgICAgICAg ICAgIyAtIFNFVFRFUgotICAgICAgICAgICAgaWYgKCEkYXR0cmlidXRlSXNSZWFkb25seSkgewot ICAgICAgICAgICAgICAgIG15ICRzZXR0ZXIgPSAiLSAodm9pZClzZXQiIC4gdWNmaXJzdCgkYXR0 cmlidXRlTmFtZSkgLiAiOigiIC4gJGF0dHJpYnV0ZVR5cGUgLiAiKSIgLiAkYXR0cmlidXRlTmFt ZSAuICI7XG4iOwotICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgIGlmICgkY2F0YWdv cnkpIHsKLSAgICAgICAgICAgICAgICAgICAgcHVzaChAeyAkaGFzaE9mQ2F0YWdvcmllc3skY2F0 YWdvcnl9IH0sICRzZXR0ZXIpOworICAgICAgICAgICAgICAgICAgICBwdXNoKEB7ICRoYXNoT2ZD YXRhZ29yaWVzeyRjYXRhZ29yeX0gfSwgJGdldHRlcik7CiAgICAgICAgICAgICAgICAgfSBlbHNl IHsKLSAgICAgICAgICAgICAgICAgICAgcHVzaChAaGVhZGVyQXR0cmlidXRlcywgJHNldHRlcik7 CisgICAgICAgICAgICAgICAgICAgIHB1c2goQGhlYWRlckF0dHJpYnV0ZXMsICRnZXR0ZXIpOwor ICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgICMgLSBTRVRURVIKKyAgICAgICAg ICAgICAgICBpZiAoISRhdHRyaWJ1dGVJc1JlYWRvbmx5KSB7CisgICAgICAgICAgICAgICAgICAg IG15ICRzZXR0ZXIgPSAiLSAodm9pZClzZXQiIC4gdWNmaXJzdCgkYXR0cmlidXRlTmFtZSkgLiAi OigiIC4gJGF0dHJpYnV0ZVR5cGUgLiAiKW5ldyIgLiB1Y2ZpcnN0KCRhdHRyaWJ1dGVOYW1lKSAu ICI7XG4iOworICAgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICAgICAgaWYgKCRj YXRhZ29yeSkgeworICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAeyAkaGFzaE9mQ2F0YWdv cmllc3skY2F0YWdvcnl9IH0sICRzZXR0ZXIpOworICAgICAgICAgICAgICAgICAgICB9IGVsc2Ug eworICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAaGVhZGVyQXR0cmlidXRlcywgJHNldHRl cik7CisgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg ICB9CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoQGhlYWRlckF0dHJpYnV0ZXMgPiAwKSB7Ci0g ICAgICAgICAgICBwdXNoKEBoZWFkZXJDb250ZW50LCAiXG4vLyBBdHRyaWJ1dGVzXG4iKTsKICAg ICAgICAgICAgIHB1c2goQGhlYWRlckNvbnRlbnQsIEBoZWFkZXJBdHRyaWJ1dGVzKTsKICAgICAg ICAgfQogICAgIH0KQEAgLTUzNywxNyArNTQ0LDE2IEBAIHN1YiBHZW5lcmF0ZUhlYWRlcgogICAg ICAgICB9CiAKICAgICAgICAgaWYgKEBoZWFkZXJGdW5jdGlvbnMgPiAwKSB7Ci0gICAgICAgICAg ICBwdXNoKEBoZWFkZXJDb250ZW50LCAiXG4vLyBNZXRob2RzXG4iKTsKKyAgICAgICAgICAgIHB1 c2goQGhlYWRlckNvbnRlbnQsICJcbiIpOwogICAgICAgICAgICAgcHVzaChAaGVhZGVyQ29udGVu dCwgQGhlYWRlckZ1bmN0aW9ucyk7CiAgICAgICAgIH0KICAgICB9CiAKICAgICAjIC0gRW5kIEBp bnRlcmZhY2UgCi0gICAgcHVzaChAaGVhZGVyQ29udGVudCwgIlxuXEBlbmRcbiIpOworICAgIHB1 c2goQGhlYWRlckNvbnRlbnQsICJcQGVuZFxuIik7CiAgICAgCiAgICAgIyBBZGQgYWRkaXRpb25h bCBDYXRhZ29yaWVzIChpZiBhbnkpCiAgICAgaWYgKHNjYWxhcihrZXlzKCVoYXNoT2ZDYXRhZ29y aWVzKSkpIHsKLSAgICAgICAgCiAgICAgICAgIGZvcmVhY2goc29ydChrZXlzKCVoYXNoT2ZDYXRh Z29yaWVzKSkpIHsKICAgICAgICAgICAgIG15ICRjYXRhZ29yeSA9ICRfOwogCkBAIC01NzUsNyAr NTgxLDYgQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRpb24KICAgICBteSAkaW1wbENsYXNzTmFt ZSA9IEdldEltcGxDbGFzc05hbWUoJGludGVyZmFjZU5hbWUpOwogICAgIG15ICRwYXJlbnRJbXBs Q2xhc3NOYW1lID0gR2V0UGFyZW50SW1wbENsYXNzTmFtZSgkZGF0YU5vZGUpOwogCi0KICAgICBt eSAkbnVtQXR0cmlidXRlcyA9IEB7JGRhdGFOb2RlLT5hdHRyaWJ1dGVzfTsKICAgICBteSAkbnVt RnVuY3Rpb25zID0gQHskZGF0YU5vZGUtPmZ1bmN0aW9uc307CiAgICAgbXkgJGhhc0Z1bmN0aW9u c09yQXR0cmlidXRlcyA9ICRudW1BdHRyaWJ1dGVzICsgJG51bUZ1bmN0aW9uczsKQEAgLTYyNiw3 ICs2MzEsNiBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgIGlmICgkaGFzRnVuY3Rp b25zT3JBdHRyaWJ1dGVzKSB7CiAgICAgICAgIGlmICgkcGFyZW50SW1wbENsYXNzTmFtZSBlcSAi T2JqZWN0IikgewogICAgICAgICAgICAgIyBPbmx5IGdlbmVyYXRlICdkZWFsbG9jJyBhbmQgJ2Zp bmFsaXplJyBtZXRob2RzIGZvciBkaXJlY3Qgc3ViY2xhc3NlcyBvZiBET01PYmplY3QuCi0KICAg ICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiLSAodm9pZClkZWFsbG9jXG4iKTsKICAgICAg ICAgICAgIHB1c2goQGltcGxDb250ZW50LCAie1xuIik7CiAgICAgICAgICAgICBwdXNoKEBpbXBs Q29udGVudCwgIiAgICBpZiAoX2ludGVybmFsKVxuIik7CkBAIC02NDUsOSArNjQ5LDcgQEAgc3Vi IEdlbmVyYXRlSW1wbGVtZW50YXRpb24KICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAi e1xuIik7CiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICByZXR1cm4gRE9NX2Nh c3Q8JGltcGxDbGFzc05hbWUgKj4oX2ludGVybmFsKTtcbiIpOwogICAgICAgICAgICAgcHVzaChA aW1wbENvbnRlbnQsICJ9XG5cbiIpOwotCiAgICAgICAgIH0gZWxzZSB7Ci0gICAgCiAgICAgICAg ICAgICBteSAkaW50ZXJuYWxCYXNlVHlwZTsKICAgICAgICAgICAgIGlmICgkaW50ZXJmYWNlTmFt ZSBlcSAiQ1NTUHJpbWl0aXZlVmFsdWUiKSB7CiAgICAgICAgICAgICAgICAgIyBGSVhNRTogdGhp cyBzaG91bGQgYmUgYSByZWdleCBtYXRjaGluZyBDU1MuLi5WYWx1ZS4KQEAgLTY1OCw2ICs2NjAs NyBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgICAgICAgICAgfSBlbHNlIHsKICAg ICAgICAgICAgICAgICAkaW50ZXJuYWxCYXNlVHlwZSA9ICJXZWJDb3JlOjpOb2RlIgogICAgICAg ICAgICAgfQorCiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIi0gKCRpbXBsQ2xhc3NO YW1lICopJGludGVybmFsQ2FzdGluZ05hbWVcbiIpOwogICAgICAgICAgICAgcHVzaChAaW1wbENv bnRlbnQsICJ7XG4iKTsKICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIHJldHVy biBzdGF0aWNfY2FzdDwkaW1wbENsYXNzTmFtZSAqPihET01fY2FzdDwkaW50ZXJuYWxCYXNlVHlw ZSAqPihfaW50ZXJuYWwpKTtcbiIpOwpAQCAtNzM2LDE0ICs3MzksMTQgQEAgc3ViIEdlbmVyYXRl SW1wbGVtZW50YXRpb24KIAogICAgICAgICAgICAgIyAtIFNFVFRFUgogICAgICAgICAgICAgaWYg KCEkYXR0cmlidXRlSXNSZWFkb25seSkgewotICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAg IyBFeGNlcHRpb24gaGFuZGxpbmcKICAgICAgICAgICAgICAgICBteSAkaGFzU2V0dGVyRXhjZXB0 aW9uID0gQHskYXR0cmlidXRlLT5zZXR0ZXJFeGNlcHRpb25zfTsKICAgICAgICAgICAgICAgICAK ICAgICAgICAgICAgICAgICAkYXR0cmlidXRlTmFtZSA9ICJzZXQiIC4gdWNmaXJzdCgkYXR0cmli dXRlTmFtZSk7CiAgICAgICAgICAgICAgICAgbXkgJHNldHRlck5hbWUgPSAic2V0IiAuIHVjZmly c3QoJGludGVyZmFjZU5hbWUpOworICAgICAgICAgICAgICAgIG15ICRhcmdOYW1lID0gIm5ldyIg LiB1Y2ZpcnN0KCRpbnRlcmZhY2VOYW1lKTsKIAotICAgICAgICAgICAgICAgIG15ICRzZXR0ZXJT aWcgPSAiLSAodm9pZCkkc2V0dGVyTmFtZTooJGF0dHJpYnV0ZVR5cGUpJGludGVyZmFjZU5hbWVc biI7CisgICAgICAgICAgICAgICAgbXkgJHNldHRlclNpZyA9ICItICh2b2lkKSRzZXR0ZXJOYW1l OigkYXR0cmlidXRlVHlwZSkkYXJnTmFtZVxuIjsKICAgICAgICAgICAgICAgICAKICAgICAgICAg ICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgJHNldHRlclNpZyk7CiAgICAgICAgICAgICAgICAg cHVzaChAaW1wbENvbnRlbnQsICJ7XG4iKTsKQEAgLTc1MSwxMyArNzU0LDEzIEBAIHN1YiBHZW5l cmF0ZUltcGxlbWVudGF0aW9uCiAgICAgICAgICAgICAgICAgaWYgKCRoYXNTZXR0ZXJFeGNlcHRp b24pIHsKICAgICAgICAgICAgICAgICAgICAgIyBGSVhNRTogYXNzZXJ0cyBleHNpc3QgaW4gdGhl IGV4c2lzdGluZyBiaW5kaW5ncywgYnV0IEkgYW0gdW5zdXJlIHdoeSB0aGV5IGFyZSAKICAgICAg ICAgICAgICAgICAgICAgIyB0aGVyZSBpbiB0aGUgZmlyc3QgcGxhY2U7Ci0gICAgICAgICAgICAg ICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIEFTU0VSVCgkaW50ZXJmYWNlTmFtZSk7XG5c biIpOworICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBBU1NFUlQo JGFyZ05hbWUpO1xuXG4iKTsKICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAg cHVzaChAaW1wbENvbnRlbnQsICIgICAgJGV4Y2VwdGlvbkluaXRcbiIpOwotICAgICAgICAgICAg ICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAkaW1wbGVtZW50YXRpb24tPiRhdHRyaWJ1 dGVOYW1lKCRpbnRlcmZhY2VOYW1lLCBlYyk7XG4iKTsKKyAgICAgICAgICAgICAgICAgICAgcHVz aChAaW1wbENvbnRlbnQsICIgICAgJGltcGxlbWVudGF0aW9uLT4kYXR0cmlidXRlTmFtZSgkYXJn TmFtZSwgZWMpO1xuIik7CiAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAi ICAgICRleGNlcHRpb25SYWlzZU9uRXJyb3JcbiIpOwogICAgICAgICAgICAgICAgIH0gZWxzZSB7 Ci0gICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICRpbXBsZW1lbnRh dGlvbi0+JGF0dHJpYnV0ZU5hbWUoJGludGVyZmFjZU5hbWUpO1xuIik7CisgICAgICAgICAgICAg ICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICRpbXBsZW1lbnRhdGlvbi0+JGF0dHJpYnV0 ZU5hbWUoJGFyZ05hbWUpO1xuIik7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAg IAogICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAifVxuXG4iKTsKQEAgLTgxOSw3 ICs4MjIsNiBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogCiAgICAgICAgICAgICBpZiAo JHJldHVyblR5cGUgZXEgInZvaWQiKSB7CiAgICAgICAgICAgICAgICAgIyBTcGVjaWFsIGNhc2Ug J3ZvaWQnIHJldHVybiB0eXBlLgotCiAgICAgICAgICAgICAgICAgbXkgJGZ1bmN0aW9uQ29udGVu dEhlYWQgPSAiJGltcGxlbWVudGF0aW9uLT4kZnVuY3Rpb25OYW1lKCI7CiAgICAgICAgICAgICAg ICAgbXkgJGZ1bmN0aW9uQ29udGVudFRhaWwgPSAiKTsiOwogICAgICAgICAgICAgICAgIG15ICRj b250ZW50ID0gIiI7CkBAIC04NDYsOSArODQ4LDcgQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRp b24KICAgICAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgICAgICBwdXNoKEBm dW5jdGlvbkNvbnRlbnQsICIgICAgJGNvbnRlbnRcbiIpOwogICAgICAgICAgICAgICAgIH0KLQog ICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICBt eSAkZnVuY3Rpb25Db250ZW50SGVhZCA9ICRpbXBsZW1lbnRhdGlvbiAuICItPiIgLiAkZnVuY3Rp b25OYW1lIC4gIigiOwogICAgICAgICAgICAgICAgIG15ICRmdW5jdGlvbkNvbnRlbnRUYWlsID0g IikiOwogCkBAIC04OTIsNyArODkyLDYgQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRpb24KICAg ICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAK LSAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICBpZiAoJHJhaXNlc0V4Y2VwdGlvbnMp IHsKICAgICAgICAgICAgICAgICAgICAgIyBEaWZmZXJlbnRpYXRlZCBiZXR3ZWVuIHdoZW4gdGhl IHJldHVybiB0eXBlIGlzIGEgcG9pbnRlciBhbmQKICAgICAgICAgICAgICAgICAgICAgIyBub3Qg Zm9yIHdoaXRlIHNwYWNlIGlzc3VlIChpZS4gRm9vICpyZXN1bHQgdnMuIGludCByZXN1bHQpLgpA QCAtOTIxLDYgKzkyMCw3IEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVudGF0aW9uCiAgICAgICAgICAg ICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgICAgIFtOU0V4Y2VwdGlvbiByYWlzZTpOU0dl bmVyaWNFeGNlcHRpb24gZm9ybWF0OlxAXCJjcmVhdGVFeHByZXNzaW9uIGN1cnJlbnRseSBkb2Vz IG5vdCB3b3JrIHdpdGggY3VzdG9tIE5TIHJlc29sdmVyc1wiXTtcbiIpOwogICAgICAgICAgICAg ICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIERPTU5hdGl2ZVhQYXRoTlNSZXNvbHZlciAqbmF0 aXZlUmVzb2x2ZXIgPSAoRE9NTmF0aXZlWFBhdGhOU1Jlc29sdmVyICopJHBhcmFtTmFtZTtcblxu Iik7CiAgICAgICAgICAgICB9CisKICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCBAZnVu Y3Rpb25Db250ZW50KTsKICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAifVxuXG4iKTsK ICAgICAgICAgICAgIApAQCAtOTUyLDcgKzk1Miw3IEBAIHN1YiBXcml0ZURhdGEKICAgICAgICAg QGltcGxDb250ZW50ID0gIiI7ICAgIAogICAgICAgICAlaW1wbEluY2x1ZGVzID0gKCk7CiAgICAg fQotICAgICAgICAKKwogICAgIGlmIChkZWZpbmVkKCRIRUFERVIpKSB7CiAgICAgICAgICMgV3Jp dGUgY29udGVudCB0byBmaWxlLgogICAgICAgICBwcmludCAkSEVBREVSIEBoZWFkZXJDb250ZW50 SGVhZGVyOwo=