33755 2010-01-15 21:25:52 -0800 Make update-iexploder-cssproperties update htmltags.in and htmlattrs.in as well 2010-03-08 00:17:23 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 zecke zecke ddkilzer eric oldest_to_newest 181472 0 46732 zecke 2010-01-15 21:25:52 -0800 Created attachment 46732 Patch In recent years we have added a couple of new attributes and tags and with HTML5 being there we will add some more tags as well. The following patch is fixing it and as a follow up patch we should rename the script to update-iexploder or update-iexploder-properties or some better name. 181509 1 46732 ddkilzer 2010-01-16 07:29:31 -0800 Comment on attachment 46732 Patch > diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog > +2010-01-15 Holger Hans Peter Freyther <zecke@selfish.org> > + > + Reviewed by NOBODY (OOPS!). > + > + [iexploder] Automatically update htmltags.in and htmlattrs.in too > + Need a short description and bug URL (OOPS!) Need the bug URL here instead of the placeholder text. > diff --git a/WebKitTools/Scripts/update-iexploder-cssproperties b/WebKitTools/Scripts/update-iexploder-cssproperties > @@ -35,38 +37,54 @@ use strict; > use FindBin; > use lib $FindBin::Bin; > use webkitdirs; > +use VCSUtils; Alphabetically, VCSUtils should go before webkitdirs. > +sub generateAttributesFromFile($); > +sub readiExploderFile($); > +sub writeiExploderFile($@); > +sub update($$); > +sub updateCSSProperties(); > +sub updateHTMLAttributes(); > +sub updateHTMLTags(); Alphabetically, writeiExploderFile() should go last in the list. > +sub generateAttributesFromFile($) "Attributes" sounds too specific. How about "Entities"? Also, we're returning a list of entities, so I think this should be called generateEntityListFromFile(). > { > + my ($filename) = @_; > + > + my $revision = svnRevisionForDirectory(dirname($filename)); > + my $path = File::Spec->abs2rel($filename, sourceDir()); > my $result = "# From WebKit svn r" . $revision . " (" . $path . ")\n"; > > my @properties = (); This should change to @entities to match the subroutine name. > push(@properties, $l); Ditto. > +sub update($$) > +{ > + my ($iexploder, $webcore) = @_; I think these should be called $iexploderPath and $webcorePath. > + $iexploder = File::Spec->catfile(sourceDir, split("/", $iexploder)); > + $webcore = File::Spec->catfile(sourceDir, split("/", $webcore)); Please add the parenthesis back to "sourceDir" here. > +sub updateCSSProperties() > { > + update("WebKitTools/iExploder/htdocs/cssproperties.in", "WebCore/css/CSSPropertyNames.in"); > +} > + > +sub updateHTMLAttributes() > +{ > + update("WebKitTools/iExploder/htdocs/htmlattrs.in", "WebCore/html/HTMLAttributeNames.in"); > +} > + > +sub updateHTMLTags() > +{ > + update("WebKitTools/iExploder/htdocs/htmltags.in", "WebCore/html/HTMLTagNames.in"); > } I just realized you could make this more generic by using a hash to hold these values, then just iterate over the hash in a single update() method. If you'd rather keep separate methods, please add them before writeiExploderFile() to keep the subroutines alphabetized. r- to consider all the minor issues here. (I'd like to be able to cq+ the patch when finished. :) 183075 2 47098 zecke 2010-01-20 21:32:11 -0800 Created attachment 47098 [iexploder] Automatically update htmltags.in and htmlattrs.in too 183077 3 zecke 2010-01-20 21:37:50 -0800 (In reply to comment #1) I should have addressed all comments form above (sorting, naming, bug id). > I just realized you could make this more generic by using a hash to hold these > values, then just iterate over the hash in a single update() method. I'm not sure if I follow here? We are writing three different files so the hash would be the input to the method? > If you'd rather keep separate methods, please add them before > writeiExploderFile() to keep the subroutines alphabetized. I nuked them. And I also append the path for htmldocs and WebCore inside the update method. > r- to consider all the minor issues here. (I'd like to be able to cq+ the > patch when finished. :) I'm fine to land the patch myself. :) As follow up commits we should rename the file, and I'm working on a commit to automatically append deleted entities to the end of the file. 186648 4 eric 2010-02-01 16:12:11 -0800 Attachment 47098 was posted by a committer and has review+, assigning to Holger Freyther for commit. 197083 5 zecke 2010-03-08 00:17:23 -0800 Landed in r55658. The htmlattrs.in needs another now. 46732 2010-01-15 21:25:52 -0800 2010-01-20 21:31:19 -0800 Patch 20100116062547.patch text/plain 5945 zecke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0YzkxODYxLi5iNzVlOTc2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTAtMDEt MTUgIEhvbGdlciBIYW5zIFBldGVyIEZyZXl0aGVyICA8emVja2VAc2VsZmlzaC5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2lleHBsb2Rlcl0g QXV0b21hdGljYWxseSB1cGRhdGUgaHRtbHRhZ3MuaW4gYW5kIGh0bWxhdHRycy5pbiB0b28KKyAg ICAgICAgTmVlZCBhIHNob3J0IGRlc2NyaXB0aW9uIGFuZCBidWcgVVJMIChPT1BTISkKKyAgICAg ICAgCisgICAgICAgIENoYW5nZSB0aGUgdXBkYXRlLWlleHBsb2Rlci1jc3Nwcm9wZXJpdGVzIHNj cmlwdCB0byB1cGRhdGUKKyAgICAgICAgdGhlIGh0bWxhdHRycy5pbiBhbmQgaHRtbHRhZ3MuaW4g b2YgV2ViS2l0VG9vbHMvaUV4cGxvZGVyL2h0ZG9jcworICAgICAgICBhdXRvbWF0aWNhbGx5IGFz IHdlbGwuCisgICAgICAgIAorICAgICAgICBDaGFuZ2UgdGhlIHJlYWRpbmcgYW5kIHdyaXRpbmcg Y29kZSB0byB3b3JrIHdpdGggcGFyYW1ldGVycworICAgICAgICBhbmQgZXh0ZW5kIHRoZSBtZXRo b2QgdGhhdCBpcyBwYXJzaW5nIHRoZSAuaW4gZmlsZXMgdG8gaGFuZGxlCisgICAgICAgIHRoZSBI VE1MVGFnTmFtZXMuaW4gYW5kIHRoZSBIVE1MQXR0cmlidXRlTmFtZXMuaW4gZmlsZXMuCisgICAg ICAgIAorICAgICAgICBSZW1vdmUgY3VzdG9tIGNvZGUgdG8gZGV0ZXJtaW5lIHRoZSByZXZpc2lv biBvZiBmaWxlcyB3aXRoIGEKKyAgICAgICAgdXRpbGl0eSBvZiBWQ1V0aWxzLnBtIHRvIGRldGVy bWluZSB0aGUgcmV2aXNpb24gb2YgdGhlIGRpcmVjdG9yeQorICAgICAgICB0aGVzZSBmaWxlcyBh cmUgbG9jYXRlZCBpbi4gVGhpcyB3aWxsIGFsc28gd29yayB3aXRoIGdpdCBjaGVja291dC4KKwor ICAgICAgICAqIFNjcmlwdHMvdXBkYXRlLWlleHBsb2Rlci1jc3Nwcm9wZXJ0aWVzOgorCiAyMDEw LTAxLTE0ICBDaHJpcyBKZXJkb25layAgPGNocmlzLmplcmRvbmVrQGdtYWlsLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBTaGluaWNoaXJvIEhhbWFqaS4KZGlmZiAtLWdpdCBhL1dlYktpdFRv b2xzL1NjcmlwdHMvdXBkYXRlLWlleHBsb2Rlci1jc3Nwcm9wZXJ0aWVzIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy91cGRhdGUtaWV4cGxvZGVyLWNzc3Byb3BlcnRpZXMKaW5kZXggYjdhZTZjYi4uMjhi NDYxNCAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy91cGRhdGUtaWV4cGxvZGVyLWNz c3Byb3BlcnRpZXMKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy91cGRhdGUtaWV4cGxvZGVyLWNz c3Byb3BlcnRpZXMKQEAgLTEsNiArMSw3IEBACiAjIS91c3IvYmluL3BlcmwKIAogIyBDb3B5cmln aHQgKEMpIDIwMDcgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0 IChDKSAyMDEwIEhvbGdlciBIYW5zIFBldGVyIEZyZXl0aGVyCiAjCiAjIFJlZGlzdHJpYnV0aW9u IGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBt b2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNv bmRpdGlvbnMKQEAgLTI2LDggKzI3LDkgQEAKICMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9U SEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GCiAjIFRISVMgU09G VFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0Uu CiAKLSMgVGhpcyBzY3JpcHQgdXBkYXRlcyBXZWJLaXRUb29scy9pRXhwbG9kZXIvaHRkb2NzL2Nz c3Byb3BlcnRpZXMuaW4gYmFzZWQgb24KLSMgV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5p bi4KKyMgVGhpcyBzY3JpcHQgdXBkYXRlcyBXZWJLaXRUb29scy9pRXhwbG9kZXIvaHRkb2NzLyou aW4gYmFzZWQgb24KKyMgV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbiwgV2ViQ29yZS9o dG1sL0hUTUxUYWdOYW1lcy5pbgorIyBhbmQgV2ViQ29yZS9odG1sL0hUTUxBdHRyaWJ1dGVOYW1l cy5pbgogCiB1c2Ugd2FybmluZ3M7CiB1c2Ugc3RyaWN0OwpAQCAtMzUsMzggKzM3LDU0IEBAIHVz ZSBzdHJpY3Q7CiB1c2UgRmluZEJpbjsKIHVzZSBsaWIgJEZpbmRCaW46OkJpbjsKIHVzZSB3ZWJr aXRkaXJzOwordXNlIFZDU1V0aWxzOwogCiB1c2UgRmlsZTo6U3BlYzsKIAotc3ViIGdlbmVyYXRl U2VjdGlvbkZyb21DU1NQcm9wZXJ0eU5hbWVzRmlsZSgpOwotc3ViIHJlYWRpRXhwbG9kZXJGaWxl KCk7Ci1zdWIgc3ZuUmV2aXNpb24oJCk7Ci1zdWIgd3JpdGVpRXhwbG9kZXJGaWxlKCk7Ci0KLW15 ICRpRXhwbG9kZXJGaWxlID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZShzb3VyY2VEaXIoKSwgc3BsaXQo Ii8iLCAiV2ViS2l0VG9vbHMvaUV4cGxvZGVyL2h0ZG9jcy9jc3Nwcm9wZXJ0aWVzLmluIikpOwot bXkgJGNzc1Byb3BlcnR5TmFtZXNGaWxlID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZShzb3VyY2VEaXIo KSwgc3BsaXQoIi8iLCAiV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbiIpKTsKLQotbXkg QHNlY3Rpb25zID0gcmVhZGlFeHBsb2RlckZpbGUoKTsKLSRzZWN0aW9uc1swXSA9IGdlbmVyYXRl U2VjdGlvbkZyb21DU1NQcm9wZXJ0eU5hbWVzRmlsZSgpOwotd3JpdGVpRXhwbG9kZXJGaWxlKCk7 Ci0KLXByaW50IGBzdm4gc3RhdCAkaUV4cGxvZGVyRmlsZWA7CitzdWIgZ2VuZXJhdGVBdHRyaWJ1 dGVzRnJvbUZpbGUoJCk7CitzdWIgcmVhZGlFeHBsb2RlckZpbGUoJCk7CitzdWIgd3JpdGVpRXhw bG9kZXJGaWxlKCRAKTsKK3N1YiB1cGRhdGUoJCQpOworc3ViIHVwZGF0ZUNTU1Byb3BlcnRpZXMo KTsKK3N1YiB1cGRhdGVIVE1MQXR0cmlidXRlcygpOworc3ViIHVwZGF0ZUhUTUxUYWdzKCk7CisK K3VwZGF0ZUNTU1Byb3BlcnRpZXMoKTsKK3VwZGF0ZUhUTUxBdHRyaWJ1dGVzKCk7Cit1cGRhdGVI VE1MVGFncygpOwogcHJpbnQgIlN1Y2Nlc3NmdWxseSB1cGRhdGVkIVxuIjsKIAogZXhpdCAwOwog Ci1zdWIgZ2VuZXJhdGVTZWN0aW9uRnJvbUNTU1Byb3BlcnR5TmFtZXNGaWxlKCkKK3N1YiBnZW5l cmF0ZUF0dHJpYnV0ZXNGcm9tRmlsZSgkKQogewotICAgIG15ICRyZXZpc2lvbiA9IHN2blJldmlz aW9uKCRjc3NQcm9wZXJ0eU5hbWVzRmlsZSk7Ci0gICAgbXkgJHBhdGggPSBGaWxlOjpTcGVjLT5h YnMycmVsKCRjc3NQcm9wZXJ0eU5hbWVzRmlsZSwgc291cmNlRGlyKCkpOworICAgIG15ICgkZmls ZW5hbWUpID0gQF87CisKKyAgICBteSAkcmV2aXNpb24gPSBzdm5SZXZpc2lvbkZvckRpcmVjdG9y eShkaXJuYW1lKCRmaWxlbmFtZSkpOworICAgIG15ICRwYXRoID0gRmlsZTo6U3BlYy0+YWJzMnJl bCgkZmlsZW5hbWUsIHNvdXJjZURpcigpKTsKICAgICBteSAkcmVzdWx0ID0gIiMgRnJvbSBXZWJL aXQgc3ZuIHIiIC4gJHJldmlzaW9uIC4gIiAoIiAuICRwYXRoIC4gIilcbiI7CiAKICAgICBteSBA cHJvcGVydGllcyA9ICgpOworICAgIG15ICRpbl9uYW1lc3BhY2UgPSAwOwogCi0gICAgb3BlbihJ TiwgJGNzc1Byb3BlcnR5TmFtZXNGaWxlKSB8fCBkaWUgIiQhIjsKKyAgICBvcGVuKElOLCAkZmls ZW5hbWUpIHx8IGRpZSAiJCEiOwogICAgIHdoaWxlIChteSAkbCA9IDxJTj4pIHsKICAgICAgICAg Y2hvbXAgJGw7CisgICAgICAgIGlmICgkbCA9fiBtL15uYW1lc3BhY2U9XCIvKSB7CisgICAgICAg ICAgICAkaW5fbmFtZXNwYWNlID0gMTsKKyAgICAgICAgfSBlbHNpZiAoJGluX25hbWVzcGFjZSAm JiAkbCA9fiBtL14kLykgeworICAgICAgICAgICAgJGluX25hbWVzcGFjZSA9IDA7CisgICAgICAg IH0KKworICAgICAgICBuZXh0IGlmICRpbl9uYW1lc3BhY2U7CiAgICAgICAgIG5leHQgaWYgJGwg PX4gbS9eXHMqIy8gfHwgJGwgPX4gbS9eXHMqJC87CisKKyAgICAgICAgIyBGb3IgSFRNTCBUYWdz IHRoYXQgY2FuIGhhdmUgYWRkaXRpb25hbCBpbmZvcm1hdGlvbgorICAgICAgICBpZiAoJGwgPX4g bS8gLykgeworICAgICAgICAgICAgbXkgQHNwbGl0ID0gc3BsaXQgLyAvLCAkbDsKKyAgICAgICAg ICAgICRsID0gJHNwbGl0WzBdCisgICAgICAgIH0KKwogICAgICAgICBwdXNoKEBwcm9wZXJ0aWVz LCAkbCk7CiAgICAgfQogICAgIGNsb3NlKElOKTsKQEAgLTc2LDM3ICs5NCw1MiBAQCBzdWIgZ2Vu ZXJhdGVTZWN0aW9uRnJvbUNTU1Byb3BlcnR5TmFtZXNGaWxlKCkKICAgICByZXR1cm4gJHJlc3Vs dDsKIH0KIAotc3ViIHJlYWRpRXhwbG9kZXJGaWxlKCkKK3N1YiByZWFkaUV4cGxvZGVyRmlsZSgk KQogeworICAgIG15ICgkZmlsZW5hbWUpID0gQF87CisKICAgICBteSBAc2VjdGlvbnMgPSAoKTsK ICAgICBsb2NhbCAkLyA9ICJcblxuIjsKIAotICAgIG9wZW4oSU4sICRpRXhwbG9kZXJGaWxlKSB8 fCBkaWUgIiQhIjsKKyAgICBvcGVuKElOLCAkZmlsZW5hbWUpIHx8IGRpZSAiJCEiOwogICAgIEBz ZWN0aW9ucyA9IDxJTj47CiAgICAgY2xvc2UoSU4pOwogCiAgICAgcmV0dXJuIEBzZWN0aW9uczsK IH0KIAotc3ViIHN2blJldmlzaW9uKCQpCitzdWIgd3JpdGVpRXhwbG9kZXJGaWxlKCRAKQogewot ICAgIG15ICgkZmlsZSkgPSBAXzsKLSAgICBteSAkcmV2aXNpb24gPSAiIjsKKyAgICBteSAoJGZp bGVuYW1lLCBAc2VjdGlvbnMpID0gQF87CiAKLSAgICBvcGVuIElORk8sICJzdm4gaW5mbyAnJGZp bGUnIHwiIG9yIGRpZTsKLSAgICB3aGlsZSAoPElORk8+KSB7Ci0gICAgICAgIGlmICgvXlJldmlz aW9uOiAoLispLykgewotICAgICAgICAgICAgJHJldmlzaW9uID0gJDE7Ci0gICAgICAgIH0KLSAg ICB9Ci0gICAgY2xvc2UgSU5GTzsKKyAgICBvcGVuKE9VVCwgIj4gJGZpbGVuYW1lIikgfHwgZGll ICIkISI7CisgICAgcHJpbnQgT1VUIGpvaW4oIiIsIEBzZWN0aW9ucyk7CisgICAgY2xvc2UoT1VU KTsKK30KKworc3ViIHVwZGF0ZSgkJCkKK3sKKyAgICBteSAoJGlleHBsb2RlciwgJHdlYmNvcmUp ID0gQF87CiAKLSAgICByZXR1cm4gJHJldmlzaW9uID8gJHJldmlzaW9uIDogIlVOS05PV04iOwor ICAgICRpZXhwbG9kZXIgPSBGaWxlOjpTcGVjLT5jYXRmaWxlKHNvdXJjZURpciwgc3BsaXQoIi8i LCAkaWV4cGxvZGVyKSk7CisgICAgJHdlYmNvcmUgPSBGaWxlOjpTcGVjLT5jYXRmaWxlKHNvdXJj ZURpciwgc3BsaXQoIi8iLCAkd2ViY29yZSkpOworCisgICAgbXkgQHNlY3Rpb25zID0gcmVhZGlF eHBsb2RlckZpbGUoJGlleHBsb2Rlcik7CisgICAgJHNlY3Rpb25zWzBdID0gZ2VuZXJhdGVBdHRy aWJ1dGVzRnJvbUZpbGUoJHdlYmNvcmUpOworICAgIHdyaXRlaUV4cGxvZGVyRmlsZSgkaWV4cGxv ZGVyLCBAc2VjdGlvbnMpOwogfQogCi1zdWIgd3JpdGVpRXhwbG9kZXJGaWxlKCkKK3N1YiB1cGRh dGVDU1NQcm9wZXJ0aWVzKCkKIHsKLSAgICBvcGVuKE9VVCwgIj4gJGlFeHBsb2RlckZpbGUiKSB8 fCBkaWUgIiQhIjsKLSAgICBwcmludCBPVVQgam9pbigiIiwgQHNlY3Rpb25zKTsKLSAgICBjbG9z ZShPVVQpOworICAgIHVwZGF0ZSgiV2ViS2l0VG9vbHMvaUV4cGxvZGVyL2h0ZG9jcy9jc3Nwcm9w ZXJ0aWVzLmluIiwgIldlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4iKTsKK30KKworc3Vi IHVwZGF0ZUhUTUxBdHRyaWJ1dGVzKCkKK3sKKyAgICB1cGRhdGUoIldlYktpdFRvb2xzL2lFeHBs b2Rlci9odGRvY3MvaHRtbGF0dHJzLmluIiwgIldlYkNvcmUvaHRtbC9IVE1MQXR0cmlidXRlTmFt ZXMuaW4iKTsKK30KKworc3ViIHVwZGF0ZUhUTUxUYWdzKCkKK3sKKyAgICB1cGRhdGUoIldlYktp dFRvb2xzL2lFeHBsb2Rlci9odGRvY3MvaHRtbHRhZ3MuaW4iLCAiV2ViQ29yZS9odG1sL0hUTUxU YWdOYW1lcy5pbiIpOwogfQo= 47098 2010-01-20 21:32:11 -0800 2010-01-21 09:48:42 -0800 [iexploder] Automatically update htmltags.in and htmlattrs.in too bug-33755-20100121063135.patch text/plain 5678 zecke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA5YmFlMWY5Li5jOWZjNDgwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTAtMDEt MTUgIEhvbGdlciBIYW5zIFBldGVyIEZyZXl0aGVyICA8emVja2VAc2VsZmlzaC5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2lleHBsb2Rlcl0g QXV0b21hdGljYWxseSB1cGRhdGUgaHRtbHRhZ3MuaW4gYW5kIGh0bWxhdHRycy5pbiB0b28KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMzNzU1CisKKyAg ICAgICAgQ2hhbmdlIHRoZSB1cGRhdGUtaWV4cGxvZGVyLWNzc3Byb3Blcml0ZXMgc2NyaXB0IHRv IHVwZGF0ZQorICAgICAgICB0aGUgaHRtbGF0dHJzLmluIGFuZCBodG1sdGFncy5pbiBvZiBXZWJL aXRUb29scy9pRXhwbG9kZXIvaHRkb2NzCisgICAgICAgIGF1dG9tYXRpY2FsbHkgYXMgd2VsbC4K KworICAgICAgICBDaGFuZ2UgdGhlIHJlYWRpbmcgYW5kIHdyaXRpbmcgY29kZSB0byB3b3JrIHdp dGggcGFyYW1ldGVycworICAgICAgICBhbmQgZXh0ZW5kIHRoZSBtZXRob2QgdGhhdCBpcyBwYXJz aW5nIHRoZSAuaW4gZmlsZXMgdG8gaGFuZGxlCisgICAgICAgIHRoZSBIVE1MVGFnTmFtZXMuaW4g YW5kIHRoZSBIVE1MQXR0cmlidXRlTmFtZXMuaW4gZmlsZXMuCisKKyAgICAgICAgUmVtb3ZlIGN1 c3RvbSBjb2RlIHRvIGRldGVybWluZSB0aGUgcmV2aXNpb24gb2YgZmlsZXMgd2l0aCBhCisgICAg ICAgIHV0aWxpdHkgb2YgVkNVdGlscy5wbSB0byBkZXRlcm1pbmUgdGhlIHJldmlzaW9uIG9mIHRo ZSBkaXJlY3RvcnkKKyAgICAgICAgdGhlc2UgZmlsZXMgYXJlIGxvY2F0ZWQgaW4uIFRoaXMgd2ls bCBhbHNvIHdvcmsgd2l0aCBnaXQgY2hlY2tvdXQuCisKKyAgICAgICAgKiBTY3JpcHRzL3VwZGF0 ZS1pZXhwbG9kZXItY3NzcHJvcGVydGllczoKKwogMjAxMC0wMS0xNyAgQ2hyaXMgSmVyZG9uZWsg IDxjamVyZG9uZWtAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRo LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy91cGRhdGUtaWV4cGxvZGVyLWNzc3By b3BlcnRpZXMgYi9XZWJLaXRUb29scy9TY3JpcHRzL3VwZGF0ZS1pZXhwbG9kZXItY3NzcHJvcGVy dGllcwppbmRleCBiN2FlNmNiLi4zZmJjZjgzIDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3Jp cHRzL3VwZGF0ZS1pZXhwbG9kZXItY3NzcHJvcGVydGllcworKysgYi9XZWJLaXRUb29scy9TY3Jp cHRzL3VwZGF0ZS1pZXhwbG9kZXItY3NzcHJvcGVydGllcwpAQCAtMSw2ICsxLDcgQEAKICMhL3Vz ci9iaW4vcGVybAogCiAjIENvcHlyaWdodCAoQykgMjAwNyBBcHBsZSBJbmMuICBBbGwgcmlnaHRz IHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMTAgSG9sZ2VyIEhhbnMgUGV0ZXIgRnJleXRo ZXIKICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjYsODcgKzI3LDEwMyBAQAogIyAo SU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VU IE9GIFRIRSBVU0UgT0YKICMgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQ T1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAotIyBUaGlzIHNjcmlwdCB1cGRhdGVzIFdlYktp dFRvb2xzL2lFeHBsb2Rlci9odGRvY3MvY3NzcHJvcGVydGllcy5pbiBiYXNlZCBvbgotIyBXZWJD b3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluLgorIyBUaGlzIHNjcmlwdCB1cGRhdGVzIFdlYktp dFRvb2xzL2lFeHBsb2Rlci9odGRvY3MvKi5pbiBiYXNlZCBvbgorIyBXZWJDb3JlL2Nzcy9DU1NQ cm9wZXJ0eU5hbWVzLmluLCBXZWJDb3JlL2h0bWwvSFRNTFRhZ05hbWVzLmluCisjIGFuZCBXZWJD b3JlL2h0bWwvSFRNTEF0dHJpYnV0ZU5hbWVzLmluCiAKIHVzZSB3YXJuaW5nczsKIHVzZSBzdHJp Y3Q7CiAKIHVzZSBGaW5kQmluOwogdXNlIGxpYiAkRmluZEJpbjo6QmluOwordXNlIFZDU1V0aWxz OwogdXNlIHdlYmtpdGRpcnM7CiAKIHVzZSBGaWxlOjpTcGVjOwogCi1zdWIgZ2VuZXJhdGVTZWN0 aW9uRnJvbUNTU1Byb3BlcnR5TmFtZXNGaWxlKCk7Ci1zdWIgcmVhZGlFeHBsb2RlckZpbGUoKTsK LXN1YiBzdm5SZXZpc2lvbigkKTsKLXN1YiB3cml0ZWlFeHBsb2RlckZpbGUoKTsKK3N1YiBnZW5l cmF0ZUVudGl0eUxpc3RGcm9tRmlsZSgkKTsKK3N1YiByZWFkaUV4cGxvZGVyRmlsZSgkKTsKK3N1 YiB1cGRhdGUoJCQpOworc3ViIHdyaXRlaUV4cGxvZGVyRmlsZSgkQCk7CiAKLW15ICRpRXhwbG9k ZXJGaWxlID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZShzb3VyY2VEaXIoKSwgc3BsaXQoIi8iLCAiV2Vi S2l0VG9vbHMvaUV4cGxvZGVyL2h0ZG9jcy9jc3Nwcm9wZXJ0aWVzLmluIikpOwotbXkgJGNzc1By b3BlcnR5TmFtZXNGaWxlID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZShzb3VyY2VEaXIoKSwgc3BsaXQo Ii8iLCAiV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbiIpKTsKLQotbXkgQHNlY3Rpb25z ID0gcmVhZGlFeHBsb2RlckZpbGUoKTsKLSRzZWN0aW9uc1swXSA9IGdlbmVyYXRlU2VjdGlvbkZy b21DU1NQcm9wZXJ0eU5hbWVzRmlsZSgpOwotd3JpdGVpRXhwbG9kZXJGaWxlKCk7Ci0KLXByaW50 IGBzdm4gc3RhdCAkaUV4cGxvZGVyRmlsZWA7Cit1cGRhdGUoImNzc3Byb3BlcnRpZXMuaW4iLCAi Y3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4iKTsKK3VwZGF0ZSgiaHRtbGF0dHJzLmluIiwgImh0bWwv SFRNTEF0dHJpYnV0ZU5hbWVzLmluIik7Cit1cGRhdGUoImh0bWx0YWdzLmluIiwgImh0bWwvSFRN TFRhZ05hbWVzLmluIik7CiBwcmludCAiU3VjY2Vzc2Z1bGx5IHVwZGF0ZWQhXG4iOwogCiBleGl0 IDA7CiAKLXN1YiBnZW5lcmF0ZVNlY3Rpb25Gcm9tQ1NTUHJvcGVydHlOYW1lc0ZpbGUoKQorc3Vi IGdlbmVyYXRlRW50aXR5TGlzdEZyb21GaWxlKCQpCiB7Ci0gICAgbXkgJHJldmlzaW9uID0gc3Zu UmV2aXNpb24oJGNzc1Byb3BlcnR5TmFtZXNGaWxlKTsKLSAgICBteSAkcGF0aCA9IEZpbGU6OlNw ZWMtPmFiczJyZWwoJGNzc1Byb3BlcnR5TmFtZXNGaWxlLCBzb3VyY2VEaXIoKSk7CisgICAgbXkg KCRmaWxlbmFtZSkgPSBAXzsKKworICAgIG15ICRyZXZpc2lvbiA9IHN2blJldmlzaW9uRm9yRGly ZWN0b3J5KGRpcm5hbWUoJGZpbGVuYW1lKSk7CisgICAgbXkgJHBhdGggPSBGaWxlOjpTcGVjLT5h YnMycmVsKCRmaWxlbmFtZSwgc291cmNlRGlyKCkpOwogICAgIG15ICRyZXN1bHQgPSAiIyBGcm9t IFdlYktpdCBzdm4gciIgLiAkcmV2aXNpb24gLiAiICgiIC4gJHBhdGggLiAiKVxuIjsKIAotICAg IG15IEBwcm9wZXJ0aWVzID0gKCk7CisgICAgbXkgQGVudGl0aWVzID0gKCk7CisgICAgbXkgJGlu X25hbWVzcGFjZSA9IDA7CiAKLSAgICBvcGVuKElOLCAkY3NzUHJvcGVydHlOYW1lc0ZpbGUpIHx8 IGRpZSAiJCEiOworICAgIG9wZW4oSU4sICRmaWxlbmFtZSkgfHwgZGllICIkISI7CiAgICAgd2hp bGUgKG15ICRsID0gPElOPikgewogICAgICAgICBjaG9tcCAkbDsKKyAgICAgICAgaWYgKCRsID1+ IG0vXm5hbWVzcGFjZT1cIi8pIHsKKyAgICAgICAgICAgICRpbl9uYW1lc3BhY2UgPSAxOworICAg ICAgICB9IGVsc2lmICgkaW5fbmFtZXNwYWNlICYmICRsID1+IG0vXiQvKSB7CisgICAgICAgICAg ICAkaW5fbmFtZXNwYWNlID0gMDsKKyAgICAgICAgfQorCisgICAgICAgIG5leHQgaWYgJGluX25h bWVzcGFjZTsKICAgICAgICAgbmV4dCBpZiAkbCA9fiBtL15ccyojLyB8fCAkbCA9fiBtL15ccyok LzsKLSAgICAgICAgcHVzaChAcHJvcGVydGllcywgJGwpOworCisgICAgICAgICMgRm9yIEhUTUwg VGFncyB0aGF0IGNhbiBoYXZlIGFkZGl0aW9uYWwgaW5mb3JtYXRpb24KKyAgICAgICAgaWYgKCRs ID1+IG0vIC8pIHsKKyAgICAgICAgICAgIG15IEBzcGxpdCA9IHNwbGl0IC8gLywgJGw7CisgICAg ICAgICAgICAkbCA9ICRzcGxpdFswXQorICAgICAgICB9CisKKyAgICAgICAgcHVzaChAZW50aXRp ZXMsICRsKTsKICAgICB9CiAgICAgY2xvc2UoSU4pOwogCi0gICAgJHJlc3VsdCAuPSBqb2luKCJc biIsIHNvcnQgeyAkYSBjbXAgJGIgfSBAcHJvcGVydGllcykgLiAiXG5cbiI7CisgICAgJHJlc3Vs dCAuPSBqb2luKCJcbiIsIHNvcnQgeyAkYSBjbXAgJGIgfSBAZW50aXRpZXMpIC4gIlxuXG4iOwog CiAgICAgcmV0dXJuICRyZXN1bHQ7CiB9CiAKLXN1YiByZWFkaUV4cGxvZGVyRmlsZSgpCitzdWIg cmVhZGlFeHBsb2RlckZpbGUoJCkKIHsKKyAgICBteSAoJGZpbGVuYW1lKSA9IEBfOworCiAgICAg bXkgQHNlY3Rpb25zID0gKCk7CiAgICAgbG9jYWwgJC8gPSAiXG5cbiI7CiAKLSAgICBvcGVuKElO LCAkaUV4cGxvZGVyRmlsZSkgfHwgZGllICIkISI7CisgICAgb3BlbihJTiwgJGZpbGVuYW1lKSB8 fCBkaWUgIiQhIjsKICAgICBAc2VjdGlvbnMgPSA8SU4+OwogICAgIGNsb3NlKElOKTsKIAogICAg IHJldHVybiBAc2VjdGlvbnM7CiB9CiAKLXN1YiBzdm5SZXZpc2lvbigkKQorc3ViIHVwZGF0ZSgk JCkKIHsKLSAgICBteSAoJGZpbGUpID0gQF87Ci0gICAgbXkgJHJldmlzaW9uID0gIiI7CisgICAg bXkgKCRpZXhwbG9kZXJQYXRoLCAkd2ViY29yZVBhdGgpID0gQF87CiAKLSAgICBvcGVuIElORk8s ICJzdm4gaW5mbyAnJGZpbGUnIHwiIG9yIGRpZTsKLSAgICB3aGlsZSAoPElORk8+KSB7Ci0gICAg ICAgIGlmICgvXlJldmlzaW9uOiAoLispLykgewotICAgICAgICAgICAgJHJldmlzaW9uID0gJDE7 Ci0gICAgICAgIH0KLSAgICB9Ci0gICAgY2xvc2UgSU5GTzsKKyAgICAkaWV4cGxvZGVyUGF0aCA9 IEZpbGU6OlNwZWMtPmNhdGZpbGUoc291cmNlRGlyKCksICJXZWJLaXRUb29scyIsICJpRXhwbG9k ZXIiLCAiaHRkb2NzIiwgc3BsaXQoIi8iLCAkaWV4cGxvZGVyUGF0aCkpOworICAgICR3ZWJjb3Jl UGF0aCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoc291cmNlRGlyKCksICJXZWJDb3JlIiwgc3BsaXQo Ii8iLCAkd2ViY29yZVBhdGgpKTsKIAotICAgIHJldHVybiAkcmV2aXNpb24gPyAkcmV2aXNpb24g OiAiVU5LTk9XTiI7CisgICAgbXkgQHNlY3Rpb25zID0gcmVhZGlFeHBsb2RlckZpbGUoJGlleHBs b2RlclBhdGgpOworICAgICRzZWN0aW9uc1swXSA9IGdlbmVyYXRlRW50aXR5TGlzdEZyb21GaWxl KCR3ZWJjb3JlUGF0aCk7CisgICAgd3JpdGVpRXhwbG9kZXJGaWxlKCRpZXhwbG9kZXJQYXRoLCBA c2VjdGlvbnMpOwogfQogCi1zdWIgd3JpdGVpRXhwbG9kZXJGaWxlKCkKKworc3ViIHdyaXRlaUV4 cGxvZGVyRmlsZSgkQCkKIHsKLSAgICBvcGVuKE9VVCwgIj4gJGlFeHBsb2RlckZpbGUiKSB8fCBk aWUgIiQhIjsKKyAgICBteSAoJGZpbGVuYW1lLCBAc2VjdGlvbnMpID0gQF87CisKKyAgICBvcGVu KE9VVCwgIj4gJGZpbGVuYW1lIikgfHwgZGllICIkISI7CiAgICAgcHJpbnQgT1VUIGpvaW4oIiIs IEBzZWN0aW9ucyk7CiAgICAgY2xvc2UoT1VUKTsKIH0KKwo=