42523 2010-07-18 13:22:20 -0700 Web Inspector: the bindings generation helper script can be simplified a bit. Chromium. 2010-07-21 00:37:36 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 42658 0 loislo webkit-unassigned abarth bweinstein eric joepeck keishi pfeldman pmuellr rik webkit.review.bot yurys oldest_to_newest 252995 0 loislo 2010-07-18 13:22:20 -0700 rule_binding.py does move operation for header files generated by CodeGeneratorV8. It is a bit strange because its much easier to generate headers in the right folder by CodeGenerator itself. 252996 1 61909 loislo 2010-07-18 13:25:04 -0700 Created attachment 61909 [patch] initial version. 252997 2 61909 pfeldman 2010-07-18 13:33:35 -0700 Comment on attachment 61909 [patch] initial version. A bunch of nits to fix. WebCore/WebCore.gyp/scripts/rule_binding.py:124 + command.extend(['--outputHDir', hdir]) Here and below outputHeadersDir WebCore/WebCore.gyp/scripts/rule_binding.py:  + # Both the .cpp and .h were generated in cppdir, but if hdir is different, Can you avoid changing this behavior? WebCore/bindings/scripts/CodeGenerator.pm:112 + $codeGenerator = $ifaceName->new($object, $useOutputDir, $useLayerOnTop, $preprocessor, $writeDependencies, $verbose, $useOutputHDir); I'd keep useOutputDir and useOutputHeadersDir next to each other. WebCore/inspector/CodeGeneratorInspector.pm:282 + open(my $HEADER, ">$outputHDir/$frontendClassName.h") || die "Couldn't open file $outputDir/$frontendClassName.h"; print HeadersDir, not Dir in the message. 253000 3 61912 loislo 2010-07-18 14:11:58 -0700 Created attachment 61912 [patch] second iteration 253094 4 61912 yurys 2010-07-18 22:57:01 -0700 Comment on attachment 61912 [patch] second iteration WebCore/ChangeLog:5 + WebInspector: Web Inspector: the bindings generation helper script can be WebInspector: Web Inspector: -> Web Inspector: 253862 5 webkit.review.bot 2010-07-20 12:33:27 -0700 http://trac.webkit.org/changeset/63764 might have broken Chromium Linux Release The following changes are on the blame list: http://trac.webkit.org/changeset/63761 http://trac.webkit.org/changeset/63764 254149 6 loislo 2010-07-21 00:37:36 -0700 Committed r63803 M WebCore/ChangeLog M WebCore/WebCore.gyp/WebCore.gyp M WebCore/WebCore.gyp/scripts/rule_binding.py M WebCore/bindings/scripts/CodeGeneratorCPP.pm M WebCore/bindings/scripts/generate-bindings.pl M WebCore/bindings/scripts/CodeGeneratorJS.pm M WebCore/bindings/scripts/CodeGeneratorObjC.pm M WebCore/bindings/scripts/CodeGeneratorV8.pm M WebCore/bindings/scripts/CodeGenerator.pm M WebCore/inspector/CodeGeneratorInspector.pm r63803 = f77b355757ca7fcdb5f175d980dca7784f35debc (refs/remotes/trunk) 61909 2010-07-18 13:25:04 -0700 2010-07-18 14:11:58 -0700 [patch] initial version. patch text/plain 7581 loislo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NGM4YzQwMS4uNjI0Mjg4YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wNy0xOCAgSWx5YSBUaWtob25v dnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2ViSW5zcGVjdG9yOiBXZWIgSW5zcGVjdG9yOiB0aGUgYmlu ZGluZ3MgZ2VuZXJhdGlvbiBoZWxwZXIgc2NyaXB0IGNhbiBiZQorICAgICAgICBzaW1wbGlmaWVk IGEgYml0LiBDaHJvbWl1bS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQyNTIzCisKKyAgICAgICAgKiBXZWJDb3JlLmd5cC9XZWJDb3JlLmd5cDoKKyAg ICAgICAgKiBXZWJDb3JlLmd5cC9zY3JpcHRzL3J1bGVfYmluZGluZy5weToKKyAgICAgICAgKiBi aW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3IucG06CisgICAgICAgICogYmluZGluZ3Mvc2Ny aXB0cy9Db2RlR2VuZXJhdG9yVjgucG06CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9nZW5l cmF0ZS1iaW5kaW5ncy5wbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3Bl Y3Rvci5wbToKKwogMjAxMC0wNy0xOCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCmRpZmYgLS1naXQgYS9X ZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwIGIvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJD b3JlLmd5cAppbmRleCAwYzNmYTgxLi42MTkzMjk0IDEwMDY0NAotLS0gYS9XZWJDb3JlL1dlYkNv cmUuZ3lwL1dlYkNvcmUuZ3lwCisrKyBiL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAK QEAgLTUwMiw3ICs1MDIsNiBAQAogICAgICAgICAgICAgJzxAKF9pbnB1dHMpJywKICAgICAgICAg ICAgICctLScsCiAgICAgICAgICAgICAnLS1kZWZpbmVzJywgJzwoZmVhdHVyZV9kZWZpbmVzKSBM QU5HVUFHRV9KQVZBU0NSSVBUJywKLSAgICAgICAgICAgICctLWZpbGVuYW1lJywgJ1JlbW90ZUlu c3BlY3RvckZyb250ZW5kJywKICAgICAgICAgICAgICctLWdlbmVyYXRvcicsICdJbnNwZWN0b3In LAogICAgICAgICAgICAgJzxAKGdlbmVyYXRvcl9pbmNsdWRlX2RpcnMpJwogICAgICAgICAgIF0s CmRpZmYgLS1naXQgYS9XZWJDb3JlL1dlYkNvcmUuZ3lwL3NjcmlwdHMvcnVsZV9iaW5kaW5nLnB5 IGIvV2ViQ29yZS9XZWJDb3JlLmd5cC9zY3JpcHRzL3J1bGVfYmluZGluZy5weQppbmRleCBiYjRj MmE1Li45MmRlMjMwIDEwMDY0NAotLS0gYS9XZWJDb3JlL1dlYkNvcmUuZ3lwL3NjcmlwdHMvcnVs ZV9iaW5kaW5nLnB5CisrKyBiL1dlYkNvcmUvV2ViQ29yZS5neXAvc2NyaXB0cy9ydWxlX2JpbmRp bmcucHkKQEAgLTEyMSw2ICsxMjEsNyBAQCBkZWYgbWFpbihhcmdzKToKICAgICAgICAgY29tbWFu ZC5leHRlbmQoWyctSScsIGluY2x1ZGVEaXJdKQogICAgIGNvbW1hbmQuYXBwZW5kKGdlbmVyYXRl QmluZGluZ3MpCiAgICAgY29tbWFuZC5leHRlbmQob3B0aW9ucykKKyAgICBjb21tYW5kLmV4dGVu ZChbJy0tb3V0cHV0SERpcicsIGhkaXJdKQogICAgIGNvbW1hbmQuZXh0ZW5kKFsnLS1vdXRwdXRE aXInLCBjcHBkaXIsIGlucHV0XSkKIAogICAgICMgRG8gaXQuIGNoZWNrX2NhbGwgaXMgbmV3IGlu IDIuNSwgc28gc2ltdWxhdGUgaXRzIGJlaGF2aW9yIHdpdGggY2FsbCBhbmQKQEAgLTEyOCwyMSAr MTI5LDYgQEAgZGVmIG1haW4oYXJncyk6CiAgICAgcmV0dXJuQ29kZSA9IHN1YnByb2Nlc3MuY2Fs bChjb21tYW5kKQogICAgIGFzc2VydCByZXR1cm5Db2RlID09IDAKIAotICAgICMgQm90aCB0aGUg LmNwcCBhbmQgLmggd2VyZSBnZW5lcmF0ZWQgaW4gY3BwZGlyLCBidXQgaWYgaGRpciBpcyBkaWZm ZXJlbnQsCi0gICAgIyB0aGUgLmggbmVlZHMgdG8gbW92ZS4gQ29weSBpdCBpbnN0ZWFkIG9mIHVz aW5nIG9zLnJlbmFtZSBmb3IgbWF4aW11bQotICAgICMgcG9ydGFiaWxpdHkgaW4gYWxsIGNhc2Vz LgotICAgIGlmIGNwcGRpciAhPSBoZGlyOgotICAgICAgICBpbnB1dEJhc2VuYW1lID0gb3MucGF0 aC5iYXNlbmFtZShpbnB1dCkKLSAgICAgICAgKHJvb3QsIGV4dCkgPSBvcy5wYXRoLnNwbGl0ZXh0 KGlucHV0QmFzZW5hbWUpCi0gICAgICAgIGlmIGZpbGVOYW1lICE9ICcnOgotICAgICAgICAgICAg aG5hbWUgPSAnJXMuaCcgJSAoZmlsZU5hbWUpCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBo bmFtZSA9ICclcyVzLmgnICUgKHByZWZpeCwgcm9vdCkKLSAgICAgICAgaHNyYyA9IG9zLnBhdGgu am9pbihjcHBkaXIsIGhuYW1lKQotICAgICAgICBoZHN0ID0gb3MucGF0aC5qb2luKGhkaXIsIGhu YW1lKQotICAgICAgICBzaHV0aWwuY29weWZpbGUoaHNyYywgaGRzdCkKLSAgICAgICAgb3MudW5s aW5rKGhzcmMpCi0KICAgICByZXR1cm4gcmV0dXJuQ29kZQogCiAKZGlmZiAtLWdpdCBhL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yLnBtIGIvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL0NvZGVHZW5lcmF0b3IucG0KaW5kZXggZDE3MTFkYy4uNjdjMDhiMiAxMDA2NDQKLS0t IGEvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3IucG0KKysrIGIvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3IucG0KQEAgLTMxLDYgKzMxLDcgQEAgdXNl IEZpbGU6OkZpbmQ7CiBteSAkdXNlRG9jdW1lbnQgPSAiIjsKIG15ICR1c2VHZW5lcmF0b3IgPSAi IjsKIG15ICR1c2VPdXRwdXREaXIgPSAiIjsKK215ICR1c2VPdXRwdXRIRGlyID0gIiI7CiBteSAk dXNlRGlyZWN0b3JpZXMgPSAiIjsKIG15ICR1c2VMYXllck9uVG9wID0gMDsKIG15ICRwcmVwcm9j ZXNzb3I7CkBAIC04NCw2ICs4NSw3IEBAIHN1YiBuZXcKICAgICAkcHJlcHJvY2Vzc29yID0gc2hp ZnQ7CiAgICAgJHdyaXRlRGVwZW5kZW5jaWVzID0gc2hpZnQ7CiAgICAgJHZlcmJvc2UgPSBzaGlm dDsKKyAgICAkdXNlT3V0cHV0SERpciA9IHNoaWZ0OwogCiAgICAgYmxlc3MoJHJlZmVyZW5jZSwg JG9iamVjdCk7CiAgICAgcmV0dXJuICRyZWZlcmVuY2U7CkBAIC0xMDcsNyArMTA5LDcgQEAgc3Vi IFByb2Nlc3NEb2N1bWVudAogICAgIHJlcXVpcmUgJGlmYWNlTmFtZSAuICIucG0iOwogCiAgICAg IyBEeW5hbWljYWxseSBsb2FkIGV4dGVybmFsIGNvZGUgZ2VuZXJhdGlvbiBwZXJsIG1vZHVsZQot ICAgICRjb2RlR2VuZXJhdG9yID0gJGlmYWNlTmFtZS0+bmV3KCRvYmplY3QsICR1c2VPdXRwdXRE aXIsICR1c2VMYXllck9uVG9wLCAkcHJlcHJvY2Vzc29yLCAkd3JpdGVEZXBlbmRlbmNpZXMsICR2 ZXJib3NlKTsKKyAgICAkY29kZUdlbmVyYXRvciA9ICRpZmFjZU5hbWUtPm5ldygkb2JqZWN0LCAk dXNlT3V0cHV0RGlyLCAkdXNlTGF5ZXJPblRvcCwgJHByZXByb2Nlc3NvciwgJHdyaXRlRGVwZW5k ZW5jaWVzLCAkdmVyYm9zZSwgJHVzZU91dHB1dEhEaXIpOwogICAgIHVubGVzcyAoZGVmaW5lZCgk Y29kZUdlbmVyYXRvcikpIHsKICAgICAgICAgbXkgJGNsYXNzZXMgPSAkdXNlRG9jdW1lbnQtPmNs YXNzZXM7CiAgICAgICAgIGZvcmVhY2ggbXkgJGNsYXNzIChAJGNsYXNzZXMpIHsKZGlmZiAtLWdp dCBhL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0gYi9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCmluZGV4IDVlYjZkM2QuLjgxNWZk ZDggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgu cG0KKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQpAQCAt MzAsNiArMzAsNyBAQCB1c2UgRGlnZXN0OjpNRDU7CiAKIG15ICRtb2R1bGUgPSAiIjsKIG15ICRv dXRwdXREaXIgPSAiIjsKK215ICRvdXRwdXRIRGlyID0gIiI7CiAKIG15IEBoZWFkZXJDb250ZW50 ID0gKCk7CiBteSBAaW1wbENvbnRlbnRIZWFkZXIgPSAoKTsKQEAgLTcxLDYgKzcyLDExIEBAIHN1 YiBuZXcKIAogICAgICRjb2RlR2VuZXJhdG9yID0gc2hpZnQ7CiAgICAgJG91dHB1dERpciA9IHNo aWZ0OworICAgIG15ICR1c2VMYXllck9uVG9wID0gc2hpZnQ7ICNyZWNlaXZlZCBidXQgdW51c2Vk CisgICAgbXkgJHByZXByb2Nlc3NvciA9IHNoaWZ0OyAjIHJlY2VpdmVkIGJ1dCB1bnVzZWQKKyAg ICBteSAkd3JpdGVEZXBlbmRlbmNpZXMgPSBzaGlmdDsgIyByZWNlaXZlZCBidXQgdW51c2VkCisg ICAgbXkgJHZlcmJvc2UgPSBzaGlmdDsgIyByZWNlaXZlZCBidXQgdW51c2VkCisgICAgJG91dHB1 dEhEaXIgPSBzaGlmdDsKIAogICAgIGJsZXNzKCRyZWZlcmVuY2UsICRvYmplY3QpOwogICAgIHJl dHVybiAkcmVmZXJlbmNlOwpAQCAtMTEwLDcgKzExNiw3IEBAIHN1YiBHZW5lcmF0ZUludGVyZmFj ZQogICAgIG15ICRuYW1lID0gJGRhdGFOb2RlLT5uYW1lOwogCiAgICAgIyBPcGVuIGZpbGVzIGZv ciB3cml0aW5nCi0gICAgbXkgJGhlYWRlckZpbGVOYW1lID0gIiRvdXRwdXREaXIvVjgkbmFtZS5o IjsKKyAgICBteSAkaGVhZGVyRmlsZU5hbWUgPSAiJG91dHB1dEhEaXIvVjgkbmFtZS5oIjsKICAg ICBteSAkaW1wbEZpbGVOYW1lID0gIiRvdXRwdXREaXIvVjgkbmFtZS5jcHAiOwogCiAgICAgb3Bl bigkSU1QTCwgIj4kaW1wbEZpbGVOYW1lIikgfHwgZGllICJDb3VsZG4ndCBvcGVuIGZpbGUgJGlt cGxGaWxlTmFtZSI7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJh dGUtYmluZGluZ3MucGwgYi9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtYmluZGlu Z3MucGwKaW5kZXggYWVlODFiNS4uNDlhMjM4NyAxMDA3NTUKLS0tIGEvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL2dlbmVyYXRlLWJpbmRpbmdzLnBsCisrKyBiL1dlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy9nZW5lcmF0ZS1iaW5kaW5ncy5wbApAQCAtMzksMjAgKzM5LDIwIEBAIHVzZSBDb2RlR2Vu ZXJhdG9yOwogCiBteSBAaWRsRGlyZWN0b3JpZXM7CiBteSAkb3V0cHV0RGlyZWN0b3J5OworbXkg JG91dHB1dEhEaXJlY3Rvcnk7CiBteSAkZ2VuZXJhdG9yOwogbXkgJGRlZmluZXM7CiBteSAkcHJl Zml4OwotbXkgJGZpbGVuYW1lOwogbXkgJHByZXByb2Nlc3NvcjsKIG15ICR3cml0ZURlcGVuZGVu Y2llczsKIG15ICR2ZXJib3NlOwogCiBHZXRPcHRpb25zKCdpbmNsdWRlPXNAJyA9PiBcQGlkbERp cmVjdG9yaWVzLAogICAgICAgICAgICAnb3V0cHV0RGlyPXMnID0+IFwkb3V0cHV0RGlyZWN0b3J5 LAorICAgICAgICAgICAnb3V0cHV0SERpcj1zJyA9PiBcJG91dHB1dEhEaXJlY3RvcnksCiAgICAg ICAgICAgICdnZW5lcmF0b3I9cycgPT4gXCRnZW5lcmF0b3IsCiAgICAgICAgICAgICdkZWZpbmVz PXMnID0+IFwkZGVmaW5lcywKICAgICAgICAgICAgJ3ByZWZpeD1zJyA9PiBcJHByZWZpeCwKLSAg ICAgICAgICAgJ2ZpbGVuYW1lPXMnID0+IFwkZmlsZW5hbWUsCiAgICAgICAgICAgICdwcmVwcm9j ZXNzb3I9cycgPT4gXCRwcmVwcm9jZXNzb3IsCiAgICAgICAgICAgICd2ZXJib3NlJyA9PiBcJHZl cmJvc2UsCiAgICAgICAgICAgICd3cml0ZS1kZXBlbmRlbmNpZXMnID0+IFwkd3JpdGVEZXBlbmRl bmNpZXMpOwpAQCAtNjQsNiArNjQsOSBAQCBkaWUoJ011c3Qgc3BlY2lmeSBnZW5lcmF0b3InKSB1 bmxlc3MgZGVmaW5lZCgkZ2VuZXJhdG9yKTsKIGRpZSgnTXVzdCBzcGVjaWZ5IG91dHB1dCBkaXJl Y3RvcnkuJykgdW5sZXNzIGRlZmluZWQoJG91dHB1dERpcmVjdG9yeSk7CiBkaWUoJ011c3Qgc3Bl Y2lmeSBkZWZpbmVzJykgdW5sZXNzIGRlZmluZWQoJGRlZmluZXMpOwogCitpZiAoISRvdXRwdXRI RGlyZWN0b3J5KSB7CisgICAgJG91dHB1dEhEaXJlY3RvcnkgPSAkb3V0cHV0RGlyZWN0b3J5Owor fQogaWYgKCR2ZXJib3NlKSB7CiAgICAgcHJpbnQgIiRnZW5lcmF0b3I6ICRpZGxGaWxlXG4iOwog fQpAQCAtNzQsNSArNzcsNSBAQCBteSAkcGFyc2VyID0gSURMUGFyc2VyLT5uZXcoISR2ZXJib3Nl KTsKIG15ICRkb2N1bWVudCA9ICRwYXJzZXItPlBhcnNlKCRpZGxGaWxlLCAkZGVmaW5lcywgJHBy ZXByb2Nlc3Nvcik7CiAKICMgR2VuZXJhdGUgZGVzaXJlZCBvdXRwdXQgZm9yIGdpdmVuIElETCBm aWxlLgotbXkgJGNvZGVHZW4gPSBDb2RlR2VuZXJhdG9yLT5uZXcoXEBpZGxEaXJlY3Rvcmllcywg JGdlbmVyYXRvciwgJG91dHB1dERpcmVjdG9yeSwgMCwgJHByZXByb2Nlc3NvciwgJHdyaXRlRGVw ZW5kZW5jaWVzLCAkdmVyYm9zZSk7CitteSAkY29kZUdlbiA9IENvZGVHZW5lcmF0b3ItPm5ldyhc QGlkbERpcmVjdG9yaWVzLCAkZ2VuZXJhdG9yLCAkb3V0cHV0RGlyZWN0b3J5LCAwLCAkcHJlcHJv Y2Vzc29yLCAkd3JpdGVEZXBlbmRlbmNpZXMsICR2ZXJib3NlLCAkb3V0cHV0SERpcmVjdG9yeSk7 CiAkY29kZUdlbi0+UHJvY2Vzc0RvY3VtZW50KCRkb2N1bWVudCwgJGRlZmluZXMpOwpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5wbSBiL1dlYkNv cmUvaW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNwZWN0b3IucG0KaW5kZXggNGRhY2Q5MC4uZjVl YTNmZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rv ci5wbQorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnBtCkBA IC04OSw2ICs4OSw3IEBAIEVPRgogCiBteSAkY29kZUdlbmVyYXRvcjsKIG15ICRvdXRwdXREaXI7 CitteSAkb3V0cHV0SERpcjsKIG15ICR3cml0ZURlcGVuZGVuY2llczsKIG15ICR2ZXJib3NlOwog CkBAIC0xMTcsNiArMTE4LDcgQEAgc3ViIG5ldwogICAgIHNoaWZ0OyAjICRwcmVwcm9jZXNzb3IK ICAgICAkd3JpdGVEZXBlbmRlbmNpZXMgPSBzaGlmdDsKICAgICAkdmVyYm9zZSA9IHNoaWZ0Owor ICAgICRvdXRwdXRIRGlyID0gc2hpZnQ7CiAKICAgICBibGVzcygkcmVmZXJlbmNlLCAkb2JqZWN0 KTsKICAgICByZXR1cm4gJHJlZmVyZW5jZTsKQEAgLTI3Nyw3ICsyNzksNyBAQCBzdWIgZmluaXNo CiAgICAgY2xvc2UoJFNPVVJDRSk7CiAgICAgdW5kZWYoJFNPVVJDRSk7CiAKLSAgICBvcGVuKG15 ICRIRUFERVIsICI+JG91dHB1dERpci8kZnJvbnRlbmRDbGFzc05hbWUuaCIpIHx8IGRpZSAiQ291 bGRuJ3Qgb3BlbiBmaWxlICRvdXRwdXREaXIvJGZyb250ZW5kQ2xhc3NOYW1lLmgiOworICAgIG9w ZW4obXkgJEhFQURFUiwgIj4kb3V0cHV0SERpci8kZnJvbnRlbmRDbGFzc05hbWUuaCIpIHx8IGRp ZSAiQ291bGRuJ3Qgb3BlbiBmaWxlICRvdXRwdXREaXIvJGZyb250ZW5kQ2xhc3NOYW1lLmgiOwog ICAgIHByaW50ICRIRUFERVIgZ2VuZXJhdGVIZWFkZXIoJGZyb250ZW5kQ2xhc3NOYW1lLCBcJWZy b250ZW5kVHlwZXMsICRmcm9udGVuZENvbnN0cnVjdG9yLCBcJWZyb250ZW5kTWV0aG9kcywgJGZy b250ZW5kRm9vdGVyKTsKICAgICBjbG9zZSgkSEVBREVSKTsKICAgICB1bmRlZigkSEVBREVSKTsK 61912 2010-07-18 14:11:58 -0700 2010-07-18 22:57:01 -0700 [patch] second iteration patch text/plain 8979 loislo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NGM4YzQwMS4uZDY5N2I3MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wNy0xOCAgSWx5YSBUaWtob25v dnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2ViSW5zcGVjdG9yOiBXZWIgSW5zcGVjdG9yOiB0aGUgYmlu ZGluZ3MgZ2VuZXJhdGlvbiBoZWxwZXIgc2NyaXB0IGNhbiBiZQorICAgICAgICBzaW1wbGlmaWVk IGEgYml0LiBDaHJvbWl1bS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQyNTIzCisKKyAgICAgICAgKiBXZWJDb3JlLmd5cC9XZWJDb3JlLmd5cDoKKyAg ICAgICAgKiBXZWJDb3JlLmd5cC9zY3JpcHRzL3J1bGVfYmluZGluZy5weToKKyAgICAgICAgKiBi aW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3IucG06CisgICAgICAgICogYmluZGluZ3Mvc2Ny aXB0cy9Db2RlR2VuZXJhdG9yQ1BQLnBtOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29k ZUdlbmVyYXRvckpTLnBtOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRv ck9iakMucG06CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG06 CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1iaW5kaW5ncy5wbDoKKyAgICAg ICAgKiBpbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5wbToKKwogMjAxMC0wNy0xOCAg QW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IERhbiBCZXJuc3RlaW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNv cmUuZ3lwIGIvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAppbmRleCAwYzNmYTgxLi42 MTkzMjk0IDEwMDY0NAotLS0gYS9XZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwCisrKyBi L1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAKQEAgLTUwMiw3ICs1MDIsNiBAQAogICAg ICAgICAgICAgJzxAKF9pbnB1dHMpJywKICAgICAgICAgICAgICctLScsCiAgICAgICAgICAgICAn LS1kZWZpbmVzJywgJzwoZmVhdHVyZV9kZWZpbmVzKSBMQU5HVUFHRV9KQVZBU0NSSVBUJywKLSAg ICAgICAgICAgICctLWZpbGVuYW1lJywgJ1JlbW90ZUluc3BlY3RvckZyb250ZW5kJywKICAgICAg ICAgICAgICctLWdlbmVyYXRvcicsICdJbnNwZWN0b3InLAogICAgICAgICAgICAgJzxAKGdlbmVy YXRvcl9pbmNsdWRlX2RpcnMpJwogICAgICAgICAgIF0sCmRpZmYgLS1naXQgYS9XZWJDb3JlL1dl YkNvcmUuZ3lwL3NjcmlwdHMvcnVsZV9iaW5kaW5nLnB5IGIvV2ViQ29yZS9XZWJDb3JlLmd5cC9z Y3JpcHRzL3J1bGVfYmluZGluZy5weQppbmRleCBiYjRjMmE1Li41YTQxODA4IDEwMDY0NAotLS0g YS9XZWJDb3JlL1dlYkNvcmUuZ3lwL3NjcmlwdHMvcnVsZV9iaW5kaW5nLnB5CisrKyBiL1dlYkNv cmUvV2ViQ29yZS5neXAvc2NyaXB0cy9ydWxlX2JpbmRpbmcucHkKQEAgLTEyMSw2ICsxMjEsNyBA QCBkZWYgbWFpbihhcmdzKToKICAgICAgICAgY29tbWFuZC5leHRlbmQoWyctSScsIGluY2x1ZGVE aXJdKQogICAgIGNvbW1hbmQuYXBwZW5kKGdlbmVyYXRlQmluZGluZ3MpCiAgICAgY29tbWFuZC5l eHRlbmQob3B0aW9ucykKKyAgICBjb21tYW5kLmV4dGVuZChbJy0tb3V0cHV0SGVhZGVyc0Rpcics IGhkaXJdKQogICAgIGNvbW1hbmQuZXh0ZW5kKFsnLS1vdXRwdXREaXInLCBjcHBkaXIsIGlucHV0 XSkKIAogICAgICMgRG8gaXQuIGNoZWNrX2NhbGwgaXMgbmV3IGluIDIuNSwgc28gc2ltdWxhdGUg aXRzIGJlaGF2aW9yIHdpdGggY2FsbCBhbmQKQEAgLTEyOCwyMSArMTI5LDYgQEAgZGVmIG1haW4o YXJncyk6CiAgICAgcmV0dXJuQ29kZSA9IHN1YnByb2Nlc3MuY2FsbChjb21tYW5kKQogICAgIGFz c2VydCByZXR1cm5Db2RlID09IDAKIAotICAgICMgQm90aCB0aGUgLmNwcCBhbmQgLmggd2VyZSBn ZW5lcmF0ZWQgaW4gY3BwZGlyLCBidXQgaWYgaGRpciBpcyBkaWZmZXJlbnQsCi0gICAgIyB0aGUg LmggbmVlZHMgdG8gbW92ZS4gQ29weSBpdCBpbnN0ZWFkIG9mIHVzaW5nIG9zLnJlbmFtZSBmb3Ig bWF4aW11bQotICAgICMgcG9ydGFiaWxpdHkgaW4gYWxsIGNhc2VzLgotICAgIGlmIGNwcGRpciAh PSBoZGlyOgotICAgICAgICBpbnB1dEJhc2VuYW1lID0gb3MucGF0aC5iYXNlbmFtZShpbnB1dCkK LSAgICAgICAgKHJvb3QsIGV4dCkgPSBvcy5wYXRoLnNwbGl0ZXh0KGlucHV0QmFzZW5hbWUpCi0g ICAgICAgIGlmIGZpbGVOYW1lICE9ICcnOgotICAgICAgICAgICAgaG5hbWUgPSAnJXMuaCcgJSAo ZmlsZU5hbWUpCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBobmFtZSA9ICclcyVzLmgnICUg KHByZWZpeCwgcm9vdCkKLSAgICAgICAgaHNyYyA9IG9zLnBhdGguam9pbihjcHBkaXIsIGhuYW1l KQotICAgICAgICBoZHN0ID0gb3MucGF0aC5qb2luKGhkaXIsIGhuYW1lKQotICAgICAgICBzaHV0 aWwuY29weWZpbGUoaHNyYywgaGRzdCkKLSAgICAgICAgb3MudW5saW5rKGhzcmMpCi0KICAgICBy ZXR1cm4gcmV0dXJuQ29kZQogCiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0 cy9Db2RlR2VuZXJhdG9yLnBtIGIvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0 b3IucG0KaW5kZXggZDE3MTFkYy4uMzYzZmRjNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL0NvZGVHZW5lcmF0b3IucG0KKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRz L0NvZGVHZW5lcmF0b3IucG0KQEAgLTMxLDYgKzMxLDcgQEAgdXNlIEZpbGU6OkZpbmQ7CiBteSAk dXNlRG9jdW1lbnQgPSAiIjsKIG15ICR1c2VHZW5lcmF0b3IgPSAiIjsKIG15ICR1c2VPdXRwdXRE aXIgPSAiIjsKK215ICR1c2VPdXRwdXRIZWFkZXJzRGlyID0gIiI7CiBteSAkdXNlRGlyZWN0b3Jp ZXMgPSAiIjsKIG15ICR1c2VMYXllck9uVG9wID0gMDsKIG15ICRwcmVwcm9jZXNzb3I7CkBAIC04 MCw2ICs4MSw3IEBAIHN1YiBuZXcKICAgICAkdXNlRGlyZWN0b3JpZXMgPSBzaGlmdDsKICAgICAk dXNlR2VuZXJhdG9yID0gc2hpZnQ7CiAgICAgJHVzZU91dHB1dERpciA9IHNoaWZ0OworICAgICR1 c2VPdXRwdXRIZWFkZXJzRGlyID0gc2hpZnQ7CiAgICAgJHVzZUxheWVyT25Ub3AgPSBzaGlmdDsK ICAgICAkcHJlcHJvY2Vzc29yID0gc2hpZnQ7CiAgICAgJHdyaXRlRGVwZW5kZW5jaWVzID0gc2hp ZnQ7CkBAIC0xMDcsNyArMTA5LDcgQEAgc3ViIFByb2Nlc3NEb2N1bWVudAogICAgIHJlcXVpcmUg JGlmYWNlTmFtZSAuICIucG0iOwogCiAgICAgIyBEeW5hbWljYWxseSBsb2FkIGV4dGVybmFsIGNv ZGUgZ2VuZXJhdGlvbiBwZXJsIG1vZHVsZQotICAgICRjb2RlR2VuZXJhdG9yID0gJGlmYWNlTmFt ZS0+bmV3KCRvYmplY3QsICR1c2VPdXRwdXREaXIsICR1c2VMYXllck9uVG9wLCAkcHJlcHJvY2Vz c29yLCAkd3JpdGVEZXBlbmRlbmNpZXMsICR2ZXJib3NlKTsKKyAgICAkY29kZUdlbmVyYXRvciA9 ICRpZmFjZU5hbWUtPm5ldygkb2JqZWN0LCAkdXNlT3V0cHV0RGlyLCAkdXNlT3V0cHV0SGVhZGVy c0RpciwgJHVzZUxheWVyT25Ub3AsICRwcmVwcm9jZXNzb3IsICR3cml0ZURlcGVuZGVuY2llcywg JHZlcmJvc2UpOwogICAgIHVubGVzcyAoZGVmaW5lZCgkY29kZUdlbmVyYXRvcikpIHsKICAgICAg ICAgbXkgJGNsYXNzZXMgPSAkdXNlRG9jdW1lbnQtPmNsYXNzZXM7CiAgICAgICAgIGZvcmVhY2gg bXkgJGNsYXNzIChAJGNsYXNzZXMpIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy9Db2RlR2VuZXJhdG9yQ1BQLnBtIGIvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVH ZW5lcmF0b3JDUFAucG0KaW5kZXggN2RmOTFjYS4uOWUyNTRhZiAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JDUFAucG0KKysrIGIvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JDUFAucG0KQEAgLTk4LDYgKzk4LDcgQEAgc3ViIG5l dwogCiAgICAgJGNvZGVHZW5lcmF0b3IgPSBzaGlmdDsKICAgICAkb3V0cHV0RGlyID0gc2hpZnQ7 CisgICAgc2hpZnQ7ICMgJG91dHB1dEhlYWRlcnNEaXIKICAgICBzaGlmdDsgIyAkdXNlTGF5ZXJP blRvcAogICAgIHNoaWZ0OyAjICRwcmVwcm9jZXNzb3IKICAgICBzaGlmdDsgIyAkd3JpdGVEZXBl bmRlbmNpZXMKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJh dG9ySlMucG0gYi9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtCmlu ZGV4IGFjYWQ5MGIuLmQ5OTJkODkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0 cy9Db2RlR2VuZXJhdG9ySlMucG0KKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVH ZW5lcmF0b3JKUy5wbQpAQCAtNzMsNiArNzMsNyBAQCBzdWIgbmV3CiAKICAgICAkY29kZUdlbmVy YXRvciA9IHNoaWZ0OwogICAgICRvdXRwdXREaXIgPSBzaGlmdDsKKyAgICBzaGlmdDsgIyAkb3V0 cHV0SGVhZGVyc0RpcgogICAgIHNoaWZ0OyAjICR1c2VMYXllck9uVG9wCiAgICAgc2hpZnQ7ICMg JHByZXByb2Nlc3NvcgogICAgICR3cml0ZURlcGVuZGVuY2llcyA9IHNoaWZ0OwpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JPYmpDLnBtIGIvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JPYmpDLnBtCmluZGV4IDdkNjY5NzkuLjkx Y2JkMGIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9y T2JqQy5wbQorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvck9iakMu cG0KQEAgLTE5OSw2ICsxOTksNyBAQCBzdWIgbmV3CiAKICAgICAkY29kZUdlbmVyYXRvciA9IHNo aWZ0OwogICAgICRvdXRwdXREaXIgPSBzaGlmdDsKKyAgICBzaGlmdDsgIyAkb3V0cHV0SGVhZGVy c0RpcgogICAgIHNoaWZ0OyAjICR1c2VMYXllck9uVG9wCiAgICAgc2hpZnQ7ICMgJHByZXByb2Nl c3NvcgogICAgICR3cml0ZURlcGVuZGVuY2llcyA9IHNoaWZ0OwpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbSBiL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KaW5kZXggNWViNmQzZC4uYTllMDgyOCAxMDA2NDQK LS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQorKysgYi9X ZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCkBAIC0zMCw2ICszMCw3 IEBAIHVzZSBEaWdlc3Q6Ok1ENTsKIAogbXkgJG1vZHVsZSA9ICIiOwogbXkgJG91dHB1dERpciA9 ICIiOworbXkgJG91dHB1dEhlYWRlcnNEaXIgPSAiIjsKIAogbXkgQGhlYWRlckNvbnRlbnQgPSAo KTsKIG15IEBpbXBsQ29udGVudEhlYWRlciA9ICgpOwpAQCAtNzEsNiArNzIsNyBAQCBzdWIgbmV3 CiAKICAgICAkY29kZUdlbmVyYXRvciA9IHNoaWZ0OwogICAgICRvdXRwdXREaXIgPSBzaGlmdDsK KyAgICAkb3V0cHV0SGVhZGVyc0RpciA9IHNoaWZ0OwogCiAgICAgYmxlc3MoJHJlZmVyZW5jZSwg JG9iamVjdCk7CiAgICAgcmV0dXJuICRyZWZlcmVuY2U7CkBAIC0xMTAsNyArMTEyLDcgQEAgc3Vi IEdlbmVyYXRlSW50ZXJmYWNlCiAgICAgbXkgJG5hbWUgPSAkZGF0YU5vZGUtPm5hbWU7CiAKICAg ICAjIE9wZW4gZmlsZXMgZm9yIHdyaXRpbmcKLSAgICBteSAkaGVhZGVyRmlsZU5hbWUgPSAiJG91 dHB1dERpci9WOCRuYW1lLmgiOworICAgIG15ICRoZWFkZXJGaWxlTmFtZSA9ICIkb3V0cHV0SGVh ZGVyc0Rpci9WOCRuYW1lLmgiOwogICAgIG15ICRpbXBsRmlsZU5hbWUgPSAiJG91dHB1dERpci9W OCRuYW1lLmNwcCI7CiAKICAgICBvcGVuKCRJTVBMLCAiPiRpbXBsRmlsZU5hbWUiKSB8fCBkaWUg IkNvdWxkbid0IG9wZW4gZmlsZSAkaW1wbEZpbGVOYW1lIjsKZGlmZiAtLWdpdCBhL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1iaW5kaW5ncy5wbCBiL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy9nZW5lcmF0ZS1iaW5kaW5ncy5wbAppbmRleCBhZWU4MWI1Li4xNjQ0NGM0IDEwMDc1 NQotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtYmluZGluZ3MucGwKKysr IGIvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLWJpbmRpbmdzLnBsCkBAIC0zOSwy MCArMzksMjAgQEAgdXNlIENvZGVHZW5lcmF0b3I7CiAKIG15IEBpZGxEaXJlY3RvcmllczsKIG15 ICRvdXRwdXREaXJlY3Rvcnk7CitteSAkb3V0cHV0SGVhZGVyc0RpcmVjdG9yeTsKIG15ICRnZW5l cmF0b3I7CiBteSAkZGVmaW5lczsKIG15ICRwcmVmaXg7Ci1teSAkZmlsZW5hbWU7CiBteSAkcHJl cHJvY2Vzc29yOwogbXkgJHdyaXRlRGVwZW5kZW5jaWVzOwogbXkgJHZlcmJvc2U7CiAKIEdldE9w dGlvbnMoJ2luY2x1ZGU9c0AnID0+IFxAaWRsRGlyZWN0b3JpZXMsCiAgICAgICAgICAgICdvdXRw dXREaXI9cycgPT4gXCRvdXRwdXREaXJlY3RvcnksCisgICAgICAgICAgICdvdXRwdXRIZWFkZXJz RGlyPXMnID0+IFwkb3V0cHV0SGVhZGVyc0RpcmVjdG9yeSwKICAgICAgICAgICAgJ2dlbmVyYXRv cj1zJyA9PiBcJGdlbmVyYXRvciwKICAgICAgICAgICAgJ2RlZmluZXM9cycgPT4gXCRkZWZpbmVz LAogICAgICAgICAgICAncHJlZml4PXMnID0+IFwkcHJlZml4LAotICAgICAgICAgICAnZmlsZW5h bWU9cycgPT4gXCRmaWxlbmFtZSwKICAgICAgICAgICAgJ3ByZXByb2Nlc3Nvcj1zJyA9PiBcJHBy ZXByb2Nlc3NvciwKICAgICAgICAgICAgJ3ZlcmJvc2UnID0+IFwkdmVyYm9zZSwKICAgICAgICAg ICAgJ3dyaXRlLWRlcGVuZGVuY2llcycgPT4gXCR3cml0ZURlcGVuZGVuY2llcyk7CkBAIC02NCw2 ICs2NCw5IEBAIGRpZSgnTXVzdCBzcGVjaWZ5IGdlbmVyYXRvcicpIHVubGVzcyBkZWZpbmVkKCRn ZW5lcmF0b3IpOwogZGllKCdNdXN0IHNwZWNpZnkgb3V0cHV0IGRpcmVjdG9yeS4nKSB1bmxlc3Mg ZGVmaW5lZCgkb3V0cHV0RGlyZWN0b3J5KTsKIGRpZSgnTXVzdCBzcGVjaWZ5IGRlZmluZXMnKSB1 bmxlc3MgZGVmaW5lZCgkZGVmaW5lcyk7CiAKK2lmICghJG91dHB1dEhlYWRlcnNEaXJlY3Rvcnkp IHsKKyAgICAkb3V0cHV0SGVhZGVyc0RpcmVjdG9yeSA9ICRvdXRwdXREaXJlY3Rvcnk7Cit9CiBp ZiAoJHZlcmJvc2UpIHsKICAgICBwcmludCAiJGdlbmVyYXRvcjogJGlkbEZpbGVcbiI7CiB9CkBA IC03NCw1ICs3Nyw1IEBAIG15ICRwYXJzZXIgPSBJRExQYXJzZXItPm5ldyghJHZlcmJvc2UpOwog bXkgJGRvY3VtZW50ID0gJHBhcnNlci0+UGFyc2UoJGlkbEZpbGUsICRkZWZpbmVzLCAkcHJlcHJv Y2Vzc29yKTsKIAogIyBHZW5lcmF0ZSBkZXNpcmVkIG91dHB1dCBmb3IgZ2l2ZW4gSURMIGZpbGUu Ci1teSAkY29kZUdlbiA9IENvZGVHZW5lcmF0b3ItPm5ldyhcQGlkbERpcmVjdG9yaWVzLCAkZ2Vu ZXJhdG9yLCAkb3V0cHV0RGlyZWN0b3J5LCAwLCAkcHJlcHJvY2Vzc29yLCAkd3JpdGVEZXBlbmRl bmNpZXMsICR2ZXJib3NlKTsKK215ICRjb2RlR2VuID0gQ29kZUdlbmVyYXRvci0+bmV3KFxAaWRs RGlyZWN0b3JpZXMsICRnZW5lcmF0b3IsICRvdXRwdXREaXJlY3RvcnksICRvdXRwdXRIZWFkZXJz RGlyZWN0b3J5LCAwLCAkcHJlcHJvY2Vzc29yLCAkd3JpdGVEZXBlbmRlbmNpZXMsICR2ZXJib3Nl KTsKICRjb2RlR2VuLT5Qcm9jZXNzRG9jdW1lbnQoJGRvY3VtZW50LCAkZGVmaW5lcyk7CmRpZmYg LS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnBtIGIvV2Vi Q29yZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5wbQppbmRleCA0ZGFjZDkwLi5h ZmFkZGVjIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVj dG9yLnBtCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNwZWN0b3IucG0K QEAgLTg5LDYgKzg5LDcgQEAgRU9GCiAKIG15ICRjb2RlR2VuZXJhdG9yOwogbXkgJG91dHB1dERp cjsKK215ICRvdXRwdXRIZWFkZXJzRGlyOwogbXkgJHdyaXRlRGVwZW5kZW5jaWVzOwogbXkgJHZl cmJvc2U7CiAKQEAgLTExMyw2ICsxMTQsNyBAQCBzdWIgbmV3CiAKICAgICAkY29kZUdlbmVyYXRv ciA9IHNoaWZ0OwogICAgICRvdXRwdXREaXIgPSBzaGlmdDsKKyAgICAkb3V0cHV0SGVhZGVyc0Rp ciA9IHNoaWZ0OwogICAgIHNoaWZ0OyAjICR1c2VMYXllck9uVG9wCiAgICAgc2hpZnQ7ICMgJHBy ZXByb2Nlc3NvcgogICAgICR3cml0ZURlcGVuZGVuY2llcyA9IHNoaWZ0OwpAQCAtMjc3LDcgKzI3 OSw3IEBAIHN1YiBmaW5pc2gKICAgICBjbG9zZSgkU09VUkNFKTsKICAgICB1bmRlZigkU09VUkNF KTsKIAotICAgIG9wZW4obXkgJEhFQURFUiwgIj4kb3V0cHV0RGlyLyRmcm9udGVuZENsYXNzTmFt ZS5oIikgfHwgZGllICJDb3VsZG4ndCBvcGVuIGZpbGUgJG91dHB1dERpci8kZnJvbnRlbmRDbGFz c05hbWUuaCI7CisgICAgb3BlbihteSAkSEVBREVSLCAiPiRvdXRwdXRIZWFkZXJzRGlyLyRmcm9u dGVuZENsYXNzTmFtZS5oIikgfHwgZGllICJDb3VsZG4ndCBvcGVuIGZpbGUgJG91dHB1dEhlYWRl cnNEaXIvJGZyb250ZW5kQ2xhc3NOYW1lLmgiOwogICAgIHByaW50ICRIRUFERVIgZ2VuZXJhdGVI ZWFkZXIoJGZyb250ZW5kQ2xhc3NOYW1lLCBcJWZyb250ZW5kVHlwZXMsICRmcm9udGVuZENvbnN0 cnVjdG9yLCBcJWZyb250ZW5kTWV0aG9kcywgJGZyb250ZW5kRm9vdGVyKTsKICAgICBjbG9zZSgk SEVBREVSKTsKICAgICB1bmRlZigkSEVBREVSKTsK