22188 2008-11-11 15:17:04 -0800 Smear some lipstick on the HTMLTokenizer pig. 2008-11-11 17:54:37 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned bdakin hyatt oldest_to_newest 98355 0 eric 2008-11-11 15:17:04 -0800 So scary. But I need to fix a crasher in HTMLTokenizer... so let's clean'er up first. I'm about to attach like 10 git patches. I will squash them down and land them as one large patch, but reviewing all the little pieces is likely easier (certainly safer). 98356 1 25056 eric 2008-11-11 15:17:27 -0800 Created attachment 25056 Rename pendingScripts to m_pendingScripts WebCore/html/HTMLTokenizer.cpp | 35 +++++++++++++++++------------------ WebCore/html/HTMLTokenizer.h | 2 +- 2 files changed, 18 insertions(+), 19 deletions(-) 98357 2 25057 eric 2008-11-11 15:17:29 -0800 Created attachment 25057 Rename scriptNode to m_scriptNode make the type specific WebCore/html/HTMLTokenizer.cpp | 18 +++++++++--------- WebCore/html/HTMLTokenizer.h | 3 ++- 2 files changed, 11 insertions(+), 10 deletions(-) 98358 3 25058 eric 2008-11-11 15:17:31 -0800 Created attachment 25058 Rename pendingSrc to m_pendingSrc WebCore/html/HTMLTokenizer.cpp | 34 +++++++++++++++++----------------- WebCore/html/HTMLTokenizer.h | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) 98359 4 25059 eric 2008-11-11 15:17:37 -0800 Created attachment 25059 Rename currentPrependingSrc to m_currentPrependingSrc WebCore/html/HTMLTokenizer.cpp | 30 +++++++++++++++--------------- WebCore/html/HTMLTokenizer.h | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) 98360 5 25060 eric 2008-11-11 15:17:40 -0800 Created attachment 25060 Rename noMoreData to m_noMoreData and cBuffer to m_cBuffer WebCore/html/HTMLTokenizer.cpp | 68 +++++++++++++++++++-------------------- WebCore/html/HTMLTokenizer.h | 4 +- 2 files changed, 35 insertions(+), 37 deletions(-) 98361 6 25061 eric 2008-11-11 15:17:42 -0800 Created attachment 25061 Remove long-since-dead kdDebug and qDebug calls WebCore/css/CSSParser.cpp | 12 ------------ WebCore/html/HTMLTokenizer.cpp | 32 ++++---------------------------- WebCore/rendering/RenderBlock.cpp | 7 ++----- 3 files changed, 6 insertions(+), 45 deletions(-) 98362 7 25062 eric 2008-11-11 15:17:48 -0800 Created attachment 25062 Rename brokenComments to m_brokenComments WebCore/html/HTMLTokenizer.cpp | 8 ++++---- WebCore/html/HTMLTokenizer.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) 98363 8 25063 eric 2008-11-11 15:17:50 -0800 Created attachment 25063 Remove HTMLTokenizer includes and document the rest WebCore/dom/XMLTokenizer.cpp | 1 - WebCore/dom/XMLTokenizerLibxml2.cpp | 2 +- WebCore/html/HTMLDocument.cpp | 1 - WebCore/html/HTMLElement.cpp | 2 +- WebCore/html/HTMLFormControlElement.cpp | 1 - WebCore/xml/XSLTProcessor.cpp | 2 +- 6 files changed, 3 insertions(+), 6 deletions(-) 98364 9 25064 eric 2008-11-11 15:17:51 -0800 Created attachment 25064 Rename src to m_src WebCore/html/HTMLTokenizer.cpp | 76 ++++++++++++++++++++-------------------- WebCore/html/HTMLTokenizer.h | 4 +- 2 files changed, 40 insertions(+), 40 deletions(-) 98365 10 25065 eric 2008-11-11 15:17:53 -0800 Created attachment 25065 Rename parser to m_parser and make it an OwnPtr WebCore/html/HTMLTokenizer.cpp | 19 +++++++++---------- WebCore/html/HTMLTokenizer.h | 4 ++-- 2 files changed, 11 insertions(+), 12 deletions(-) 98366 11 25066 eric 2008-11-11 15:17:55 -0800 Created attachment 25066 Rename inWrite to m_inWrite and jsProxy to scriptController WebCore/html/HTMLTokenizer.cpp | 34 +++++++++++++++++----------------- WebCore/html/HTMLTokenizer.h | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) 98367 12 25067 eric 2008-11-11 15:17:58 -0800 Created attachment 25067 Rename brokenServer to m_brokenServer WebCore/html/HTMLTokenizer.cpp | 6 +++--- WebCore/html/HTMLTokenizer.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 98368 13 25068 eric 2008-11-11 15:17:59 -0800 Created attachment 25068 Rename buffer to m_buffer and dest to m_dest WebCore/html/HTMLTokenizer.cpp | 106 ++++++++++++++++++++-------------------- WebCore/html/HTMLTokenizer.h | 10 ++-- 2 files changed, 58 insertions(+), 58 deletions(-) 98369 14 25069 eric 2008-11-11 15:18:01 -0800 Created attachment 25069 Rename size to m_bufferSize WebCore/html/HTMLTokenizer.cpp | 8 ++++---- WebCore/html/HTMLTokenizer.h | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) 98370 15 25070 eric 2008-11-11 15:18:06 -0800 Created attachment 25070 Rename attrName to m_attrName WebCore/html/HTMLTokenizer.cpp | 26 +++++++++++++------------- WebCore/html/HTMLTokenizer.h | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) 98371 16 25071 eric 2008-11-11 15:18:09 -0800 Created attachment 25071 Rename searchStopper to m_searchStopper and searchStopperLen to m_searchStopperLen WebCore/html/HTMLTokenizer.cpp | 32 ++++++++++++++++---------------- WebCore/html/HTMLTokenizer.h | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) 98372 17 25072 eric 2008-11-11 15:18:10 -0800 Created attachment 25072 Rename scriptCode* to m_scriptCode* and change scriptCodeMax to m_scriptCodeCapacity WebCore/html/HTMLTokenizer.cpp | 136 ++++++++++++++++++++-------------------- WebCore/html/HTMLTokenizer.h | 11 ++-- 2 files changed, 73 insertions(+), 74 deletions(-) 98373 18 25073 eric 2008-11-11 15:18:12 -0800 Created attachment 25073 Rename scriptStartLineno to m_currentScriptTagStartLineNumber and tagStartLineno to m_currentTagStartLineNumber WebCore/html/HTMLTokenizer.cpp | 19 ++++++++++--------- WebCore/html/HTMLTokenizer.h | 5 ++--- 2 files changed, 12 insertions(+), 12 deletions(-) 98374 19 25074 eric 2008-11-11 15:18:16 -0800 Created attachment 25074 Rename scriptSrc to m_scriptTagSrcAttrValue and scriptSrcCharset to m_scriptTagCharsetAttrValue -- a bit unwieldy, but more precise WebCore/html/HTMLTokenizer.cpp | 16 ++++++++-------- WebCore/html/HTMLTokenizer.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) 98375 20 25075 eric 2008-11-11 15:18:17 -0800 Created attachment 25075 Rename flat to selfClosingTag WebCore/html/HTMLTokenizer.cpp | 8 ++++---- WebCore/html/HTMLTokenizer.h | 11 ++++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) 98376 21 25076 eric 2008-11-11 15:18:19 -0800 Created attachment 25076 Rename currToken to m_currentToken WebCore/html/HTMLTokenizer.cpp | 112 ++++++++++++++++++++-------------------- WebCore/html/HTMLTokenizer.h | 2 +- 2 files changed, 57 insertions(+), 57 deletions(-) 98380 22 25060 koivisto 2008-11-11 15:42:30 -0800 Comment on attachment 25060 Rename noMoreData to m_noMoreData and cBuffer to m_cBuffer #define CBUFLEN 1024 could make this a static const with better name since you are here. 98384 23 25071 koivisto 2008-11-11 16:18:06 -0800 Comment on attachment 25071 Rename searchStopper to m_searchStopper and searchStopperLen to m_searchStopperLen Maybe m_searchStopperLenght instead of m_searchStopperLen? 98388 24 25075 koivisto 2008-11-11 16:25:15 -0800 Comment on attachment 25075 Rename flat to selfClosingTag This class nees some m_ consistency too. Maybe it should be a struct since fields are public? Then m_ can go too. 98410 25 eric 2008-11-11 17:54:37 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/css/CSSParser.cpp M WebCore/dom/XMLTokenizer.cpp M WebCore/dom/XMLTokenizerLibxml2.cpp M WebCore/html/HTMLDocument.cpp M WebCore/html/HTMLElement.cpp M WebCore/html/HTMLFormControlElement.cpp M WebCore/html/HTMLParser.cpp M WebCore/html/HTMLParser.h M WebCore/html/HTMLTokenizer.cpp M WebCore/html/HTMLTokenizer.h M WebCore/html/HTMLViewSourceDocument.h M WebCore/rendering/RenderBlock.cpp M WebCore/xml/XSLTProcessor.cpp Committed r38327 25056 2008-11-11 15:17:27 -0800 2008-11-11 15:29:58 -0800 Rename pendingScripts to m_pendingScripts Rename-pendingScripts-to-m_pendingScripts.patch text/plain 5922 eric MjYzNmJjYzIzM2VhOWU4OWM3YTMxNzQ5NDE5ZmU4MzcyN2QwNGJlNwpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu Y3BwCmluZGV4IDYyN2EzZjUuLmZmMWM3OTcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTIw OCw5ICsyMDgsOSBAQCB2b2lkIEhUTUxUb2tlbml6ZXI6OnJlc2V0KCkKIHsKICAgICBBU1NFUlQo bV9leGVjdXRpbmdTY3JpcHQgPT0gMCk7CiAKLSAgICB3aGlsZSAoIXBlbmRpbmdTY3JpcHRzLmlz RW1wdHkoKSkgewotICAgICAgICBDYWNoZWRTY3JpcHQgKmNzID0gcGVuZGluZ1NjcmlwdHMuZmly c3QoKS5nZXQoKTsKLSAgICAgICAgcGVuZGluZ1NjcmlwdHMucmVtb3ZlRmlyc3QoKTsKKyAgICB3 aGlsZSAoIW1fcGVuZGluZ1NjcmlwdHMuaXNFbXB0eSgpKSB7CisgICAgICAgIENhY2hlZFNjcmlw dCogY3MgPSBtX3BlbmRpbmdTY3JpcHRzLmZpcnN0KCkuZ2V0KCk7CisgICAgICAgIG1fcGVuZGlu Z1NjcmlwdHMucmVtb3ZlRmlyc3QoKTsKICAgICAgICAgQVNTRVJUKGNhY2hlKCktPmRpc2FibGVk KCkgfHwgY3MtPmFjY2Vzc0NvdW50KCkgPiAwKTsKICAgICAgICAgY3MtPnJlbW92ZUNsaWVudCh0 aGlzKTsKICAgICB9CkBAIC00MzQsNyArNDM0LDcgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRN TFRva2VuaXplcjo6c2NyaXB0SGFuZGxlcihTdGF0ZSBzdGF0ZSkKICAgICAgICAgICAgICAgICAv LyBUaGUgcGFyc2VyIG1pZ2h0IGhhdmUgYmVlbiBzdG9wcGVkIGJ5IGZvciBleGFtcGxlIGEgd2lu ZG93LmNsb3NlIGNhbGwgaW4gYW4gZWFybGllciBzY3JpcHQuCiAgICAgICAgICAgICAgICAgLy8g SWYgc28sIHdlIGRvbid0IHdhbnQgdG8gbG9hZCBzY3JpcHRzLgogICAgICAgICAgICAgICAgIGlm ICghbV9wYXJzZXJTdG9wcGVkICYmIChjcyA9IG1fZG9jLT5kb2NMb2FkZXIoKS0+cmVxdWVzdFNj cmlwdChzY3JpcHRTcmMsIHNjcmlwdFNyY0NoYXJzZXQpKSkKLSAgICAgICAgICAgICAgICAgICAg cGVuZGluZ1NjcmlwdHMuYXBwZW5kKGNzKTsKKyAgICAgICAgICAgICAgICAgICAgbV9wZW5kaW5n U2NyaXB0cy5hcHBlbmQoY3MpOwogICAgICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAg ICAgICAgc2NyaXB0Tm9kZSA9IDA7CiAgICAgICAgICAgICB9IGVsc2UKQEAgLTQ5MSw3ICs0OTEs NyBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpzY3JpcHRIYW5kbGVyKFN0 YXRlIHN0YXRlKQogICAgICAgICAgICAgbV9yZXF1ZXN0aW5nU2NyaXB0ID0gc2F2ZWRSZXF1ZXN0 aW5nU2NyaXB0OwogICAgICAgICAgICAgc3RhdGUgPSBtX3N0YXRlOwogICAgICAgICAgICAgLy8g d2lsbCBiZSAwIGlmIHNjcmlwdCB3YXMgYWxyZWFkeSBsb2FkZWQgYW5kIHJlZigpIGV4ZWN1dGVk IGl0Ci0gICAgICAgICAgICBpZiAoIXBlbmRpbmdTY3JpcHRzLmlzRW1wdHkoKSkKKyAgICAgICAg ICAgIGlmICghbV9wZW5kaW5nU2NyaXB0cy5pc0VtcHR5KCkpCiAgICAgICAgICAgICAgICAgc3Rh dGUuc2V0TG9hZGluZ0V4dFNjcmlwdCh0cnVlKTsKICAgICAgICAgfSBlbHNlIGlmICghbV9mcmFn bWVudCAmJiBkb1NjcmlwdEV4ZWMpIHsKICAgICAgICAgICAgIGlmICghbV9leGVjdXRpbmdTY3Jp cHQpCkBAIC01MTQsMTIgKzUxNCwxMSBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5p emVyOjpzY3JpcHRIYW5kbGVyKFN0YXRlIHN0YXRlKQogICAgICAgICAvLyB3ZSBuZWVkIHRvIGRv IHRoaXMgc2xpZ2h0bHkgbW9kaWZpZWQgYml0IG9mIG9uZSBvZiB0aGUgd3JpdGUoKSBjYXNlcwog ICAgICAgICAvLyBiZWNhdXNlIHdlIHdhbnQgdG8gcHJlcGVuZCB0byBwZW5kaW5nU3JjIHJhdGhl ciB0aGFuIGFwcGVuZGluZwogICAgICAgICAvLyBpZiB0aGVyZSdzIG5vIHByZXZpb3VzIHByZXBl bmRpbmdTcmMKLSAgICAgICAgaWYgKCFwZW5kaW5nU2NyaXB0cy5pc0VtcHR5KCkpIHsKLSAgICAg ICAgICAgIGlmIChjdXJyZW50UHJlcGVuZGluZ1NyYykgeworICAgICAgICBpZiAoIW1fcGVuZGlu Z1NjcmlwdHMuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBpZiAoY3VycmVudFByZXBlbmRpbmdT cmMpCiAgICAgICAgICAgICAgICAgY3VycmVudFByZXBlbmRpbmdTcmMtPmFwcGVuZChwcmVwZW5k aW5nU3JjKTsKLSAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBlbHNlCiAgICAgICAg ICAgICAgICAgcGVuZGluZ1NyYy5wcmVwZW5kKHByZXBlbmRpbmdTcmMpOwotICAgICAgICAgICAg fQogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgbV9zdGF0ZSA9IHN0YXRlOwogICAgICAg ICAgICAgd3JpdGUocHJlcGVuZGluZ1NyYywgZmFsc2UpOwpAQCAtNTI4LDcgKzUyNyw3IEBAIEhU TUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnNjcmlwdEhhbmRsZXIoU3RhdGUgc3Rh dGUpCiAgICAgfQogICAgIAogI2lmIFBSRUxPQURfU0NBTk5FUl9FTkFCTEVECi0gICAgaWYgKCFw ZW5kaW5nU2NyaXB0cy5pc0VtcHR5KCkgJiYgIW1fZXhlY3V0aW5nU2NyaXB0KSB7CisgICAgaWYg KCFtX3BlbmRpbmdTY3JpcHRzLmlzRW1wdHkoKSAmJiAhbV9leGVjdXRpbmdTY3JpcHQpIHsKICAg ICAgICAgaWYgKCFtX3ByZWxvYWRTY2FubmVyKQogICAgICAgICAgICAgbV9wcmVsb2FkU2Nhbm5l ci5zZXQobmV3IFByZWxvYWRTY2FubmVyKG1fZG9jKSk7CiAgICAgICAgIGlmICghbV9wcmVsb2Fk U2Nhbm5lci0+aW5Qcm9ncmVzcygpKSB7CkBAIC01ODMsNyArNTgyLDcgQEAgSFRNTFRva2VuaXpl cjo6U3RhdGUgSFRNTFRva2VuaXplcjo6c2NyaXB0RXhlY3V0aW9uKGNvbnN0IFN0cmluZyYgc3Ry LCBTdGF0ZSBzdGEKICAgICAgICAgLy8gd2UgbmVlZCB0byBkbyB0aGlzIHNsaWdodGx5IG1vZGlm aWVkIGJpdCBvZiBvbmUgb2YgdGhlIHdyaXRlKCkgY2FzZXMKICAgICAgICAgLy8gYmVjYXVzZSB3 ZSB3YW50IHRvIHByZXBlbmQgdG8gcGVuZGluZ1NyYyByYXRoZXIgdGhhbiBhcHBlbmRpbmcKICAg ICAgICAgLy8gaWYgdGhlcmUncyBubyBwcmV2aW91cyBwcmVwZW5kaW5nU3JjCi0gICAgICAgIGlm ICghcGVuZGluZ1NjcmlwdHMuaXNFbXB0eSgpKSB7CisgICAgICAgIGlmICghbV9wZW5kaW5nU2Ny aXB0cy5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIGlmIChjdXJyZW50UHJlcGVuZGluZ1NyYykK ICAgICAgICAgICAgICAgICBjdXJyZW50UHJlcGVuZGluZ1NyYy0+YXBwZW5kKHByZXBlbmRpbmdT cmMpOwogICAgICAgICAgICAgZWxzZQpAQCAtMTYyNSw3ICsxNjI0LDcgQEAgYm9vbCBIVE1MVG9r ZW5pemVyOjp3cml0ZShjb25zdCBTZWdtZW50ZWRTdHJpbmcmIHN0ciwgYm9vbCBhcHBlbmREYXRh KQogICAgIGlmIChtX2V4ZWN1dGluZ1NjcmlwdCkKICAgICAgICAgc291cmNlLnNldEV4Y2x1ZGVM aW5lTnVtYmVycygpOwogCi0gICAgaWYgKChtX2V4ZWN1dGluZ1NjcmlwdCAmJiBhcHBlbmREYXRh KSB8fCAhcGVuZGluZ1NjcmlwdHMuaXNFbXB0eSgpKSB7CisgICAgaWYgKChtX2V4ZWN1dGluZ1Nj cmlwdCAmJiBhcHBlbmREYXRhKSB8fCAhbV9wZW5kaW5nU2NyaXB0cy5pc0VtcHR5KCkpIHsKICAg ICAgICAgLy8gZG9uJ3QgcGFyc2U7IHdlIHdpbGwgZG8gdGhpcyBsYXRlcgogICAgICAgICBpZiAo Y3VycmVudFByZXBlbmRpbmdTcmMpCiAgICAgICAgICAgICBjdXJyZW50UHJlcGVuZGluZ1NyYy0+ YXBwZW5kKHNvdXJjZSk7CkBAIC0xOTc1LDcgKzE5NzQsNyBAQCB2b2lkIEhUTUxUb2tlbml6ZXI6 Om5vdGlmeUZpbmlzaGVkKENhY2hlZFJlc291cmNlKikKICAgICAgICAgcHJpbnRmKCJzY3JpcHQg bG9hZGVkIGF0ICVkXG4iLCBtX2RvYy0+ZWxhcHNlZFRpbWUoKSk7CiAjZW5kaWYKIAotICAgIEFT U0VSVCghcGVuZGluZ1NjcmlwdHMuaXNFbXB0eSgpKTsKKyAgICBBU1NFUlQoIW1fcGVuZGluZ1Nj cmlwdHMuaXNFbXB0eSgpKTsKIAogICAgIC8vIE1ha2UgZXh0ZXJuYWwgc2NyaXB0cyB3YWl0IGZv ciBleHRlcm5hbCBzdHlsZXNoZWV0cy4KICAgICAvLyBGSVhNRTogVGhpcyBuZWVkcyB0byBiZSBk b25lIGZvciBpbmxpbmUgc2NyaXB0cyB0b28uCkBAIC0xOTg0LDkgKzE5ODMsOSBAQCB2b2lkIEhU TUxUb2tlbml6ZXI6Om5vdGlmeUZpbmlzaGVkKENhY2hlZFJlc291cmNlKikKICAgICAgICAgcmV0 dXJuOwogCiAgICAgYm9vbCBmaW5pc2hlZCA9IGZhbHNlOwotICAgIHdoaWxlICghZmluaXNoZWQg JiYgcGVuZGluZ1NjcmlwdHMuZmlyc3QoKS0+aXNMb2FkZWQoKSkgewotICAgICAgICBDYWNoZWRT Y3JpcHQgKmNzID0gcGVuZGluZ1NjcmlwdHMuZmlyc3QoKS5nZXQoKTsKLSAgICAgICAgcGVuZGlu Z1NjcmlwdHMucmVtb3ZlRmlyc3QoKTsKKyAgICB3aGlsZSAoIWZpbmlzaGVkICYmIG1fcGVuZGlu Z1NjcmlwdHMuZmlyc3QoKS0+aXNMb2FkZWQoKSkgeworICAgICAgICBDYWNoZWRTY3JpcHQqIGNz ID0gbV9wZW5kaW5nU2NyaXB0cy5maXJzdCgpLmdldCgpOworICAgICAgICBtX3BlbmRpbmdTY3Jp cHRzLnJlbW92ZUZpcnN0KCk7CiAgICAgICAgIEFTU0VSVChjYWNoZSgpLT5kaXNhYmxlZCgpIHx8 IGNzLT5hY2Nlc3NDb3VudCgpID4gMCk7CiAKICAgICAgICAgU3RyaW5nIHNjcmlwdFNvdXJjZSA9 IGNzLT5zY3JpcHQoKTsKQEAgLTIwMTIsOSArMjAxMSw5IEBAIHZvaWQgSFRNTFRva2VuaXplcjo6 bm90aWZ5RmluaXNoZWQoQ2FjaGVkUmVzb3VyY2UqKQogICAgICAgICAgICAgRXZlbnRUYXJnZXRO b2RlQ2FzdChuLmdldCgpKS0+ZGlzcGF0Y2hFdmVudEZvclR5cGUoZXZlbnROYW1lcygpLmxvYWRF dmVudCwgZmFsc2UsIGZhbHNlKTsKICAgICAgICAgfQogCi0gICAgICAgIC8vIFRoZSBzdGF0ZSBv ZiBwZW5kaW5nU2NyaXB0cy5pc0VtcHR5KCkgY2FuIGNoYW5nZSBpbnNpZGUgdGhlIHNjcmlwdEV4 ZWN1dGlvbigpCisgICAgICAgIC8vIFRoZSBzdGF0ZSBvZiBtX3BlbmRpbmdTY3JpcHRzLmlzRW1w dHkoKSBjYW4gY2hhbmdlIGluc2lkZSB0aGUgc2NyaXB0RXhlY3V0aW9uKCkKICAgICAgICAgLy8g Y2FsbCBhYm92ZSwgc28gdGVzdCBhZnRlcndhcmRzLgotICAgICAgICBmaW5pc2hlZCA9IHBlbmRp bmdTY3JpcHRzLmlzRW1wdHkoKTsKKyAgICAgICAgZmluaXNoZWQgPSBtX3BlbmRpbmdTY3JpcHRz LmlzRW1wdHkoKTsKICAgICAgICAgaWYgKGZpbmlzaGVkKSB7CiAgICAgICAgICAgICBtX3N0YXRl LnNldExvYWRpbmdFeHRTY3JpcHQoZmFsc2UpOwogI2lmZGVmIElOU1RSVU1FTlRfTEFZT1VUX1ND SEVEVUxJTkcKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmggYi9XZWJD b3JlL2h0bWwvSFRNTFRva2VuaXplci5oCmluZGV4IDBkMTc1ZGIuLjliYjk2NjkgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxU b2tlbml6ZXIuaApAQCAtMzc0LDcgKzM3NCw3IEBAIHByaXZhdGU6CiAgICAgLy8gdHJ1ZSBpZiB3 ZSBhcmUgZXhlY3V0aW5nIGEgc2NyaXB0IHdoaWxlIHBhcnNpbmcgYSBkb2N1bWVudC4gVGhpcyBj YXVzZXMgdGhlIHBhcnNpbmcgb2YKICAgICAvLyB0aGUgb3V0cHV0IG9mIHRoZSBzY3JpcHQgdG8g YmUgcG9zdHBvbmVkIHVudGlsIGFmdGVyIHRoZSBzY3JpcHQgaGFzIGZpbmlzaGVkIGV4ZWN1dGlu ZwogICAgIGludCBtX2V4ZWN1dGluZ1NjcmlwdDsKLSAgICBEZXF1ZTxDYWNoZWRSZXNvdXJjZUhh bmRsZTxDYWNoZWRTY3JpcHQ+ID4gcGVuZGluZ1NjcmlwdHM7CisgICAgRGVxdWU8Q2FjaGVkUmVz b3VyY2VIYW5kbGU8Q2FjaGVkU2NyaXB0PiA+IG1fcGVuZGluZ1NjcmlwdHM7CiAgICAgUmVmUHRy PE5vZGU+IHNjcmlwdE5vZGU7CiAKICAgICBib29sIG1fcmVxdWVzdGluZ1NjcmlwdDsK 25057 2008-11-11 15:17:29 -0800 2008-11-11 15:37:01 -0800 Rename scriptNode to m_scriptNode make the type specific Rename-scriptNode-to-m_scriptNode-make-the-type-specific.patch text/plain 3157 eric NDg0MWY5MjA5MmEyZDJiOGJkNjQ5ZDgzNGM3ZmJjNTY5MTAwZTYzOQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu Y3BwCmluZGV4IGZmMWM3OTcuLjNkMDA1MTMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTQz Niw5ICs0MzYsOSBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpzY3JpcHRI YW5kbGVyKFN0YXRlIHN0YXRlKQogICAgICAgICAgICAgICAgIGlmICghbV9wYXJzZXJTdG9wcGVk ICYmIChjcyA9IG1fZG9jLT5kb2NMb2FkZXIoKS0+cmVxdWVzdFNjcmlwdChzY3JpcHRTcmMsIHNj cmlwdFNyY0NoYXJzZXQpKSkKICAgICAgICAgICAgICAgICAgICAgbV9wZW5kaW5nU2NyaXB0cy5h cHBlbmQoY3MpOwogICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgc2Ny aXB0Tm9kZSA9IDA7CisgICAgICAgICAgICAgICAgICAgIG1fc2NyaXB0Tm9kZSA9IDA7CiAgICAg ICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICAgICBzY3JpcHROb2RlID0gMDsKKyAgICAgICAg ICAgICAgICBtX3NjcmlwdE5vZGUgPSAwOwogICAgICAgICAgICAgc2NyaXB0U3JjID0gU3RyaW5n KCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAvLyBQYXJzZSBzY3JpcHRDb2RlIGNv bnRhaW5pbmcgPHNjcmlwdD4gaW5mbwpAQCAtNDUxLDggKzQ1MSw4IEBAIEhUTUxUb2tlbml6ZXI6 OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnNjcmlwdEhhbmRsZXIoU3RhdGUgc3RhdGUpCiAgICAgICAg ICAgICAgICAgZG9TY3JpcHRFeGVjID0gZmFsc2U7CiAgICAgICAgICAgICB9IGVsc2UKICNlbmRp ZgotICAgICAgICAgICAgZG9TY3JpcHRFeGVjID0gc3RhdGljX2Nhc3Q8SFRNTFNjcmlwdEVsZW1l bnQqPihzY3JpcHROb2RlLmdldCgpKS0+c2hvdWxkRXhlY3V0ZUFzSmF2YVNjcmlwdCgpOwotICAg ICAgICAgICAgc2NyaXB0Tm9kZSA9IDA7CisgICAgICAgICAgICBkb1NjcmlwdEV4ZWMgPSBtX3Nj cmlwdE5vZGUtPnNob3VsZEV4ZWN1dGVBc0phdmFTY3JpcHQoKTsKKyAgICAgICAgICAgIG1fc2Ny aXB0Tm9kZSA9IDA7CiAgICAgICAgIH0KICAgICB9CiAKQEAgLTE1MDQsMTAgKzE1MDQsMTAgQEAg SFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6cGFyc2VUYWcoU2VnbWVudGVkU3Ry aW5nICZzcmMsIFN0YXRlIHN0YXRlKQogICAgICAgICAgICAgICAgICAgICBpZiAoYmVnaW5UYWcp CiAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0ZS5zZXREaXNjYXJkTEYodHJ1ZSk7IC8vIERp c2NhcmQgdGhlIGZpcnN0IExGIGFmdGVyIHdlIG9wZW4gYSBwcmUuCiAgICAgICAgICAgICAgICAg fSBlbHNlIGlmICh0YWdOYW1lID09IHNjcmlwdFRhZykgewotICAgICAgICAgICAgICAgICAgICBB U1NFUlQoIXNjcmlwdE5vZGUpOwotICAgICAgICAgICAgICAgICAgICBzY3JpcHROb2RlID0gbjsK LSAgICAgICAgICAgICAgICAgICAgaWYgKG4pCi0gICAgICAgICAgICAgICAgICAgICAgICBzY3Jp cHRTcmNDaGFyc2V0ID0gc3RhdGljX2Nhc3Q8SFRNTFNjcmlwdEVsZW1lbnQqPihuLmdldCgpKS0+ c2NyaXB0Q2hhcnNldCgpOworICAgICAgICAgICAgICAgICAgICBBU1NFUlQoIW1fc2NyaXB0Tm9k ZSk7CisgICAgICAgICAgICAgICAgICAgIG1fc2NyaXB0Tm9kZSA9IHN0YXRpY19wb2ludGVyX2Nh c3Q8SFRNTFNjcmlwdEVsZW1lbnQ+KG4pOworICAgICAgICAgICAgICAgICAgICBpZiAobV9zY3Jp cHROb2RlKQorICAgICAgICAgICAgICAgICAgICAgICAgc2NyaXB0U3JjQ2hhcnNldCA9IG1fc2Ny aXB0Tm9kZS0+c2NyaXB0Q2hhcnNldCgpOwogICAgICAgICAgICAgICAgICAgICBpZiAoYmVnaW5U YWcpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHNlYXJjaFN0b3BwZXIgPSBzY3JpcHRFbmQ7 CiAgICAgICAgICAgICAgICAgICAgICAgICBzZWFyY2hTdG9wcGVyTGVuID0gODsKQEAgLTE5OTYs NyArMTk5Niw3IEBAIHZvaWQgSFRNTFRva2VuaXplcjo6bm90aWZ5RmluaXNoZWQoQ2FjaGVkUmVz b3VyY2UqKQogICAgICAgICBTdHJpbmcgY2FjaGVkU2NyaXB0VXJsKGNzLT51cmwoKSk7CiAgICAg ICAgIGJvb2wgZXJyb3JPY2N1cnJlZCA9IGNzLT5lcnJvck9jY3VycmVkKCk7CiAgICAgICAgIGNz LT5yZW1vdmVDbGllbnQodGhpcyk7Ci0gICAgICAgIFJlZlB0cjxOb2RlPiBuID0gc2NyaXB0Tm9k ZS5yZWxlYXNlKCk7CisgICAgICAgIFJlZlB0cjxOb2RlPiBuID0gbV9zY3JpcHROb2RlLnJlbGVh c2UoKTsKIAogI2lmZGVmIElOU1RSVU1FTlRfTEFZT1VUX1NDSEVEVUxJTkcKICAgICAgICAgaWYg KCFtX2RvYy0+b3duZXJFbGVtZW50KCkpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTFRv a2VuaXplci5oIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuaAppbmRleCA5YmI5NjY5Li4y N2ExYjk1IDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5oCisrKyBiL1dl YkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmgKQEAgLTQwLDYgKzQwLDcgQEAgY2xhc3MgQ2FjaGVk U2NyaXB0OwogY2xhc3MgRG9jdW1lbnRGcmFnbWVudDsKIGNsYXNzIERvY3VtZW50OwogY2xhc3Mg SFRNTERvY3VtZW50OworY2xhc3MgSFRNTFNjcmlwdEVsZW1lbnQ7CiBjbGFzcyBIVE1MVmlld1Nv dXJjZURvY3VtZW50OwogY2xhc3MgRnJhbWVWaWV3OwogY2xhc3MgSFRNTFBhcnNlcjsKQEAgLTM3 NSw3ICszNzYsNyBAQCBwcml2YXRlOgogICAgIC8vIHRoZSBvdXRwdXQgb2YgdGhlIHNjcmlwdCB0 byBiZSBwb3N0cG9uZWQgdW50aWwgYWZ0ZXIgdGhlIHNjcmlwdCBoYXMgZmluaXNoZWQgZXhlY3V0 aW5nCiAgICAgaW50IG1fZXhlY3V0aW5nU2NyaXB0OwogICAgIERlcXVlPENhY2hlZFJlc291cmNl SGFuZGxlPENhY2hlZFNjcmlwdD4gPiBtX3BlbmRpbmdTY3JpcHRzOwotICAgIFJlZlB0cjxOb2Rl PiBzY3JpcHROb2RlOworICAgIFJlZlB0cjxIVE1MU2NyaXB0RWxlbWVudD4gbV9zY3JpcHROb2Rl OwogCiAgICAgYm9vbCBtX3JlcXVlc3RpbmdTY3JpcHQ7CiAgICAgYm9vbCBtX2hhc1NjcmlwdHNX YWl0aW5nRm9yU3R5bGVzaGVldHM7Cg== 25058 2008-11-11 15:17:31 -0800 2008-11-11 15:37:24 -0800 Rename pendingSrc to m_pendingSrc Rename-pendingSrc-to-m_pendingSrc.patch text/plain 5712 eric OGRmYzhmNTg1MmZhYjY0ODBkOGUwZmZlOGNjZDNkNzJmY2Y3MDYzYgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu Y3BwCmluZGV4IDNkMDA1MTMuLmFlZGQ0OWQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTI0 Nyw3ICsyNDcsNyBAQCB2b2lkIEhUTUxUb2tlbml6ZXI6OmJlZ2luKCkKICAgICBzZWFyY2hDb3Vu dCA9IDA7CiAgICAgbV9zdGF0ZS5zZXRFbnRpdHlTdGF0ZShOb0VudGl0eSk7CiAgICAgc2NyaXB0 U3JjID0gU3RyaW5nKCk7Ci0gICAgcGVuZGluZ1NyYy5jbGVhcigpOworICAgIG1fcGVuZGluZ1Ny Yy5jbGVhcigpOwogICAgIGN1cnJlbnRQcmVwZW5kaW5nU3JjID0gMDsKICAgICBub01vcmVEYXRh ID0gZmFsc2U7CiAgICAgYnJva2VuQ29tbWVudHMgPSBmYWxzZTsKQEAgLTQ3OSw3ICs0NzksNyBA QCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpzY3JpcHRIYW5kbGVyKFN0YXRl IHN0YXRlKQogICAgICAgICAgICAgaWYgKHNhdmVkUHJlcGVuZGluZ1NyYykKICAgICAgICAgICAg ICAgICBzYXZlZFByZXBlbmRpbmdTcmMtPmFwcGVuZChzcmMpOwogICAgICAgICAgICAgZWxzZQot ICAgICAgICAgICAgICAgIHBlbmRpbmdTcmMucHJlcGVuZChzcmMpOworICAgICAgICAgICAgICAg IG1fcGVuZGluZ1NyYy5wcmVwZW5kKHNyYyk7CiAgICAgICAgICAgICBzZXRTcmMoU2VnbWVudGVk U3RyaW5nKCkpOwogCiAgICAgICAgICAgICAvLyB0aGUgcmVmKCkgY2FsbCBiZWxvdyBtYXkgY2Fs bCBub3RpZnlGaW5pc2hlZCBpZiB0aGUgc2NyaXB0IGlzIGFscmVhZHkgaW4gY2FjaGUsCkBAIC00 OTUsNyArNDk1LDcgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6c2NyaXB0 SGFuZGxlcihTdGF0ZSBzdGF0ZSkKICAgICAgICAgICAgICAgICBzdGF0ZS5zZXRMb2FkaW5nRXh0 U2NyaXB0KHRydWUpOwogICAgICAgICB9IGVsc2UgaWYgKCFtX2ZyYWdtZW50ICYmIGRvU2NyaXB0 RXhlYykgewogICAgICAgICAgICAgaWYgKCFtX2V4ZWN1dGluZ1NjcmlwdCkKLSAgICAgICAgICAg ICAgICBwZW5kaW5nU3JjLnByZXBlbmQoc3JjKTsKKyAgICAgICAgICAgICAgICBtX3BlbmRpbmdT cmMucHJlcGVuZChzcmMpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIHByZXBl bmRpbmdTcmMgPSBzcmM7CiAgICAgICAgICAgICBzZXRTcmMoU2VnbWVudGVkU3RyaW5nKCkpOwpA QCAtNTA0LDIxICs1MDQsMjEgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6 c2NyaXB0SGFuZGxlcihTdGF0ZSBzdGF0ZSkKICAgICB9CiAKICAgICBpZiAoIW1fZXhlY3V0aW5n U2NyaXB0ICYmICFzdGF0ZS5sb2FkaW5nRXh0U2NyaXB0KCkpIHsKLSAgICAgICAgc3JjLmFwcGVu ZChwZW5kaW5nU3JjKTsKLSAgICAgICAgcGVuZGluZ1NyYy5jbGVhcigpOworICAgICAgICBzcmMu YXBwZW5kKG1fcGVuZGluZ1NyYyk7CisgICAgICAgIG1fcGVuZGluZ1NyYy5jbGVhcigpOwogICAg IH0gZWxzZSBpZiAoIXByZXBlbmRpbmdTcmMuaXNFbXB0eSgpKSB7CiAgICAgICAgIC8vIHJlc3Rv cmUgZmlyc3Qgc28gdGhhdCB0aGUgd3JpdGUgYXBwZW5kcyBpbiB0aGUgcmlnaHQgcGxhY2UKICAg ICAgICAgLy8gKGRvZXMgbm90IGh1cnQgdG8gZG8gaXQgYWdhaW4gYmVsb3cpCiAgICAgICAgIGN1 cnJlbnRQcmVwZW5kaW5nU3JjID0gc2F2ZWRQcmVwZW5kaW5nU3JjOwogCiAgICAgICAgIC8vIHdl IG5lZWQgdG8gZG8gdGhpcyBzbGlnaHRseSBtb2RpZmllZCBiaXQgb2Ygb25lIG9mIHRoZSB3cml0 ZSgpIGNhc2VzCi0gICAgICAgIC8vIGJlY2F1c2Ugd2Ugd2FudCB0byBwcmVwZW5kIHRvIHBlbmRp bmdTcmMgcmF0aGVyIHRoYW4gYXBwZW5kaW5nCisgICAgICAgIC8vIGJlY2F1c2Ugd2Ugd2FudCB0 byBwcmVwZW5kIHRvIG1fcGVuZGluZ1NyYyByYXRoZXIgdGhhbiBhcHBlbmRpbmcKICAgICAgICAg Ly8gaWYgdGhlcmUncyBubyBwcmV2aW91cyBwcmVwZW5kaW5nU3JjCiAgICAgICAgIGlmICghbV9w ZW5kaW5nU2NyaXB0cy5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIGlmIChjdXJyZW50UHJlcGVu ZGluZ1NyYykKICAgICAgICAgICAgICAgICBjdXJyZW50UHJlcGVuZGluZ1NyYy0+YXBwZW5kKHBy ZXBlbmRpbmdTcmMpOwogICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIHBlbmRpbmdT cmMucHJlcGVuZChwcmVwZW5kaW5nU3JjKTsKKyAgICAgICAgICAgICAgICBtX3BlbmRpbmdTcmMu cHJlcGVuZChwcmVwZW5kaW5nU3JjKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIG1f c3RhdGUgPSBzdGF0ZTsKICAgICAgICAgICAgIHdyaXRlKHByZXBlbmRpbmdTcmMsIGZhbHNlKTsK QEAgLTUzMiw3ICs1MzIsNyBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpz Y3JpcHRIYW5kbGVyKFN0YXRlIHN0YXRlKQogICAgICAgICAgICAgbV9wcmVsb2FkU2Nhbm5lci5z ZXQobmV3IFByZWxvYWRTY2FubmVyKG1fZG9jKSk7CiAgICAgICAgIGlmICghbV9wcmVsb2FkU2Nh bm5lci0+aW5Qcm9ncmVzcygpKSB7CiAgICAgICAgICAgICBtX3ByZWxvYWRTY2FubmVyLT5iZWdp bigpOwotICAgICAgICAgICAgbV9wcmVsb2FkU2Nhbm5lci0+d3JpdGUocGVuZGluZ1NyYyk7Cisg ICAgICAgICAgICBtX3ByZWxvYWRTY2FubmVyLT53cml0ZShtX3BlbmRpbmdTcmMpOwogICAgICAg ICB9CiAgICAgfQogI2VuZGlmCkBAIC01NzEsMjIgKzU3MSwyMiBAQCBIVE1MVG9rZW5pemVyOjpT dGF0ZSBIVE1MVG9rZW5pemVyOjpzY3JpcHRFeGVjdXRpb24oY29uc3QgU3RyaW5nJiBzdHIsIFN0 YXRlIHN0YQogICAgIG1fZXhlY3V0aW5nU2NyaXB0LS07CiAKICAgICBpZiAoIW1fZXhlY3V0aW5n U2NyaXB0ICYmICFzdGF0ZS5sb2FkaW5nRXh0U2NyaXB0KCkpIHsKLSAgICAgICAgcGVuZGluZ1Ny Yy5wcmVwZW5kKHByZXBlbmRpbmdTcmMpOyAgICAgICAgCi0gICAgICAgIHNyYy5hcHBlbmQocGVu ZGluZ1NyYyk7Ci0gICAgICAgIHBlbmRpbmdTcmMuY2xlYXIoKTsKKyAgICAgICAgbV9wZW5kaW5n U3JjLnByZXBlbmQocHJlcGVuZGluZ1NyYyk7ICAgICAgICAKKyAgICAgICAgc3JjLmFwcGVuZCht X3BlbmRpbmdTcmMpOworICAgICAgICBtX3BlbmRpbmdTcmMuY2xlYXIoKTsKICAgICB9IGVsc2Ug aWYgKCFwcmVwZW5kaW5nU3JjLmlzRW1wdHkoKSkgewogICAgICAgICAvLyByZXN0b3JlIGZpcnN0 IHNvIHRoYXQgdGhlIHdyaXRlIGFwcGVuZHMgaW4gdGhlIHJpZ2h0IHBsYWNlCiAgICAgICAgIC8v IChkb2VzIG5vdCBodXJ0IHRvIGRvIGl0IGFnYWluIGJlbG93KQogICAgICAgICBjdXJyZW50UHJl cGVuZGluZ1NyYyA9IHNhdmVkUHJlcGVuZGluZ1NyYzsKIAogICAgICAgICAvLyB3ZSBuZWVkIHRv IGRvIHRoaXMgc2xpZ2h0bHkgbW9kaWZpZWQgYml0IG9mIG9uZSBvZiB0aGUgd3JpdGUoKSBjYXNl cwotICAgICAgICAvLyBiZWNhdXNlIHdlIHdhbnQgdG8gcHJlcGVuZCB0byBwZW5kaW5nU3JjIHJh dGhlciB0aGFuIGFwcGVuZGluZworICAgICAgICAvLyBiZWNhdXNlIHdlIHdhbnQgdG8gcHJlcGVu ZCB0byBtX3BlbmRpbmdTcmMgcmF0aGVyIHRoYW4gYXBwZW5kaW5nCiAgICAgICAgIC8vIGlmIHRo ZXJlJ3Mgbm8gcHJldmlvdXMgcHJlcGVuZGluZ1NyYwogICAgICAgICBpZiAoIW1fcGVuZGluZ1Nj cmlwdHMuaXNFbXB0eSgpKSB7CiAgICAgICAgICAgICBpZiAoY3VycmVudFByZXBlbmRpbmdTcmMp CiAgICAgICAgICAgICAgICAgY3VycmVudFByZXBlbmRpbmdTcmMtPmFwcGVuZChwcmVwZW5kaW5n U3JjKTsKICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBwZW5kaW5nU3JjLnByZXBl bmQocHJlcGVuZGluZ1NyYyk7CisgICAgICAgICAgICAgICAgbV9wZW5kaW5nU3JjLnByZXBlbmQo cHJlcGVuZGluZ1NyYyk7CiAgICAgICAgICAgICAKICNpZiBQUkVMT0FEX1NDQU5ORVJfRU5BQkxF RAogICAgICAgICAgICAgLy8gV2UgYXJlIHN0dWNrIHdhaXRpbmcgZm9yIGFub3RoZXIgc2NyaXB0 LiBMZXRzIGNoZWNrIHRoZSBzb3VyY2UgdGhhdApAQCAtMTYyOSw3ICsxNjI5LDcgQEAgYm9vbCBI VE1MVG9rZW5pemVyOjp3cml0ZShjb25zdCBTZWdtZW50ZWRTdHJpbmcmIHN0ciwgYm9vbCBhcHBl bmREYXRhKQogICAgICAgICBpZiAoY3VycmVudFByZXBlbmRpbmdTcmMpCiAgICAgICAgICAgICBj dXJyZW50UHJlcGVuZGluZ1NyYy0+YXBwZW5kKHNvdXJjZSk7CiAgICAgICAgIGVsc2UgewotICAg ICAgICAgICAgcGVuZGluZ1NyYy5hcHBlbmQoc291cmNlKTsKKyAgICAgICAgICAgIG1fcGVuZGlu Z1NyYy5hcHBlbmQoc291cmNlKTsKICNpZiBQUkVMT0FEX1NDQU5ORVJfRU5BQkxFRAogICAgICAg ICAgICAgaWYgKG1fcHJlbG9hZFNjYW5uZXIgJiYgbV9wcmVsb2FkU2Nhbm5lci0+aW5Qcm9ncmVz cygpICYmIGFwcGVuZERhdGEpCiAgICAgICAgICAgICAgICAgbV9wcmVsb2FkU2Nhbm5lci0+d3Jp dGUoc291cmNlKTsKQEAgLTIwMjQsMTAgKzIwMjQsMTAgQEAgdm9pZCBIVE1MVG9rZW5pemVyOjpu b3RpZnlGaW5pc2hlZChDYWNoZWRSZXNvdXJjZSopCiAKICAgICAgICAgLy8gJ21fcmVxdWVzdGlu Z1NjcmlwdCcgaXMgdHJ1ZSB3aGVuIHdlIGFyZSBjYWxsZWQgc3luY2hyb25vdXNseSBmcm9tCiAg ICAgICAgIC8vIHNjcmlwdEhhbmRsZXIoKS4gSW4gdGhhdCBjYXNlIHNjcmlwdEhhbmRsZXIoKSB3 aWxsIHRha2UgY2FyZQotICAgICAgICAvLyBvZiBwZW5kaW5nU3JjLgorICAgICAgICAvLyBvZiBt X3BlbmRpbmdTcmMuCiAgICAgICAgIGlmICghbV9yZXF1ZXN0aW5nU2NyaXB0KSB7Ci0gICAgICAg ICAgICBTZWdtZW50ZWRTdHJpbmcgcmVzdCA9IHBlbmRpbmdTcmM7Ci0gICAgICAgICAgICBwZW5k aW5nU3JjLmNsZWFyKCk7CisgICAgICAgICAgICBTZWdtZW50ZWRTdHJpbmcgcmVzdCA9IG1fcGVu ZGluZ1NyYzsKKyAgICAgICAgICAgIG1fcGVuZGluZ1NyYy5jbGVhcigpOwogICAgICAgICAgICAg d3JpdGUocmVzdCwgZmFsc2UpOwogICAgICAgICAgICAgLy8gd2UgbWlnaHQgYmUgZGVsZXRlZCBh dCB0aGlzIHBvaW50LCBkbyBub3QgYWNjZXNzIGFueSBtZW1iZXJzLgogICAgICAgICB9CmRpZmYg LS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5oIGIvV2ViQ29yZS9odG1sL0hUTUxU b2tlbml6ZXIuaAppbmRleCAyN2ExYjk1Li4xMzJiNjcyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0 bWwvSFRNTFRva2VuaXplci5oCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmgKQEAg LTM2Niw3ICszNjYsNyBAQCBwcml2YXRlOgogICAgIFN0cmluZyBzY3JpcHRTcmM7CiAgICAgU3Ry aW5nIHNjcmlwdFNyY0NoYXJzZXQ7CiAgICAgLy8gdGhlIEhUTUwgY29kZSB3ZSB3aWxsIHBhcnNl IGFmdGVyIHRoZSBleHRlcm5hbCBzY3JpcHQgd2UgYXJlIHdhaXRpbmcgZm9yIGhhcyBsb2FkZWQK LSAgICBTZWdtZW50ZWRTdHJpbmcgcGVuZGluZ1NyYzsKKyAgICBTZWdtZW50ZWRTdHJpbmcgbV9w ZW5kaW5nU3JjOwogCiAgICAgLy8gdGhlIEhUTUwgY29kZSB3ZSB3aWxsIHBhcnNlIGFmdGVyIHRo aXMgcGFydGljdWxhciBzY3JpcHQgaGFzCiAgICAgLy8gbG9hZGVkLCBidXQgYmVmb3JlIGFsbCBw ZW5kaW5nIEhUTUwK 25059 2008-11-11 15:17:37 -0800 2008-11-11 15:38:57 -0800 Rename currentPrependingSrc to m_currentPrependingSrc Rename-currentPrependingSrc-to-m_currentPrependingSrc.patch text/plain 4909 eric OTk0OGI0OGZmMTUyMDUyMzFlZjIxMDllZmNmZTBmNmEyNjhjZTNjZApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu Y3BwCmluZGV4IGFlZGQ0OWQuLjlkNmQzMzMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTI0 OCw3ICsyNDgsNyBAQCB2b2lkIEhUTUxUb2tlbml6ZXI6OmJlZ2luKCkKICAgICBtX3N0YXRlLnNl dEVudGl0eVN0YXRlKE5vRW50aXR5KTsKICAgICBzY3JpcHRTcmMgPSBTdHJpbmcoKTsKICAgICBt X3BlbmRpbmdTcmMuY2xlYXIoKTsKLSAgICBjdXJyZW50UHJlcGVuZGluZ1NyYyA9IDA7CisgICAg bV9jdXJyZW50UHJlcGVuZGluZ1NyYyA9IDA7CiAgICAgbm9Nb3JlRGF0YSA9IGZhbHNlOwogICAg IGJyb2tlbkNvbW1lbnRzID0gZmFsc2U7CiAgICAgYnJva2VuU2VydmVyID0gZmFsc2U7CkBAIC00 NzAsOSArNDcwLDkgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6c2NyaXB0 SGFuZGxlcihTdGF0ZSBzdGF0ZSkKICAgICBpZiAoaW5WaWV3U291cmNlTW9kZSgpKQogICAgICAg ICByZXR1cm4gc3RhdGU7CiAKLSAgICBTZWdtZW50ZWRTdHJpbmcgKnNhdmVkUHJlcGVuZGluZ1Ny YyA9IGN1cnJlbnRQcmVwZW5kaW5nU3JjOworICAgIFNlZ21lbnRlZFN0cmluZyogc2F2ZWRQcmVw ZW5kaW5nU3JjID0gbV9jdXJyZW50UHJlcGVuZGluZ1NyYzsKICAgICBTZWdtZW50ZWRTdHJpbmcg cHJlcGVuZGluZ1NyYzsKLSAgICBjdXJyZW50UHJlcGVuZGluZ1NyYyA9ICZwcmVwZW5kaW5nU3Jj OworICAgIG1fY3VycmVudFByZXBlbmRpbmdTcmMgPSAmcHJlcGVuZGluZ1NyYzsKIAogICAgIGlm ICghcGFyc2VyLT5za2lwTW9kZSgpICYmICFmb2xsb3dpbmdGcmFtZXNldCkgewogICAgICAgICBp ZiAoY3MpIHsKQEAgLTUwOSwxNCArNTA5LDE0IEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxU b2tlbml6ZXI6OnNjcmlwdEhhbmRsZXIoU3RhdGUgc3RhdGUpCiAgICAgfSBlbHNlIGlmICghcHJl cGVuZGluZ1NyYy5pc0VtcHR5KCkpIHsKICAgICAgICAgLy8gcmVzdG9yZSBmaXJzdCBzbyB0aGF0 IHRoZSB3cml0ZSBhcHBlbmRzIGluIHRoZSByaWdodCBwbGFjZQogICAgICAgICAvLyAoZG9lcyBu b3QgaHVydCB0byBkbyBpdCBhZ2FpbiBiZWxvdykKLSAgICAgICAgY3VycmVudFByZXBlbmRpbmdT cmMgPSBzYXZlZFByZXBlbmRpbmdTcmM7CisgICAgICAgIG1fY3VycmVudFByZXBlbmRpbmdTcmMg PSBzYXZlZFByZXBlbmRpbmdTcmM7CiAKICAgICAgICAgLy8gd2UgbmVlZCB0byBkbyB0aGlzIHNs aWdodGx5IG1vZGlmaWVkIGJpdCBvZiBvbmUgb2YgdGhlIHdyaXRlKCkgY2FzZXMKICAgICAgICAg Ly8gYmVjYXVzZSB3ZSB3YW50IHRvIHByZXBlbmQgdG8gbV9wZW5kaW5nU3JjIHJhdGhlciB0aGFu IGFwcGVuZGluZwogICAgICAgICAvLyBpZiB0aGVyZSdzIG5vIHByZXZpb3VzIHByZXBlbmRpbmdT cmMKICAgICAgICAgaWYgKCFtX3BlbmRpbmdTY3JpcHRzLmlzRW1wdHkoKSkgewotICAgICAgICAg ICAgaWYgKGN1cnJlbnRQcmVwZW5kaW5nU3JjKQotICAgICAgICAgICAgICAgIGN1cnJlbnRQcmVw ZW5kaW5nU3JjLT5hcHBlbmQocHJlcGVuZGluZ1NyYyk7CisgICAgICAgICAgICBpZiAobV9jdXJy ZW50UHJlcGVuZGluZ1NyYykKKyAgICAgICAgICAgICAgICBtX2N1cnJlbnRQcmVwZW5kaW5nU3Jj LT5hcHBlbmQocHJlcGVuZGluZ1NyYyk7CiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAg ICAgbV9wZW5kaW5nU3JjLnByZXBlbmQocHJlcGVuZGluZ1NyYyk7CiAgICAgICAgIH0gZWxzZSB7 CkBAIC01MzYsNyArNTM2LDcgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6 c2NyaXB0SGFuZGxlcihTdGF0ZSBzdGF0ZSkKICAgICAgICAgfQogICAgIH0KICNlbmRpZgotICAg IGN1cnJlbnRQcmVwZW5kaW5nU3JjID0gc2F2ZWRQcmVwZW5kaW5nU3JjOworICAgIG1fY3VycmVu dFByZXBlbmRpbmdTcmMgPSBzYXZlZFByZXBlbmRpbmdTcmM7CiAKICAgICByZXR1cm4gc3RhdGU7 CiB9CkBAIC01NDgsOSArNTQ4LDkgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXpl cjo6c2NyaXB0RXhlY3V0aW9uKGNvbnN0IFN0cmluZyYgc3RyLCBTdGF0ZSBzdGEKICAgICBtX2V4 ZWN1dGluZ1NjcmlwdCsrOwogICAgIFN0cmluZyB1cmwgPSBzY3JpcHRVUkwuaXNOdWxsKCkgPyBt X2RvYy0+ZnJhbWUoKS0+ZG9jdW1lbnQoKS0+dXJsKCkuc3RyaW5nKCkgOiBzY3JpcHRVUkw7CiAK LSAgICBTZWdtZW50ZWRTdHJpbmcgKnNhdmVkUHJlcGVuZGluZ1NyYyA9IGN1cnJlbnRQcmVwZW5k aW5nU3JjOworICAgIFNlZ21lbnRlZFN0cmluZyogc2F2ZWRQcmVwZW5kaW5nU3JjID0gbV9jdXJy ZW50UHJlcGVuZGluZ1NyYzsKICAgICBTZWdtZW50ZWRTdHJpbmcgcHJlcGVuZGluZ1NyYzsKLSAg ICBjdXJyZW50UHJlcGVuZGluZ1NyYyA9ICZwcmVwZW5kaW5nU3JjOworICAgIG1fY3VycmVudFBy ZXBlbmRpbmdTcmMgPSAmcHJlcGVuZGluZ1NyYzsKIAogI2lmZGVmIElOU1RSVU1FTlRfTEFZT1VU X1NDSEVEVUxJTkcKICAgICBpZiAoIW1fZG9jLT5vd25lckVsZW1lbnQoKSkKQEAgLTU3NywxNCAr NTc3LDE0IEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnNjcmlwdEV4ZWN1 dGlvbihjb25zdCBTdHJpbmcmIHN0ciwgU3RhdGUgc3RhCiAgICAgfSBlbHNlIGlmICghcHJlcGVu ZGluZ1NyYy5pc0VtcHR5KCkpIHsKICAgICAgICAgLy8gcmVzdG9yZSBmaXJzdCBzbyB0aGF0IHRo ZSB3cml0ZSBhcHBlbmRzIGluIHRoZSByaWdodCBwbGFjZQogICAgICAgICAvLyAoZG9lcyBub3Qg aHVydCB0byBkbyBpdCBhZ2FpbiBiZWxvdykKLSAgICAgICAgY3VycmVudFByZXBlbmRpbmdTcmMg PSBzYXZlZFByZXBlbmRpbmdTcmM7CisgICAgICAgIG1fY3VycmVudFByZXBlbmRpbmdTcmMgPSBz YXZlZFByZXBlbmRpbmdTcmM7CiAKICAgICAgICAgLy8gd2UgbmVlZCB0byBkbyB0aGlzIHNsaWdo dGx5IG1vZGlmaWVkIGJpdCBvZiBvbmUgb2YgdGhlIHdyaXRlKCkgY2FzZXMKICAgICAgICAgLy8g YmVjYXVzZSB3ZSB3YW50IHRvIHByZXBlbmQgdG8gbV9wZW5kaW5nU3JjIHJhdGhlciB0aGFuIGFw cGVuZGluZwogICAgICAgICAvLyBpZiB0aGVyZSdzIG5vIHByZXZpb3VzIHByZXBlbmRpbmdTcmMK ICAgICAgICAgaWYgKCFtX3BlbmRpbmdTY3JpcHRzLmlzRW1wdHkoKSkgewotICAgICAgICAgICAg aWYgKGN1cnJlbnRQcmVwZW5kaW5nU3JjKQotICAgICAgICAgICAgICAgIGN1cnJlbnRQcmVwZW5k aW5nU3JjLT5hcHBlbmQocHJlcGVuZGluZ1NyYyk7CisgICAgICAgICAgICBpZiAobV9jdXJyZW50 UHJlcGVuZGluZ1NyYykKKyAgICAgICAgICAgICAgICBtX2N1cnJlbnRQcmVwZW5kaW5nU3JjLT5h cHBlbmQocHJlcGVuZGluZ1NyYyk7CiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAg bV9wZW5kaW5nU3JjLnByZXBlbmQocHJlcGVuZGluZ1NyYyk7CiAgICAgICAgICAgICAKQEAgLTYw Myw3ICs2MDMsNyBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpzY3JpcHRF eGVjdXRpb24oY29uc3QgU3RyaW5nJiBzdHIsIFN0YXRlIHN0YQogICAgICAgICB9CiAgICAgfQog Ci0gICAgY3VycmVudFByZXBlbmRpbmdTcmMgPSBzYXZlZFByZXBlbmRpbmdTcmM7CisgICAgbV9j dXJyZW50UHJlcGVuZGluZ1NyYyA9IHNhdmVkUHJlcGVuZGluZ1NyYzsKIAogICAgIHJldHVybiBz dGF0ZTsKIH0KQEAgLTE2MjYsOCArMTYyNiw4IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6d3JpdGUo Y29uc3QgU2VnbWVudGVkU3RyaW5nJiBzdHIsIGJvb2wgYXBwZW5kRGF0YSkKIAogICAgIGlmICgo bV9leGVjdXRpbmdTY3JpcHQgJiYgYXBwZW5kRGF0YSkgfHwgIW1fcGVuZGluZ1NjcmlwdHMuaXNF bXB0eSgpKSB7CiAgICAgICAgIC8vIGRvbid0IHBhcnNlOyB3ZSB3aWxsIGRvIHRoaXMgbGF0ZXIK LSAgICAgICAgaWYgKGN1cnJlbnRQcmVwZW5kaW5nU3JjKQotICAgICAgICAgICAgY3VycmVudFBy ZXBlbmRpbmdTcmMtPmFwcGVuZChzb3VyY2UpOworICAgICAgICBpZiAobV9jdXJyZW50UHJlcGVu ZGluZ1NyYykKKyAgICAgICAgICAgIG1fY3VycmVudFByZXBlbmRpbmdTcmMtPmFwcGVuZChzb3Vy Y2UpOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIG1fcGVuZGluZ1NyYy5hcHBlbmQoc291 cmNlKTsKICNpZiBQUkVMT0FEX1NDQU5ORVJfRU5BQkxFRApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9o dG1sL0hUTUxUb2tlbml6ZXIuaCBiL1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmgKaW5kZXgg MTMyYjY3Mi4uNjljZmNlMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu aAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5oCkBAIC0zNzAsNyArMzcwLDcgQEAg cHJpdmF0ZToKIAogICAgIC8vIHRoZSBIVE1MIGNvZGUgd2Ugd2lsbCBwYXJzZSBhZnRlciB0aGlz IHBhcnRpY3VsYXIgc2NyaXB0IGhhcwogICAgIC8vIGxvYWRlZCwgYnV0IGJlZm9yZSBhbGwgcGVu ZGluZyBIVE1MCi0gICAgU2VnbWVudGVkU3RyaW5nICpjdXJyZW50UHJlcGVuZGluZ1NyYzsKKyAg ICBTZWdtZW50ZWRTdHJpbmcqIG1fY3VycmVudFByZXBlbmRpbmdTcmM7CiAKICAgICAvLyB0cnVl IGlmIHdlIGFyZSBleGVjdXRpbmcgYSBzY3JpcHQgd2hpbGUgcGFyc2luZyBhIGRvY3VtZW50LiBU aGlzIGNhdXNlcyB0aGUgcGFyc2luZyBvZgogICAgIC8vIHRoZSBvdXRwdXQgb2YgdGhlIHNjcmlw dCB0byBiZSBwb3N0cG9uZWQgdW50aWwgYWZ0ZXIgdGhlIHNjcmlwdCBoYXMgZmluaXNoZWQgZXhl Y3V0aW5nCg== 25060 2008-11-11 15:17:40 -0800 2008-11-11 15:42:30 -0800 Rename noMoreData to m_noMoreData and cBuffer to m_cBuffer Rename-noMoreData-to-m_noMoreData-and-cBuffer-to-m_cBuffer.patch text/plain 12354 eric NjEwNDQwYjIwOTA2NjA3ODA0ZTgzYmU5NjEwOTVkZTc3ODc1YWNiOApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu Y3BwCmluZGV4IDlkNmQzMzMuLjRjMmMzY2QgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTI0 OSw3ICsyNDksNyBAQCB2b2lkIEhUTUxUb2tlbml6ZXI6OmJlZ2luKCkKICAgICBzY3JpcHRTcmMg PSBTdHJpbmcoKTsKICAgICBtX3BlbmRpbmdTcmMuY2xlYXIoKTsKICAgICBtX2N1cnJlbnRQcmVw ZW5kaW5nU3JjID0gMDsKLSAgICBub01vcmVEYXRhID0gZmFsc2U7CisgICAgbV9ub01vcmVEYXRh ID0gZmFsc2U7CiAgICAgYnJva2VuQ29tbWVudHMgPSBmYWxzZTsKICAgICBicm9rZW5TZXJ2ZXIg PSBmYWxzZTsKICAgICBtX2xpbmVOdW1iZXIgPSAwOwpAQCAtNzIyLDE3ICs3MjIsMTUgQEAgSFRN TFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6cGFyc2VUZXh0KFNlZ21lbnRlZFN0cmlu ZyAmc3JjLCBTdGF0ZSBzdGF0ZSkKIH0KIAogCi1IVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9r ZW5pemVyOjpwYXJzZUVudGl0eShTZWdtZW50ZWRTdHJpbmcgJnNyYywgVUNoYXIqJiBkZXN0LCBT dGF0ZSBzdGF0ZSwgdW5zaWduZWQgJmNCdWZmZXJQb3MsIGJvb2wgc3RhcnQsIGJvb2wgcGFyc2lu Z1RhZykKK0hUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnBhcnNlRW50aXR5KFNl Z21lbnRlZFN0cmluZyYgc3JjLCBVQ2hhciomIGRlc3QsIFN0YXRlIHN0YXRlLCB1bnNpZ25lZCYg Y0J1ZmZlclBvcywgYm9vbCBzdGFydCwgYm9vbCBwYXJzaW5nVGFnKQogewotICAgIGlmIChzdGFy dCkKLSAgICB7CisgICAgaWYgKHN0YXJ0KSB7CiAgICAgICAgIGNCdWZmZXJQb3MgPSAwOwogICAg ICAgICBzdGF0ZS5zZXRFbnRpdHlTdGF0ZShTZWFyY2hFbnRpdHkpOwogICAgICAgICBFbnRpdHlV bmljb2RlVmFsdWUgPSAwOwogICAgIH0KIAotICAgIHdoaWxlKCFzcmMuaXNFbXB0eSgpKQotICAg IHsKKyAgICB3aGlsZSghc3JjLmlzRW1wdHkoKSkgewogICAgICAgICBVQ2hhciBjYyA9ICpzcmM7 CiAgICAgICAgIHN3aXRjaChzdGF0ZS5lbnRpdHlTdGF0ZSgpKSB7CiAgICAgICAgIGNhc2UgTm9F bnRpdHk6CkBAIC03NDEsNyArNzM5LDcgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2Vu aXplcjo6cGFyc2VFbnRpdHkoU2VnbWVudGVkU3RyaW5nICZzcmMsIFVDaGFyKiYgZGUKICAgICAg ICAgCiAgICAgICAgIGNhc2UgU2VhcmNoRW50aXR5OgogICAgICAgICAgICAgaWYgKGNjID09ICcj JykgewotICAgICAgICAgICAgICAgIGNCdWZmZXJbY0J1ZmZlclBvcysrXSA9IGNjOworICAgICAg ICAgICAgICAgIG1fY0J1ZmZlcltjQnVmZmVyUG9zKytdID0gY2M7CiAgICAgICAgICAgICAgICAg c3JjLmFkdmFuY2VQYXN0Tm9uTmV3bGluZSgpOwogICAgICAgICAgICAgICAgIHN0YXRlLnNldEVu dGl0eVN0YXRlKE51bWVyaWNTZWFyY2gpOwogICAgICAgICAgICAgfSBlbHNlCkBAIC03NTAsNyAr NzQ4LDcgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6cGFyc2VFbnRpdHko U2VnbWVudGVkU3RyaW5nICZzcmMsIFVDaGFyKiYgZGUKIAogICAgICAgICBjYXNlIE51bWVyaWNT ZWFyY2g6CiAgICAgICAgICAgICBpZiAoY2MgPT0gJ3gnIHx8IGNjID09ICdYJykgewotICAgICAg ICAgICAgICAgIGNCdWZmZXJbY0J1ZmZlclBvcysrXSA9IGNjOworICAgICAgICAgICAgICAgIG1f Y0J1ZmZlcltjQnVmZmVyUG9zKytdID0gY2M7CiAgICAgICAgICAgICAgICAgc3JjLmFkdmFuY2VQ YXN0Tm9uTmV3bGluZSgpOwogICAgICAgICAgICAgICAgIHN0YXRlLnNldEVudGl0eVN0YXRlKEhl eGFkZWNpbWFsKTsKICAgICAgICAgICAgIH0gZWxzZSBpZiAoY2MgPj0gJzAnICYmIGNjIDw9ICc5 JykKQEAgLTc3Myw3ICs3NzEsNyBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVy OjpwYXJzZUVudGl0eShTZWdtZW50ZWRTdHJpbmcgJnNyYywgVUNoYXIqJiBkZQogICAgICAgICAg ICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICAgICAgZGlnaXQgPSAoY2MgLSAnQScgKyAxMCkg JiAweEY7IC8vIGhhbmRsZSBib3RoIHVwcGVyIGFuZCBsb3dlciBjYXNlIHdpdGhvdXQgYSBicmFu Y2gKICAgICAgICAgICAgICAgICBFbnRpdHlVbmljb2RlVmFsdWUgPSBFbnRpdHlVbmljb2RlVmFs dWUgKiAxNiArIGRpZ2l0OwotICAgICAgICAgICAgICAgIGNCdWZmZXJbY0J1ZmZlclBvcysrXSA9 IGNjOworICAgICAgICAgICAgICAgIG1fY0J1ZmZlcltjQnVmZmVyUG9zKytdID0gY2M7CiAgICAg ICAgICAgICAgICAgc3JjLmFkdmFuY2VQYXN0Tm9uTmV3bGluZSgpOwogICAgICAgICAgICAgfQog ICAgICAgICAgICAgaWYgKGNCdWZmZXJQb3MgPT0gMTApICAKQEAgLTc5Miw3ICs3OTAsNyBAQCBI VE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZUVudGl0eShTZWdtZW50ZWRT dHJpbmcgJnNyYywgVUNoYXIqJiBkZQogICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAg ICAgIEVudGl0eVVuaWNvZGVWYWx1ZSA9IEVudGl0eVVuaWNvZGVWYWx1ZSAqIDEwICsgKGNjIC0g JzAnKTsKLSAgICAgICAgICAgICAgICBjQnVmZmVyW2NCdWZmZXJQb3MrK10gPSBjYzsKKyAgICAg ICAgICAgICAgICBtX2NCdWZmZXJbY0J1ZmZlclBvcysrXSA9IGNjOwogICAgICAgICAgICAgICAg IHNyYy5hZHZhbmNlUGFzdE5vbk5ld2xpbmUoKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAg IGlmIChjQnVmZmVyUG9zID09IDkpICAKQEAgLTgxMCw3ICs4MDgsNyBAQCBIVE1MVG9rZW5pemVy OjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZUVudGl0eShTZWdtZW50ZWRTdHJpbmcgJnNyYywg VUNoYXIqJiBkZQogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICB9 CiAKLSAgICAgICAgICAgICAgICBjQnVmZmVyW2NCdWZmZXJQb3MrK10gPSBjYzsKKyAgICAgICAg ICAgICAgICBtX2NCdWZmZXJbY0J1ZmZlclBvcysrXSA9IGNjOwogICAgICAgICAgICAgICAgIHNy Yy5hZHZhbmNlUGFzdE5vbk5ld2xpbmUoKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlm IChjQnVmZmVyUG9zID09IDkpIApAQCAtODI3LDkgKzgyNSw5IEBAIEhUTUxUb2tlbml6ZXI6OlN0 YXRlIEhUTUxUb2tlbml6ZXI6OnBhcnNlRW50aXR5KFNlZ21lbnRlZFN0cmluZyAmc3JjLCBVQ2hh ciomIGRlCiAKICAgICAgICAgICAgICAgICAgICAgQVNTRVJUKGNCdWZmZXJQb3MgPCAxMCk7CiAg ICAgICAgICAgICAgICAgICAgIGZvciAoOyB0ZXN0ZWRFbnRpdHlOYW1lTGVuIDwgY0J1ZmZlclBv czsgKyt0ZXN0ZWRFbnRpdHlOYW1lTGVuKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAo Y0J1ZmZlclt0ZXN0ZWRFbnRpdHlOYW1lTGVuXSA+IDB4N2UpCisgICAgICAgICAgICAgICAgICAg ICAgICBpZiAobV9jQnVmZmVyW3Rlc3RlZEVudGl0eU5hbWVMZW5dID4gMHg3ZSkKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICAgICAgICAgIHRtcEVu dGl0eU5hbWVCdWZmZXJbdGVzdGVkRW50aXR5TmFtZUxlbl0gPSBjQnVmZmVyW3Rlc3RlZEVudGl0 eU5hbWVMZW5dOworICAgICAgICAgICAgICAgICAgICAgICAgdG1wRW50aXR5TmFtZUJ1ZmZlclt0 ZXN0ZWRFbnRpdHlOYW1lTGVuXSA9IG1fY0J1ZmZlclt0ZXN0ZWRFbnRpdHlOYW1lTGVuXTsKICAg ICAgICAgICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEVudGl0eSAq ZTsKQEAgLTg3MCw3ICs4NjgsNyBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVy OjpwYXJzZUVudGl0eShTZWdtZW50ZWRTdHJpbmcgJnNyYywgVUNoYXIqJiBkZQogICAgICAgICAg ICAgICAgICAgICBjaGVja0J1ZmZlcigxMSk7CiAgICAgICAgICAgICAgICAgICAgICpkZXN0Kysg PSAnJic7CiAgICAgICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBjQnVm ZmVyUG9zOyBpKyspCi0gICAgICAgICAgICAgICAgICAgICAgICBkZXN0W2ldID0gY0J1ZmZlcltp XTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGRlc3RbaV0gPSBtX2NCdWZmZXJbaV07CiAgICAg ICAgICAgICAgICAgICAgIGRlc3QgKz0gY0J1ZmZlclBvczsKICAgICAgICAgICAgICAgICAgICAg aWYgKCpzcmMgPT0gJzsnKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAqZGVzdCsrID0gJzsn OwpAQCAtODgyLDcgKzg4MCw3IEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6 OnBhcnNlRW50aXR5KFNlZ21lbnRlZFN0cmluZyAmc3JjLCBVQ2hhciomIGRlCiAgICAgICAgICAg ICAgICAgLy8gaWdub3JlIHRoZSBzZXF1ZW5jZSwgYWRkIGl0IHRvIHRoZSBidWZmZXIgYXMgcGxh aW50ZXh0CiAgICAgICAgICAgICAgICAgKmRlc3QrKyA9ICcmJzsKICAgICAgICAgICAgICAgICBm b3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgY0J1ZmZlclBvczsgaSsrKQotICAgICAgICAgICAgICAg ICAgICBkZXN0W2ldID0gY0J1ZmZlcltpXTsKKyAgICAgICAgICAgICAgICAgICAgZGVzdFtpXSA9 IG1fY0J1ZmZlcltpXTsKICAgICAgICAgICAgICAgICBkZXN0ICs9IGNCdWZmZXJQb3M7CiAgICAg ICAgICAgICB9CiAKQEAgLTExNDksMTQgKzExNDcsMTQgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUg SFRNTFRva2VuaXplcjo6cGFyc2VUYWcoU2VnbWVudGVkU3RyaW5nICZzcmMsIFN0YXRlIHN0YXRl KQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRlLnNldEluQ29tbWVudChmYWxzZSk7 CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3JjLmFkdmFuY2VQYXN0Tm9uTmV3bGluZSgp OwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICghc3JjLmlzRW1wdHkoKSkKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY0J1ZmZlcltjQnVmZmVyUG9zKytdID0gKnNyYzsK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9jQnVmZmVyW2NCdWZmZXJQb3MrK10g PSAqc3JjOwogICAgICAgICAgICAgICAgICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICAgICAg ICAgICAgICAgIHN0YXRlID0gcGFyc2VDb21tZW50KHNyYywgc3RhdGUpOwogCiAgICAgICAgICAg ICAgICAgICAgICAgICBtX2NCdWZmZXJQb3MgPSBjQnVmZmVyUG9zOwogICAgICAgICAgICAgICAg ICAgICAgICAgcmV0dXJuIHN0YXRlOyAvLyBGaW5pc2hlZCBwYXJzaW5nIHRhZyEKICAgICAgICAg ICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICBjQnVmZmVyW2NCdWZmZXJQb3MrK10g PSAqc3JjOworICAgICAgICAgICAgICAgICAgICBtX2NCdWZmZXJbY0J1ZmZlclBvcysrXSA9ICpz cmM7CiAgICAgICAgICAgICAgICAgICAgIHNyYy5hZHZhbmNlUGFzdE5vbk5ld2xpbmUoKTsKICAg ICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgfSBlbHNlCkBAIC0xMTY2 LDcgKzExNjQsNyBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZVRh ZyhTZWdtZW50ZWRTdHJpbmcgJnNyYywgU3RhdGUgc3RhdGUpCiAgICAgICAgICAgICBpZiAobV9k b2N0eXBlU2VhcmNoQ291bnQgPiAwKSB7CiAgICAgICAgICAgICAgICAgaWYgKHRvQVNDSUlMb3dl cigqc3JjKSA9PSBkb2N0eXBlU3RhcnRbbV9kb2N0eXBlU2VhcmNoQ291bnRdKSB7CiAgICAgICAg ICAgICAgICAgICAgIG1fZG9jdHlwZVNlYXJjaENvdW50Kys7Ci0gICAgICAgICAgICAgICAgICAg IGNCdWZmZXJbY0J1ZmZlclBvcysrXSA9ICpzcmM7CisgICAgICAgICAgICAgICAgICAgIG1fY0J1 ZmZlcltjQnVmZmVyUG9zKytdID0gKnNyYzsKICAgICAgICAgICAgICAgICAgICAgc3JjLmFkdmFu Y2VQYXN0Tm9uTmV3bGluZSgpOwogICAgICAgICAgICAgICAgICAgICBpZiAobV9kb2N0eXBlU2Vh cmNoQ291bnQgPT0gOSkgewogICAgICAgICAgICAgICAgICAgICAgICAgLy8gRm91bmQgJzwhRE9D VFlQRScgc2VxdWVuY2UKQEAgLTExNzQsNyArMTE3Miw3IEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRl IEhUTUxUb2tlbml6ZXI6OnBhcnNlVGFnKFNlZ21lbnRlZFN0cmluZyAmc3JjLCBTdGF0ZSBzdGF0 ZSkKICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRlLnNldFRhZ1N0YXRlKE5vVGFnKTsKICAg ICAgICAgICAgICAgICAgICAgICAgIG1fZG9jdHlwZVRva2VuLnJlc2V0KCk7CiAgICAgICAgICAg ICAgICAgICAgICAgICBpZiAoaW5WaWV3U291cmNlTW9kZSgpKQotICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG1fZG9jdHlwZVRva2VuLm1fc291cmNlLmFwcGVuZChjQnVmZmVyLCBjQnVmZmVy UG9zKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2RvY3R5cGVUb2tlbi5tX3NvdXJj ZS5hcHBlbmQobV9jQnVmZmVyLCBjQnVmZmVyUG9zKTsKICAgICAgICAgICAgICAgICAgICAgICAg IHN0YXRlID0gcGFyc2VEb2N0eXBlKHNyYywgc3RhdGUpOwogICAgICAgICAgICAgICAgICAgICAg ICAgbV9jQnVmZmVyUG9zID0gY0J1ZmZlclBvczsKICAgICAgICAgICAgICAgICAgICAgICAgIHJl dHVybiBzdGF0ZTsKQEAgLTExOTUsMTkgKzExOTMsMTkgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUg SFRNTFRva2VuaXplcjo6cGFyc2VUYWcoU2VnbWVudGVkU3RyaW5nICZzcmMsIFN0YXRlIHN0YXRl KQogICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgIC8vIHRvbG93ZXIoKSBzaG93cyB1 cCBvbiBwcm9maWxlcy4gVGhpcyBpcyBmYXN0ZXIhCiAgICAgICAgICAgICAgICAgaWYgKGN1cmNo YXIgPj0gJ0EnICYmIGN1cmNoYXIgPD0gJ1onICYmICFpblZpZXdTb3VyY2VNb2RlKCkpCi0gICAg ICAgICAgICAgICAgICAgIGNCdWZmZXJbY0J1ZmZlclBvcysrXSA9IGN1cmNoYXIgKyAoJ2EnIC0g J0EnKTsKKyAgICAgICAgICAgICAgICAgICAgbV9jQnVmZmVyW2NCdWZmZXJQb3MrK10gPSBjdXJj aGFyICsgKCdhJyAtICdBJyk7CiAgICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAg ICAgICBjQnVmZmVyW2NCdWZmZXJQb3MrK10gPSBjdXJjaGFyOworICAgICAgICAgICAgICAgICAg ICBtX2NCdWZmZXJbY0J1ZmZlclBvcysrXSA9IGN1cmNoYXI7CiAgICAgICAgICAgICAgICAgc3Jj LmFkdmFuY2VQYXN0Tm9uTmV3bGluZSgpOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAv LyBEaXNhZHZhbnRhZ2U6IHdlIGFkZCB0aGUgcG9zc2libGUgcmVzdCBvZiB0aGUgdGFnCiAgICAg ICAgICAgICAvLyBhcyBhdHRyaWJ1dGUgbmFtZXMuICMjIyBqdWRnZSBpZiB0aGlzIGNhdXNlcyBw cm9ibGVtcwotICAgICAgICAgICAgaWYoZmluaXNoIHx8IENCVUZMRU4gPT0gY0J1ZmZlclBvcykg eworICAgICAgICAgICAgaWYgKGZpbmlzaCB8fCBDQlVGTEVOID09IGNCdWZmZXJQb3MpIHsKICAg ICAgICAgICAgICAgICBib29sIGJlZ2luVGFnOwotICAgICAgICAgICAgICAgIFVDaGFyKiBwdHIg PSBjQnVmZmVyOworICAgICAgICAgICAgICAgIFVDaGFyKiBwdHIgPSBtX2NCdWZmZXI7CiAgICAg ICAgICAgICAgICAgdW5zaWduZWQgaW50IGxlbiA9IGNCdWZmZXJQb3M7Ci0gICAgICAgICAgICAg ICAgY0J1ZmZlcltjQnVmZmVyUG9zXSA9ICdcMCc7CisgICAgICAgICAgICAgICAgbV9jQnVmZmVy W2NCdWZmZXJQb3NdID0gJ1wwJzsKICAgICAgICAgICAgICAgICBpZiAoKGNCdWZmZXJQb3MgPiAw KSAmJiAoKnB0ciA9PSAnLycpKSB7CiAgICAgICAgICAgICAgICAgICAgIC8vIEVuZCBUYWcKICAg ICAgICAgICAgICAgICAgICAgYmVnaW5UYWcgPSBmYWxzZTsKQEAgLTEyNjEsMTMgKzEyNTksMTMg QEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6cGFyc2VUYWcoU2VnbWVudGVk U3RyaW5nICZzcmMsIFN0YXRlIHN0YXRlKQogICAgICAgICAgICAgcURlYnVnKCJBdHRyaWJ1dGVO YW1lIik7CiAjZW5kaWYKICAgICAgICAgICAgIGludCBsbCA9IG1pbihzcmMubGVuZ3RoKCksIENC VUZMRU4tY0J1ZmZlclBvcyk7Ci0gICAgICAgICAgICB3aGlsZShsbC0tKSB7CisgICAgICAgICAg ICB3aGlsZSAobGwtLSkgewogICAgICAgICAgICAgICAgIFVDaGFyIGN1cmNoYXIgPSAqc3JjOwog ICAgICAgICAgICAgICAgIC8vIElmIHdlIGVuY291bnRlciBhICIvIiB3aGVuIHNjYW5uaW5nIGFu IGF0dHJpYnV0ZSBuYW1lLCB0cmVhdCBpdCBhcyBhIGRlbGltaXRlci4gIFRoaXMgYWxsb3dzIHRo ZSAKICAgICAgICAgICAgICAgICAvLyBjYXNlcyBsaWtlIDxpbnB1dCB0eXBlPWNoZWNrYm94IGNo ZWNrZWQvPiB0byB3b3JrIChhbmQgYWNjb21tb2RhdGVzIFhNTC1zdHlsZSBzeW50YXggYXMgcGVy IEhUTUw1KS4KICAgICAgICAgICAgICAgICBpZiAoY3VyY2hhciA8PSAnPicgJiYgKGN1cmNoYXIg Pj0gJzwnIHx8IGlzQVNDSUlTcGFjZShjdXJjaGFyKSB8fCBjdXJjaGFyID09ICcvJykpIHsKLSAg ICAgICAgICAgICAgICAgICAgY0J1ZmZlcltjQnVmZmVyUG9zXSA9ICdcMCc7Ci0gICAgICAgICAg ICAgICAgICAgIGF0dHJOYW1lID0gQXRvbWljU3RyaW5nKGNCdWZmZXIpOworICAgICAgICAgICAg ICAgICAgICBtX2NCdWZmZXJbY0J1ZmZlclBvc10gPSAnXDAnOworICAgICAgICAgICAgICAgICAg ICBhdHRyTmFtZSA9IEF0b21pY1N0cmluZyhtX2NCdWZmZXIpOwogICAgICAgICAgICAgICAgICAg ICBkZXN0ID0gYnVmZmVyOwogICAgICAgICAgICAgICAgICAgICAqZGVzdCsrID0gMDsKICAgICAg ICAgICAgICAgICAgICAgc3RhdGUuc2V0VGFnU3RhdGUoU2VhcmNoRXF1YWwpOwpAQCAtMTI3OCwx NSArMTI3NiwxNSBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZVRh ZyhTZWdtZW50ZWRTdHJpbmcgJnNyYywgU3RhdGUgc3RhdGUpCiAgICAgICAgICAgICAgICAgCiAg ICAgICAgICAgICAgICAgLy8gdG9sb3dlcigpIHNob3dzIHVwIG9uIHByb2ZpbGVzLiBUaGlzIGlz IGZhc3RlciEKICAgICAgICAgICAgICAgICBpZiAoY3VyY2hhciA+PSAnQScgJiYgY3VyY2hhciA8 PSAnWicgJiYgIWluVmlld1NvdXJjZU1vZGUoKSkKLSAgICAgICAgICAgICAgICAgICAgY0J1ZmZl cltjQnVmZmVyUG9zKytdID0gY3VyY2hhciArICgnYScgLSAnQScpOworICAgICAgICAgICAgICAg ICAgICBtX2NCdWZmZXJbY0J1ZmZlclBvcysrXSA9IGN1cmNoYXIgKyAoJ2EnIC0gJ0EnKTsKICAg ICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgIGNCdWZmZXJbY0J1ZmZlclBv cysrXSA9IGN1cmNoYXI7CisgICAgICAgICAgICAgICAgICAgIG1fY0J1ZmZlcltjQnVmZmVyUG9z KytdID0gY3VyY2hhcjsKICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgc3Jj LmFkdmFuY2UobV9saW5lTnVtYmVyKTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGlmICgg Y0J1ZmZlclBvcyA9PSBDQlVGTEVOICkgewotICAgICAgICAgICAgICAgIGNCdWZmZXJbY0J1ZmZl clBvc10gPSAnXDAnOwotICAgICAgICAgICAgICAgIGF0dHJOYW1lID0gQXRvbWljU3RyaW5nKGNC dWZmZXIpOworICAgICAgICAgICAgaWYgKGNCdWZmZXJQb3MgPT0gQ0JVRkxFTikgeworICAgICAg ICAgICAgICAgIG1fY0J1ZmZlcltjQnVmZmVyUG9zXSA9ICdcMCc7CisgICAgICAgICAgICAgICAg YXR0ck5hbWUgPSBBdG9taWNTdHJpbmcobV9jQnVmZmVyKTsKICAgICAgICAgICAgICAgICBkZXN0 ID0gYnVmZmVyOwogICAgICAgICAgICAgICAgICpkZXN0KysgPSAwOwogICAgICAgICAgICAgICAg IHN0YXRlLnNldFRhZ1N0YXRlKFNlYXJjaEVxdWFsKTsKQEAgLTE1NDUsNyArMTU0Myw3IEBAIEhU TUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnBhcnNlVGFnKFNlZ21lbnRlZFN0cmlu ZyAmc3JjLCBTdGF0ZSBzdGF0ZSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBSZXNl dCB0aGUgc3RhdGUgdGhlbiByZXRva2VuaXplIHdpdGhvdXQgc3BlY2lhbCB0aXRsZSBoYW5kbGlu Zy4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBMZXQgdGhlIHBhcnNlciBjbGVhbiB1 cCB0aGUgbWlzc2luZyA8L3RpdGxlPiB0YWcuCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Ly8gRklYTUU6IFRoaXMgaXMgaW5jb3JyZWN0LCBiZWNhdXNlIHNyYy5pc0VtcHR5KCkgZG9lc24n dCBtZWFuIHdlJ3JlCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gYXQgdGhlIGVuZCBv ZiB0aGUgZG9jdW1lbnQgdW5sZXNzIG5vTW9yZURhdGEgaXMgYWxzbyB0cnVlLiBXZSBuZWVkCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gYXQgdGhlIGVuZCBvZiB0aGUgZG9jdW1lbnQg dW5sZXNzIG1fbm9Nb3JlRGF0YSBpcyBhbHNvIHRydWUuIFdlIG5lZWQKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAvLyB0byBkZXRlY3QgdGhpcyBjYXNlIGVsc2V3aGVyZSwgYW5kIHNhdmUg dGhlIHN0YXRlIHNvbWV3aGVyZSBvdGhlcgogICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8v IHRoYW4gYSBsb2NhbCB2YXJpYWJsZS4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0 ZSA9IHNhdmVkU3RhdGU7CkBAIC0xNzg4LDcgKzE3ODYsNyBAQCBib29sIEhUTUxUb2tlbml6ZXI6 OndyaXRlKGNvbnN0IFNlZ21lbnRlZFN0cmluZyYgc3RyLCBib29sIGFwcGVuZERhdGEpCiAKICAg ICBtX3N0YXRlID0gc3RhdGU7CiAKLSAgICBpZiAobm9Nb3JlRGF0YSAmJiAhaW5Xcml0ZSAmJiAh c3RhdGUubG9hZGluZ0V4dFNjcmlwdCgpICYmICFtX2V4ZWN1dGluZ1NjcmlwdCAmJiAhbV90aW1l ci5pc0FjdGl2ZSgpKSB7CisgICAgaWYgKG1fbm9Nb3JlRGF0YSAmJiAhaW5Xcml0ZSAmJiAhc3Rh dGUubG9hZGluZ0V4dFNjcmlwdCgpICYmICFtX2V4ZWN1dGluZ1NjcmlwdCAmJiAhbV90aW1lci5p c0FjdGl2ZSgpKSB7CiAgICAgICAgIGVuZCgpOyAvLyB0aGlzIGFjdHVhbGx5IGNhdXNlcyB1cyB0 byBiZSBkZWxldGVkCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KQEAgLTE4ODYsNyArMTg4 NCw3IEBAIHZvaWQgSFRNTFRva2VuaXplcjo6ZmluaXNoKCkKICAgICB9CiAgICAgLy8gdGhpcyBp bmRpY2F0ZXMgd2Ugd2lsbCBub3QgcmVjZWl2ZSBhbnkgbW9yZSBkYXRhLi4uIGJ1dCBpZiB3ZSBh cmUgd2FpdGluZyBvbgogICAgIC8vIGFuIGV4dGVybmFsIHNjcmlwdCB0byBsb2FkLCB3ZSBjYW4n dCBmaW5pc2ggcGFyc2luZyB1bnRpbCB0aGF0IGlzIGRvbmUKLSAgICBub01vcmVEYXRhID0gdHJ1 ZTsKKyAgICBtX25vTW9yZURhdGEgPSB0cnVlOwogICAgIGlmICghaW5Xcml0ZSAmJiAhbV9zdGF0 ZS5sb2FkaW5nRXh0U2NyaXB0KCkgJiYgIW1fZXhlY3V0aW5nU2NyaXB0ICYmICFtX3RpbWVyLmlz QWN0aXZlKCkpCiAgICAgICAgIGVuZCgpOyAvLyB0aGlzIGFjdHVhbGx5IGNhdXNlcyB1cyB0byBi ZSBkZWxldGVkCiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5oIGIv V2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuaAppbmRleCA2OWNmY2UzLi5lZTBmNjFmIDEwMDY0 NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5oCisrKyBiL1dlYkNvcmUvaHRtbC9I VE1MVG9rZW5pemVyLmgKQEAgLTM2MSw3ICszNjEsNyBAQCBwcml2YXRlOgogICAgIAogICAgIC8v IGlmIG5vIG1vcmUgZGF0YSBpcyBjb21pbmcsIGp1c3QgcGFyc2Ugd2hhdCB3ZSBoYXZlIChpbmNs dWRpbmcgZXh0IHNjcmlwdHMgdGhhdAogICAgIC8vIG1heSBiZSBzdGlsbCBkb3dubG9hZGluZykg YW5kIGZpbmlzaAotICAgIGJvb2wgbm9Nb3JlRGF0YTsKKyAgICBib29sIG1fbm9Nb3JlRGF0YTsK ICAgICAvLyBVUkwgdG8gZ2V0IHNvdXJjZSBjb2RlIG9mIHNjcmlwdCBmcm9tCiAgICAgU3RyaW5n IHNjcmlwdFNyYzsKICAgICBTdHJpbmcgc2NyaXB0U3JjQ2hhcnNldDsKQEAgLTQwMCw3ICs0MDAs NyBAQCBwcml2YXRlOgogLy8gU28gYW55IGZpeGVkIG51bWJlciBtaWdodCBiZSB0b28gc21hbGws IGJ1dCByYXRoZXIgdGhhbiByZXdyaXRpbmcgYWxsIHVzYWdlIG9mIHRoaXMgYnVmZmVyCiAvLyB3 ZSdsbCBqdXN0IG1ha2UgaXQgbGFyZ2UgZW5vdWdoIHRvIGhhbmRsZSBhbGwgaW1hZ2luYWJsZSBj YXNlcy4KICNkZWZpbmUgQ0JVRkxFTiAxMDI0Ci0gICAgVUNoYXIgY0J1ZmZlcltDQlVGTEVOICsg Ml07CisgICAgVUNoYXIgbV9jQnVmZmVyW0NCVUZMRU4gKyAyXTsKICAgICB1bnNpZ25lZCBpbnQg bV9jQnVmZmVyUG9zOwogCiAgICAgU2VnbWVudGVkU3RyaW5nIHNyYzsK 25061 2008-11-11 15:17:42 -0800 2008-11-11 15:43:01 -0800 Remove long-since-dead kdDebug and qDebug calls Remove-long-since-dead-kdDebug-and-qDebug-calls.patch text/plain 6045 eric ODIxN2E2ZjQ5NTdiMTZiMDZlMGY3MTUzMzE4MTgzNDM2ZTY2MGEzZQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9jc3MvQ1NTUGFyc2VyLmNwcCBiL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKaW5kZXgg ZjJmY2ViZC4uMDY0ZjYzOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAor KysgYi9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCkBAIC00MTM4LDIwICs0MTM4LDggQEAgYm9v bCBDU1NQYXJzZXI6OnBhcnNlVHJhbnNmb3JtT3JpZ2luKGludCBwcm9wSWQsIGludCYgcHJvcElk MSwgaW50JiBwcm9wSWQyLCBSZWYKICAgICByZXR1cm4gdmFsdWU7CiB9CiAKLSNpZmRlZiBDU1Nf REVCVUcKLQotc3RhdGljIGlubGluZSBpbnQgeXllcnJvcihjb25zdCBjaGFyICpzdHIpCi17Ci0g ICAga2REZWJ1Zyg2MDgwKSA8PCAiQ1NTIHBhcnNlIGVycm9yICIgPDwgc3RyIDw8IGVuZGw7Ci0g ICAgcmV0dXJuIDE7Ci19Ci0KLSNlbHNlCi0KIHN0YXRpYyBpbmxpbmUgaW50IHl5ZXJyb3IoY29u c3QgY2hhciopIHsgcmV0dXJuIDE7IH0KIAotI2VuZGlmCi0KICNkZWZpbmUgRU5EX1RPS0VOIDAK IAogI2luY2x1ZGUgIkNTU0dyYW1tYXIuaCIKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmNwcAppbmRleCA0YzJj M2NkLi4wMjVkNGQ5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAK KysrIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwCkBAIC0xMjMzLDkgKzEyMzMsNiBA QCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZVRhZyhTZWdtZW50ZWRT dHJpbmcgJnNyYywgU3RhdGUgc3RhdGUpCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQog ICAgICAgICBjYXNlIFNlYXJjaEF0dHJpYnV0ZToKLSNpZiBkZWZpbmVkKFRPS0VOX0RFQlVHKSAm JiBUT0tFTl9ERUJVRyA+IDEKLSAgICAgICAgICAgIHFEZWJ1ZygiU2VhcmNoQXR0cmlidXRlIik7 Ci0jZW5kaWYKICAgICAgICAgICAgIHdoaWxlKCFzcmMuaXNFbXB0eSgpKSB7CiAgICAgICAgICAg ICAgICAgVUNoYXIgY3VyY2hhciA9ICpzcmM7CiAgICAgICAgICAgICAgICAgLy8gSW4gdGhpcyBt b2RlIGp1c3QgaWdub3JlIGFueSBxdW90ZXMgd2UgZW5jb3VudGVyIGFuZCB0cmVhdCB0aGVtIGxp a2Ugc3BhY2VzLgpAQCAtMTI1NSwxMCArMTI1Miw3IEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhU TUxUb2tlbml6ZXI6OnBhcnNlVGFnKFNlZ21lbnRlZFN0cmluZyAmc3JjLCBTdGF0ZSBzdGF0ZSkK ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEF0dHJpYnV0ZU5hbWU6CiAgICAgICAg IHsKLSNpZiBkZWZpbmVkKFRPS0VOX0RFQlVHKSAmJiBUT0tFTl9ERUJVRyA+IDEKLSAgICAgICAg ICAgIHFEZWJ1ZygiQXR0cmlidXRlTmFtZSIpOwotI2VuZGlmCi0gICAgICAgICAgICBpbnQgbGwg PSBtaW4oc3JjLmxlbmd0aCgpLCBDQlVGTEVOLWNCdWZmZXJQb3MpOworICAgICAgICAgICAgaW50 IGxsID0gbWluKHNyYy5sZW5ndGgoKSwgQ0JVRkxFTiAtIGNCdWZmZXJQb3MpOwogICAgICAgICAg ICAgd2hpbGUgKGxsLS0pIHsKICAgICAgICAgICAgICAgICBVQ2hhciBjdXJjaGFyID0gKnNyYzsK ICAgICAgICAgICAgICAgICAvLyBJZiB3ZSBlbmNvdW50ZXIgYSAiLyIgd2hlbiBzY2FubmluZyBh biBhdHRyaWJ1dGUgbmFtZSwgdHJlYXQgaXQgYXMgYSBkZWxpbWl0ZXIuICBUaGlzIGFsbG93cyB0 aGUgCkBAIC0xMjk0LDEwICsxMjg4LDcgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2Vu aXplcjo6cGFyc2VUYWcoU2VnbWVudGVkU3RyaW5nICZzcmMsIFN0YXRlIHN0YXRlKQogICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBTZWFyY2hFcXVhbDoKLSNpZiBk ZWZpbmVkKFRPS0VOX0RFQlVHKSAmJiBUT0tFTl9ERUJVRyA+IDEKLSAgICAgICAgICAgIHFEZWJ1 ZygiU2VhcmNoRXF1YWwiKTsKLSNlbmRpZgotICAgICAgICAgICAgd2hpbGUoIXNyYy5pc0VtcHR5 KCkpIHsKKyAgICAgICAgICAgIHdoaWxlICghc3JjLmlzRW1wdHkoKSkgewogICAgICAgICAgICAg ICAgIFVDaGFyIGN1cmNoYXIgPSAqc3JjOwogCiAgICAgICAgICAgICAgICAgaWYgKGxhc3RJc1Ns YXNoICYmIGN1cmNoYXIgPT0gJz4nKSB7CkBAIC0xMzExLDkgKzEzMDIsNiBAQCBIVE1MVG9rZW5p emVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZVRhZyhTZWdtZW50ZWRTdHJpbmcgJnNyYywg U3RhdGUgc3RhdGUpCiAgICAgICAgICAgICAgICAgLy8gSW4gdGhpcyBtb2RlIGp1c3QgaWdub3Jl IGFueSBxdW90ZXMgb3Igc2xhc2hlcyB3ZSBlbmNvdW50ZXIgYW5kIHRyZWF0IHRoZW0gbGlrZSBz cGFjZXMuCiAgICAgICAgICAgICAgICAgaWYgKCFpc0FTQ0lJU3BhY2UoY3VyY2hhcikgJiYgY3Vy Y2hhciAhPSAnXCcnICYmIGN1cmNoYXIgIT0gJyInICYmIGN1cmNoYXIgIT0gJy8nKSB7CiAgICAg ICAgICAgICAgICAgICAgIGlmIChjdXJjaGFyID09ICc9JykgewotI2lmZGVmIFRPS0VOX0RFQlVH Ci0gICAgICAgICAgICAgICAgICAgICAgICBrZERlYnVnKDYwMzYpIDw8ICJmb3VuZCBlcXVhbCIg PDwgZW5kbDsKLSNlbmRpZgogICAgICAgICAgICAgICAgICAgICAgICAgc3RhdGUuc2V0VGFnU3Rh dGUoU2VhcmNoVmFsdWUpOwogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGluVmlld1NvdXJj ZU1vZGUoKSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjdXJyVG9rZW4uYWRkVmlld1Nv dXJjZUNoYXIoY3VyY2hhcik7CkBAIC0xMzU1LDkgKzEzNDMsNiBAQCBIVE1MVG9rZW5pemVyOjpT dGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZVRhZyhTZWdtZW50ZWRTdHJpbmcgJnNyYywgU3RhdGUg c3RhdGUpCiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBR dW90ZWRWYWx1ZToKLSNpZiBkZWZpbmVkKFRPS0VOX0RFQlVHKSAmJiBUT0tFTl9ERUJVRyA+IDEK LSAgICAgICAgICAgIHFEZWJ1ZygiUXVvdGVkVmFsdWUiKTsKLSNlbmRpZgogICAgICAgICAgICAg d2hpbGUgKCFzcmMuaXNFbXB0eSgpKSB7CiAgICAgICAgICAgICAgICAgY2hlY2tCdWZmZXIoKTsK IApAQCAtMTQxOCw5ICsxNDAzLDYgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXpl cjo6cGFyc2VUYWcoU2VnbWVudGVkU3RyaW5nICZzcmMsIFN0YXRlIHN0YXRlKQogICAgICAgICAg ICAgfQogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgVmFsdWU6Ci0jaWYgZGVmaW5l ZChUT0tFTl9ERUJVRykgJiYgVE9LRU5fREVCVUcgPiAxCi0gICAgICAgICAgICBxRGVidWcoIlZh bHVlIik7Ci0jZW5kaWYKICAgICAgICAgICAgIHdoaWxlKCFzcmMuaXNFbXB0eSgpKSB7CiAgICAg ICAgICAgICAgICAgY2hlY2tCdWZmZXIoKTsKICAgICAgICAgICAgICAgICBVQ2hhciBjdXJjaGFy ID0gKnNyYzsKQEAgLTE0NTAsOSArMTQzMiw2IEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxU b2tlbml6ZXI6OnBhcnNlVGFnKFNlZ21lbnRlZFN0cmluZyAmc3JjLCBTdGF0ZSBzdGF0ZSkKICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIFNlYXJjaEVuZDoKICAgICAgICAgewotI2lm IGRlZmluZWQoVE9LRU5fREVCVUcpICYmIFRPS0VOX0RFQlVHID4gMQotICAgICAgICAgICAgICAg IHFEZWJ1ZygiU2VhcmNoRW5kIik7Ci0jZW5kaWYKICAgICAgICAgICAgIHdoaWxlICghc3JjLmlz RW1wdHkoKSkgewogICAgICAgICAgICAgICAgIFVDaGFyIGNoID0gKnNyYzsKICAgICAgICAgICAg ICAgICBpZiAoY2ggPT0gJz4nIHx8IGNoID09ICc8JykKQEAgLTE0NjMsNyArMTQ0Miw4IEBAIEhU TUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnBhcnNlVGFnKFNlZ21lbnRlZFN0cmlu ZyAmc3JjLCBTdGF0ZSBzdGF0ZSkKICAgICAgICAgICAgICAgICAgICAgY3VyclRva2VuLmFkZFZp ZXdTb3VyY2VDaGFyKGNoKTsKICAgICAgICAgICAgICAgICBzcmMuYWR2YW5jZShtX2xpbmVOdW1i ZXIpOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgaWYgKHNyYy5pc0VtcHR5KCkpIGJyZWFr OworICAgICAgICAgICAgaWYgKHNyYy5pc0VtcHR5KCkpCisgICAgICAgICAgICAgICAgYnJlYWs7 CiAKICAgICAgICAgICAgIHNlYXJjaENvdW50ID0gMDsgLy8gU3RvcCBsb29raW5nIGZvciAnPCEt LScgc2VxdWVuY2UKICAgICAgICAgICAgIHN0YXRlLnNldFRhZ1N0YXRlKE5vVGFnKTsKQEAgLTE2 MDgsMTAgKzE1ODgsNiBAQCBpbmxpbmUgYm9vbCBIVE1MVG9rZW5pemVyOjpjb250aW51ZVByb2Nl c3NpbmcoaW50JiBwcm9jZXNzZWRDb3VudCwgZG91YmxlIHN0YXJ0VAogCiBib29sIEhUTUxUb2tl bml6ZXI6OndyaXRlKGNvbnN0IFNlZ21lbnRlZFN0cmluZyYgc3RyLCBib29sIGFwcGVuZERhdGEp CiB7Ci0jaWZkZWYgVE9LRU5fREVCVUcKLSAgICBrZERlYnVnKCA2MDM2ICkgPDwgdGhpcyA8PCAi IFRva2VuaXplcjo6d3JpdGUoXCIiIDw8IHN0ci50b1N0cmluZygpIDw8ICJcIiwiIDw8IGFwcGVu ZERhdGEgPDwgIikiIDw8IGVuZGw7Ci0jZW5kaWYKLQogICAgIGlmICghYnVmZmVyKQogICAgICAg ICByZXR1cm4gZmFsc2U7CiAgICAgCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggYWVl Njk4Yy4uY2JlNzNkZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su Y3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcApAQCAtMjQ4NCwxMyAr MjQ4NCwxMiBAQCBSZW5kZXJCbG9jazo6bGVmdFJlbE9mZnNldChpbnQgeSwgaW50IGZpeGVkT2Zm c2V0LCBib29sIGFwcGx5VGV4dEluZGVudCwKICAgICB9CiAKICAgICBpZiAoYXBwbHlUZXh0SW5k ZW50ICYmIG1fZmlyc3RMaW5lICYmIHN0eWxlKCktPmRpcmVjdGlvbigpID09IExUUikgewotICAg ICAgICBpbnQgY3c9MDsKKyAgICAgICAgaW50IGN3ID0gMDsKICAgICAgICAgaWYgKHN0eWxlKCkt PnRleHRJbmRlbnQoKS5pc1BlcmNlbnQoKSkKICAgICAgICAgICAgIGN3ID0gY29udGFpbmluZ0Js b2NrKCktPmF2YWlsYWJsZVdpZHRoKCk7CiAgICAgICAgIGxlZnQgKz0gc3R5bGUoKS0+dGV4dElu ZGVudCgpLmNhbGNNaW5WYWx1ZShjdyk7CiAgICAgfQogCi0gICAgLy9rZERlYnVnKCA2MDQwICkg PDwgImxlZnRPZmZzZXQoIiA8PCB5IDw8ICIpID0gIiA8PCBsZWZ0IDw8IGVuZGw7CiAgICAgcmV0 dXJuIGxlZnQ7CiB9CiAKQEAgLTI1MjIsMjAgKzI1MjEsMTggQEAgUmVuZGVyQmxvY2s6OnJpZ2h0 UmVsT2Zmc2V0KGludCB5LCBpbnQgZml4ZWRPZmZzZXQsIGJvb2wgYXBwbHlUZXh0SW5kZW50LAog ICAgIH0KICAgICAKICAgICBpZiAoYXBwbHlUZXh0SW5kZW50ICYmIG1fZmlyc3RMaW5lICYmIHN0 eWxlKCktPmRpcmVjdGlvbigpID09IFJUTCkgewotICAgICAgICBpbnQgY3c9MDsKKyAgICAgICAg aW50IGN3ID0gMDsKICAgICAgICAgaWYgKHN0eWxlKCktPnRleHRJbmRlbnQoKS5pc1BlcmNlbnQo KSkKICAgICAgICAgICAgIGN3ID0gY29udGFpbmluZ0Jsb2NrKCktPmF2YWlsYWJsZVdpZHRoKCk7 CiAgICAgICAgIHJpZ2h0IC09IHN0eWxlKCktPnRleHRJbmRlbnQoKS5jYWxjTWluVmFsdWUoY3cp OwogICAgIH0KICAgICAKLSAgICAvL2tkRGVidWcoIDYwNDAgKSA8PCAicmlnaHRPZmZzZXQoIiA8 PCB5IDw8ICIpID0gIiA8PCByaWdodCA8PCBlbmRsOwogICAgIHJldHVybiByaWdodDsKIH0KIAog aW50CiBSZW5kZXJCbG9jazo6bGluZVdpZHRoKGludCB5KSBjb25zdAogewotICAgIC8va2REZWJ1 ZyggNjA0MCApIDw8ICJsaW5lV2lkdGgoIiA8PCB5IDw8ICIpPSIgPDwgcmlnaHRPZmZzZXQoeSkg LSBsZWZ0T2Zmc2V0KHkpIDw8IGVuZGw7CiAgICAgaW50IHJlc3VsdCA9IHJpZ2h0T2Zmc2V0KHkp IC0gbGVmdE9mZnNldCh5KTsKICAgICByZXR1cm4gKHJlc3VsdCA8IDApID8gMCA6IHJlc3VsdDsK IH0K 25062 2008-11-11 15:17:48 -0800 2008-11-11 15:43:28 -0800 Rename brokenComments to m_brokenComments Rename-brokenComments-to-m_brokenComments.patch text/plain 2567 eric NGIwOGIyYzM3YzM1MjU1YWJjODU3MDNkZmUxOGQ0ZWYxYzJiODNlOQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu Y3BwCmluZGV4IDAyNWQ0ZDkuLjVlMDEwOTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTI1 MCw3ICsyNTAsNyBAQCB2b2lkIEhUTUxUb2tlbml6ZXI6OmJlZ2luKCkKICAgICBtX3BlbmRpbmdT cmMuY2xlYXIoKTsKICAgICBtX2N1cnJlbnRQcmVwZW5kaW5nU3JjID0gMDsKICAgICBtX25vTW9y ZURhdGEgPSBmYWxzZTsKLSAgICBicm9rZW5Db21tZW50cyA9IGZhbHNlOworICAgIG1fYnJva2Vu Q29tbWVudHMgPSBmYWxzZTsKICAgICBicm9rZW5TZXJ2ZXIgPSBmYWxzZTsKICAgICBtX2xpbmVO dW1iZXIgPSAwOwogICAgIHNjcmlwdFN0YXJ0TGluZW5vID0gMDsKQEAgLTMyNyw3ICszMjcsNyBA QCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZVNwZWNpYWwoU2VnbWVu dGVkU3RyaW5nICZzcmMsIFN0YXRlIHN0YQogICAgICAgICBjaGVja1NjcmlwdEJ1ZmZlcigpOwog ICAgICAgICBVQ2hhciBjaCA9ICpzcmM7CiAKLSAgICAgICAgaWYgKCFzY3JpcHRDb2RlUmVzeW5j ICYmICFicm9rZW5Db21tZW50cyAmJgorICAgICAgICBpZiAoIXNjcmlwdENvZGVSZXN5bmMgJiYg IW1fYnJva2VuQ29tbWVudHMgJiYKICAgICAgICAgICAgICFzdGF0ZS5pblhtcCgpICYmIGNoID09 ICctJyAmJiBzY3JpcHRDb2RlU2l6ZSA+PSAzICYmICFzcmMuZXNjYXBlZCgpICYmCiAgICAgICAg ICAgICBzY3JpcHRDb2RlW3NjcmlwdENvZGVTaXplLTNdID09ICc8JyAmJiBzY3JpcHRDb2RlW3Nj cmlwdENvZGVTaXplLTJdID09ICchJyAmJiBzY3JpcHRDb2RlW3NjcmlwdENvZGVTaXplLTFdID09 ICctJyAmJgogICAgICAgICAgICAgKGxhc3REZWNvZGVkRW50aXR5UG9zaXRpb24gPCBzY3JpcHRD b2RlU2l6ZSAtIDMpKSB7CkBAIC02MTYsNyArNjE2LDcgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUg SFRNTFRva2VuaXplcjo6cGFyc2VDb21tZW50KFNlZ21lbnRlZFN0cmluZyAmc3JjLCBTdGF0ZSBz dGEKICAgICAgICAgVUNoYXIgY2ggPSAqc3JjOwogICAgICAgICBzY3JpcHRDb2RlW3NjcmlwdENv ZGVTaXplKytdID0gY2g7CiAgICAgICAgIGlmIChjaCA9PSAnPicpIHsKLSAgICAgICAgICAgIGJv b2wgaGFuZGxlQnJva2VuQ29tbWVudHMgPSBicm9rZW5Db21tZW50cyAmJiAhKHN0YXRlLmluU2Ny aXB0KCkgfHwgc3RhdGUuaW5TdHlsZSgpKTsKKyAgICAgICAgICAgIGJvb2wgaGFuZGxlQnJva2Vu Q29tbWVudHMgPSBtX2Jyb2tlbkNvbW1lbnRzICYmICEoc3RhdGUuaW5TY3JpcHQoKSB8fCBzdGF0 ZS5pblN0eWxlKCkpOwogICAgICAgICAgICAgaW50IGVuZENoYXJzQ291bnQgPSAxOyAvLyBzdGFy dCBvZmYgd2l0aCBvbmUgZm9yIHRoZSAnPicgY2hhcmFjdGVyCiAgICAgICAgICAgICBpZiAoc2Ny aXB0Q29kZVNpemUgPiAyICYmIHNjcmlwdENvZGVbc2NyaXB0Q29kZVNpemUtM10gPT0gJy0nICYm IHNjcmlwdENvZGVbc2NyaXB0Q29kZVNpemUtMl0gPT0gJy0nKSB7CiAgICAgICAgICAgICAgICAg ZW5kQ2hhcnNDb3VudCA9IDM7CkBAIC0xODMzLDcgKzE4MzMsNyBAQCB2b2lkIEhUTUxUb2tlbml6 ZXI6OmZpbmlzaCgpCiAgICAgd2hpbGUgKChtX3N0YXRlLmluQ29tbWVudCgpIHx8IG1fc3RhdGUu aW5TZXJ2ZXIoKSkgJiYgc2NyaXB0Q29kZSAmJiBzY3JpcHRDb2RlU2l6ZSkgewogICAgICAgICAv LyB3ZSd2ZSBmb3VuZCBhbiB1bm1hdGNoZWQgY29tbWVudCBzdGFydAogICAgICAgICBpZiAobV9z dGF0ZS5pbkNvbW1lbnQoKSkKLSAgICAgICAgICAgIGJyb2tlbkNvbW1lbnRzID0gdHJ1ZTsKKyAg ICAgICAgICAgIG1fYnJva2VuQ29tbWVudHMgPSB0cnVlOwogICAgICAgICBlbHNlCiAgICAgICAg ICAgICBicm9rZW5TZXJ2ZXIgPSB0cnVlOwogICAgICAgICBjaGVja1NjcmlwdEJ1ZmZlcigpOwpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuaCBiL1dlYkNvcmUvaHRtbC9I VE1MVG9rZW5pemVyLmgKaW5kZXggZWUwZjYxZi4uNDFhMTQ1ZCAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9odG1sL0hUTUxUb2tlbml6ZXIuaAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5o CkBAIC0zODMsNyArMzgzLDcgQEAgcHJpdmF0ZToKIAogICAgIC8vIGlmIHdlIGZvdW5kIG9uZSBi cm9rZW4gY29tbWVudCwgdGhlcmUgYXJlIG1vc3QgbGlrZWx5IG90aGVycyBhcyB3ZWxsCiAgICAg Ly8gc3RvcmUgYSBmbGFnIHRvIGdldCByaWQgb2YgdGhlIE8obl4yKSBiZWhhdmlvdXIgaW4gc3Vj aCBhIGNhc2UuCi0gICAgYm9vbCBicm9rZW5Db21tZW50czsKKyAgICBib29sIG1fYnJva2VuQ29t bWVudHM7CiAgICAgLy8gY3VycmVudCBsaW5lIG51bWJlcgogICAgIGludCBtX2xpbmVOdW1iZXI7 CiAgICAgLy8gbGluZSBudW1iZXIgYXQgd2hpY2ggdGhlIGN1cnJlbnQgPHNjcmlwdD4gc3RhcnRl ZAo= 25063 2008-11-11 15:17:50 -0800 2008-11-11 16:03:10 -0800 Remove HTMLTokenizer includes and document the rest Remove-HTMLTokenizer-includes-and-document-the-rest.patch text/plain 2541 eric NGVmMzRlNjdmNWY4OWYyZDcxMzk5MzNiMzAyYWE5MDcxMjE4YTExYgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9kb20vWE1MVG9rZW5pemVyLmNwcCBiL1dlYkNvcmUvZG9tL1hNTFRva2VuaXplci5jcHAK aW5kZXggYjZlNmY1Mi4uZjIwNmM2YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20vWE1MVG9rZW5p emVyLmNwcAorKysgYi9XZWJDb3JlL2RvbS9YTUxUb2tlbml6ZXIuY3BwCkBAIC00MCw3ICs0MCw2 IEBACiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCiAjaW5jbHVkZSAiSFRNTFNjcmlwdEVsZW1lbnQu aCIKICNpbmNsdWRlICJIVE1MU3R5bGVFbGVtZW50LmgiCi0jaW5jbHVkZSAiSFRNTFRva2VuaXpl ci5oIgogI2luY2x1ZGUgIlNjcmlwdENvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJQcm9jZXNzaW5n SW5zdHJ1Y3Rpb24uaCIKICNpbmNsdWRlICJSZXNvdXJjZUVycm9yLmgiCmRpZmYgLS1naXQgYS9X ZWJDb3JlL2RvbS9YTUxUb2tlbml6ZXJMaWJ4bWwyLmNwcCBiL1dlYkNvcmUvZG9tL1hNTFRva2Vu aXplckxpYnhtbDIuY3BwCmluZGV4IDhkZmI2ODIuLjA3NjJiYzAgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvZG9tL1hNTFRva2VuaXplckxpYnhtbDIuY3BwCisrKyBiL1dlYkNvcmUvZG9tL1hNTFRva2Vu aXplckxpYnhtbDIuY3BwCkBAIC0zOCw3ICszOCw3IEBACiAjaW5jbHVkZSAiRnJhbWVWaWV3Lmgi CiAjaW5jbHVkZSAiSFRNTExpbmtFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTFN0eWxlRWxlbWVu dC5oIgotI2luY2x1ZGUgIkhUTUxUb2tlbml6ZXIuaCIKKyNpbmNsdWRlICJIVE1MVG9rZW5pemVy LmgiIC8vIGZvciBkZWNvZGVOYW1lZEVudGl0eQogI2luY2x1ZGUgIlNjcmlwdENvbnRyb2xsZXIu aCIKICNpbmNsdWRlICJQcm9jZXNzaW5nSW5zdHJ1Y3Rpb24uaCIKICNpbmNsdWRlICJSZXNvdXJj ZUVycm9yLmgiCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTERvY3VtZW50LmNwcCBiL1dl YkNvcmUvaHRtbC9IVE1MRG9jdW1lbnQuY3BwCmluZGV4IDAxNzQzOTcuLjE1OGU4MTEgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MRG9jdW1lbnQuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9I VE1MRG9jdW1lbnQuY3BwCkBAIC02Niw3ICs2Niw2IEBACiAjaW5jbHVkZSAiRnJhbWVUcmVlLmgi CiAjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCiAjaW5jbHVkZSAiSFRNTEJvZHlFbGVtZW50LmgiCi0j aW5jbHVkZSAiSFRNTEVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MRWxlbWVudEZhY3RvcnkuaCIK ICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJIVE1MVG9rZW5pemVyLmgiCmRpZmYg LS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxF bGVtZW50LmNwcAppbmRleCAwZjg2YTgwLi45MzA3NjYwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0 bWwvSFRNTEVsZW1lbnQuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5jcHAKQEAg LTM2LDcgKzM2LDcgQEAKICNpbmNsdWRlICJIVE1MRWxlbWVudEZhY3RvcnkuaCIKICNpbmNsdWRl ICJIVE1MRm9ybUVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKLSNpbmNsdWRlICJI VE1MVG9rZW5pemVyLmgiCisjaW5jbHVkZSAiSFRNTFRva2VuaXplci5oIiAvLyBwYXJzZUhUTUxE b2N1bWVudEZyYWdtZW50CiAjaW5jbHVkZSAiUmVuZGVyV29yZEJyZWFrLmgiCiAjaW5jbHVkZSAi U2V0dGluZ3MuaCIKICNpbmNsdWRlICJUZXh0LmgiCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwv SFRNTEZvcm1Db250cm9sRWxlbWVudC5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTEZvcm1Db250cm9s RWxlbWVudC5jcHAKaW5kZXggOGU4NzlmZC4uMjhhNzdhYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9o dG1sL0hUTUxGb3JtQ29udHJvbEVsZW1lbnQuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MRm9y bUNvbnRyb2xFbGVtZW50LmNwcApAQCAtMzUsNyArMzUsNiBAQAogI2luY2x1ZGUgIkhUTUxQYXJz ZXIuaCIKICNpbmNsdWRlICJIVE1MVG9rZW5pemVyLmgiCiAjaW5jbHVkZSAiUmVuZGVyVGhlbWUu aCIKLSNpbmNsdWRlICJUb2tlbml6ZXIuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCmRpZmYg LS1naXQgYS9XZWJDb3JlL3htbC9YU0xUUHJvY2Vzc29yLmNwcCBiL1dlYkNvcmUveG1sL1hTTFRQ cm9jZXNzb3IuY3BwCmluZGV4IGFiNTU0YzQuLjE5NDlmZDMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv eG1sL1hTTFRQcm9jZXNzb3IuY3BwCisrKyBiL1dlYkNvcmUveG1sL1hTTFRQcm9jZXNzb3IuY3Bw CkBAIC0zNiw3ICszNiw3IEBACiAjaW5jbHVkZSAiRnJhbWVMb2FkZXIuaCIKICNpbmNsdWRlICJG cmFtZVZpZXcuaCIKICNpbmNsdWRlICJIVE1MRG9jdW1lbnQuaCIKLSNpbmNsdWRlICJIVE1MVG9r ZW5pemVyLmgiCisjaW5jbHVkZSAiSFRNTFRva2VuaXplci5oIiAvLyBmb3IgcGFyc2VIVE1MRG9j dW1lbnRGcmFnbWVudAogI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJSZXNvdXJjZUVycm9y LmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VIYW5kbGUuaCIK 25064 2008-11-11 15:17:51 -0800 2008-11-11 16:04:28 -0800 Rename src to m_src Rename-src-to-m_src.patch text/plain 10681 eric MmE5Mjg3OGVjM2YxMzEwOGMzMDMzZjNlZWI5ZWM0YTE0OTg5ZjhiYQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu Y3BwCmluZGV4IDVlMDEwOTAuLmYzNmU2Y2YgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTMx MSw3ICszMTEsNyBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwcm9jZXNz TGlzdGluZyhTZWdtZW50ZWRTdHJpbmcgbGlzdCwgU3RhdGUgcwogICAgIHJldHVybiBzdGF0ZTsK IH0KIAotSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6cGFyc2VTcGVjaWFsKFNl Z21lbnRlZFN0cmluZyAmc3JjLCBTdGF0ZSBzdGF0ZSkKK0hUTUxUb2tlbml6ZXI6OlN0YXRlIEhU TUxUb2tlbml6ZXI6OnBhcnNlU3BlY2lhbChTZWdtZW50ZWRTdHJpbmcmIHNyYywgU3RhdGUgc3Rh dGUpCiB7CiAgICAgQVNTRVJUKHN0YXRlLmluVGV4dEFyZWEoKSB8fCBzdGF0ZS5pblRpdGxlKCkg fHwgc3RhdGUuaW5JRnJhbWUoKSB8fCAhc3RhdGUuaGFzRW50aXR5U3RhdGUoKSk7CiAgICAgQVNT RVJUKCFzdGF0ZS5oYXNUYWdTdGF0ZSgpKTsKQEAgLTMyMyw3ICszMjMsNyBAQCBIVE1MVG9rZW5p emVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZVNwZWNpYWwoU2VnbWVudGVkU3RyaW5nICZz cmMsIFN0YXRlIHN0YQogICAgICAgICBzdGF0ZSA9IHBhcnNlQ29tbWVudChzcmMsIHN0YXRlKTsK IAogICAgIGludCBsYXN0RGVjb2RlZEVudGl0eVBvc2l0aW9uID0gLTE7Ci0gICAgd2hpbGUgKCAh c3JjLmlzRW1wdHkoKSApIHsKKyAgICB3aGlsZSAoIXNyYy5pc0VtcHR5KCkpIHsKICAgICAgICAg Y2hlY2tTY3JpcHRCdWZmZXIoKTsKICAgICAgICAgVUNoYXIgY2ggPSAqc3JjOwogCkBAIC00Nzcs OSArNDc3LDkgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6c2NyaXB0SGFu ZGxlcihTdGF0ZSBzdGF0ZSkKICAgICBpZiAoIXBhcnNlci0+c2tpcE1vZGUoKSAmJiAhZm9sbG93 aW5nRnJhbWVzZXQpIHsKICAgICAgICAgaWYgKGNzKSB7CiAgICAgICAgICAgICBpZiAoc2F2ZWRQ cmVwZW5kaW5nU3JjKQotICAgICAgICAgICAgICAgIHNhdmVkUHJlcGVuZGluZ1NyYy0+YXBwZW5k KHNyYyk7CisgICAgICAgICAgICAgICAgc2F2ZWRQcmVwZW5kaW5nU3JjLT5hcHBlbmQobV9zcmMp OwogICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIG1fcGVuZGluZ1NyYy5wcmVwZW5k KHNyYyk7CisgICAgICAgICAgICAgICAgbV9wZW5kaW5nU3JjLnByZXBlbmQobV9zcmMpOwogICAg ICAgICAgICAgc2V0U3JjKFNlZ21lbnRlZFN0cmluZygpKTsKIAogICAgICAgICAgICAgLy8gdGhl IHJlZigpIGNhbGwgYmVsb3cgbWF5IGNhbGwgbm90aWZ5RmluaXNoZWQgaWYgdGhlIHNjcmlwdCBp cyBhbHJlYWR5IGluIGNhY2hlLApAQCAtNDk1LDE2ICs0OTUsMTYgQEAgSFRNTFRva2VuaXplcjo6 U3RhdGUgSFRNTFRva2VuaXplcjo6c2NyaXB0SGFuZGxlcihTdGF0ZSBzdGF0ZSkKICAgICAgICAg ICAgICAgICBzdGF0ZS5zZXRMb2FkaW5nRXh0U2NyaXB0KHRydWUpOwogICAgICAgICB9IGVsc2Ug aWYgKCFtX2ZyYWdtZW50ICYmIGRvU2NyaXB0RXhlYykgewogICAgICAgICAgICAgaWYgKCFtX2V4 ZWN1dGluZ1NjcmlwdCkKLSAgICAgICAgICAgICAgICBtX3BlbmRpbmdTcmMucHJlcGVuZChzcmMp OworICAgICAgICAgICAgICAgIG1fcGVuZGluZ1NyYy5wcmVwZW5kKG1fc3JjKTsKICAgICAgICAg ICAgIGVsc2UKLSAgICAgICAgICAgICAgICBwcmVwZW5kaW5nU3JjID0gc3JjOworICAgICAgICAg ICAgICAgIHByZXBlbmRpbmdTcmMgPSBtX3NyYzsKICAgICAgICAgICAgIHNldFNyYyhTZWdtZW50 ZWRTdHJpbmcoKSk7CiAgICAgICAgICAgICBzdGF0ZSA9IHNjcmlwdEV4ZWN1dGlvbihzY3JpcHRT dHJpbmcsIHN0YXRlLCBTdHJpbmcoKSwgc3RhcnRMaW5lKTsKICAgICAgICAgfQogICAgIH0KIAog ICAgIGlmICghbV9leGVjdXRpbmdTY3JpcHQgJiYgIXN0YXRlLmxvYWRpbmdFeHRTY3JpcHQoKSkg ewotICAgICAgICBzcmMuYXBwZW5kKG1fcGVuZGluZ1NyYyk7CisgICAgICAgIG1fc3JjLmFwcGVu ZChtX3BlbmRpbmdTcmMpOwogICAgICAgICBtX3BlbmRpbmdTcmMuY2xlYXIoKTsKICAgICB9IGVs c2UgaWYgKCFwcmVwZW5kaW5nU3JjLmlzRW1wdHkoKSkgewogICAgICAgICAvLyByZXN0b3JlIGZp cnN0IHNvIHRoYXQgdGhlIHdyaXRlIGFwcGVuZHMgaW4gdGhlIHJpZ2h0IHBsYWNlCkBAIC01NzIs NyArNTcyLDcgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6c2NyaXB0RXhl Y3V0aW9uKGNvbnN0IFN0cmluZyYgc3RyLCBTdGF0ZSBzdGEKIAogICAgIGlmICghbV9leGVjdXRp bmdTY3JpcHQgJiYgIXN0YXRlLmxvYWRpbmdFeHRTY3JpcHQoKSkgewogICAgICAgICBtX3BlbmRp bmdTcmMucHJlcGVuZChwcmVwZW5kaW5nU3JjKTsgICAgICAgIAotICAgICAgICBzcmMuYXBwZW5k KG1fcGVuZGluZ1NyYyk7CisgICAgICAgIG1fc3JjLmFwcGVuZChtX3BlbmRpbmdTcmMpOwogICAg ICAgICBtX3BlbmRpbmdTcmMuY2xlYXIoKTsKICAgICB9IGVsc2UgaWYgKCFwcmVwZW5kaW5nU3Jj LmlzRW1wdHkoKSkgewogICAgICAgICAvLyByZXN0b3JlIGZpcnN0IHNvIHRoYXQgdGhlIHdyaXRl IGFwcGVuZHMgaW4gdGhlIHJpZ2h0IHBsYWNlCkBAIC02MDgsNyArNjA4LDcgQEAgSFRNTFRva2Vu aXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6c2NyaXB0RXhlY3V0aW9uKGNvbnN0IFN0cmluZyYg c3RyLCBTdGF0ZSBzdGEKICAgICByZXR1cm4gc3RhdGU7CiB9CiAKLUhUTUxUb2tlbml6ZXI6OlN0 YXRlIEhUTUxUb2tlbml6ZXI6OnBhcnNlQ29tbWVudChTZWdtZW50ZWRTdHJpbmcgJnNyYywgU3Rh dGUgc3RhdGUpCitIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZUNvbW1l bnQoU2VnbWVudGVkU3RyaW5nJiBzcmMsIFN0YXRlIHN0YXRlKQogewogICAgIC8vIEZJWE1FOiBX aHkgZG9lcyB0aGlzIGNvZGUgZXZlbiBydW4gZm9yIGNvbW1lbnRzIGluc2lkZSA8c2NyaXB0PiBh bmQgPHN0eWxlPj8gVGhpcyBzZWVtcyBib2d1cy4KICAgICBjaGVja1NjcmlwdEJ1ZmZlcihzcmMu bGVuZ3RoKCkpOwpAQCAtNjY4LDcgKzY2OCw3IEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxU b2tlbml6ZXI6OnBhcnNlU2VydmVyKFNlZ21lbnRlZFN0cmluZyYgc3JjLCBTdGF0ZSBzdGF0CiAg ICAgcmV0dXJuIHN0YXRlOwogfQogCi1IVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVy OjpwYXJzZVByb2Nlc3NpbmdJbnN0cnVjdGlvbihTZWdtZW50ZWRTdHJpbmcgJnNyYywgU3RhdGUg c3RhdGUpCitIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZVByb2Nlc3Np bmdJbnN0cnVjdGlvbihTZWdtZW50ZWRTdHJpbmcmIHNyYywgU3RhdGUgc3RhdGUpCiB7CiAgICAg VUNoYXIgb2xkY2hhciA9IDA7CiAgICAgd2hpbGUgKCFzcmMuaXNFbXB0eSgpKSB7CkBAIC02OTQs NyArNjk0LDcgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6cGFyc2VQcm9j ZXNzaW5nSW5zdHJ1Y3Rpb24oU2VnbWVudGVkU3RyaW5nICYKICAgICByZXR1cm4gc3RhdGU7CiB9 CiAKLUhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnBhcnNlVGV4dChTZWdtZW50 ZWRTdHJpbmcgJnNyYywgU3RhdGUgc3RhdGUpCitIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9r ZW5pemVyOjpwYXJzZVRleHQoU2VnbWVudGVkU3RyaW5nJiBzcmMsIFN0YXRlIHN0YXRlKQogewog ICAgIHdoaWxlICghc3JjLmlzRW1wdHkoKSkgewogICAgICAgICBVQ2hhciBjYyA9ICpzcmM7CkBA IC0xMTA4LDcgKzExMDgsNyBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpw YXJzZURvY3R5cGUoU2VnbWVudGVkU3RyaW5nJiBzcmMsIFN0YXRlIHN0YQogICAgIHJldHVybiBz dGF0ZTsKIH0KIAotSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6cGFyc2VUYWco U2VnbWVudGVkU3RyaW5nICZzcmMsIFN0YXRlIHN0YXRlKQorSFRNTFRva2VuaXplcjo6U3RhdGUg SFRNTFRva2VuaXplcjo6cGFyc2VUYWcoU2VnbWVudGVkU3RyaW5nJiBzcmMsIFN0YXRlIHN0YXRl KQogewogICAgIEFTU0VSVCghc3RhdGUuaGFzRW50aXR5U3RhdGUoKSk7CiAKQEAgLTE2MTcsOCAr MTYxNyw4IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6d3JpdGUoY29uc3QgU2VnbWVudGVkU3RyaW5n JiBzdHIsIGJvb2wgYXBwZW5kRGF0YSkKICAgICAgICAgbV9wcmVsb2FkU2Nhbm5lci0+ZW5kKCk7 CiAjZW5kaWYKIAotICAgIGlmICghc3JjLmlzRW1wdHkoKSkKLSAgICAgICAgc3JjLmFwcGVuZChz b3VyY2UpOworICAgIGlmICghbV9zcmMuaXNFbXB0eSgpKQorICAgICAgICBtX3NyYy5hcHBlbmQo c291cmNlKTsKICAgICBlbHNlCiAgICAgICAgIHNldFNyYyhzb3VyY2UpOwogCkBAIC0xNjQxLDM5 ICsxNjQxLDM5IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6d3JpdGUoY29uc3QgU2VnbWVudGVkU3Ry aW5nJiBzdHIsIGJvb2wgYXBwZW5kRGF0YSkKIAogICAgIFN0YXRlIHN0YXRlID0gbV9zdGF0ZTsK IAotICAgIHdoaWxlICghc3JjLmlzRW1wdHkoKSAmJiAoIWZyYW1lIHx8ICFmcmFtZS0+bG9hZGVy KCktPmlzU2NoZWR1bGVkTG9jYXRpb25DaGFuZ2VQZW5kaW5nKCkpKSB7CisgICAgd2hpbGUgKCFt X3NyYy5pc0VtcHR5KCkgJiYgKCFmcmFtZSB8fCAhZnJhbWUtPmxvYWRlcigpLT5pc1NjaGVkdWxl ZExvY2F0aW9uQ2hhbmdlUGVuZGluZygpKSkgewogICAgICAgICBpZiAoIWNvbnRpbnVlUHJvY2Vz c2luZyhwcm9jZXNzZWRDb3VudCwgc3RhcnRUaW1lLCBzdGF0ZSkpCiAgICAgICAgICAgICBicmVh azsKIAogICAgICAgICAvLyBkbyB3ZSBuZWVkIHRvIGVubGFyZ2UgdGhlIGJ1ZmZlcj8KICAgICAg ICAgY2hlY2tCdWZmZXIoKTsKIAotICAgICAgICBVQ2hhciBjYyA9ICpzcmM7CisgICAgICAgIFVD aGFyIGNjID0gKm1fc3JjOwogCiAgICAgICAgIGJvb2wgd2FzU2tpcExGID0gc3RhdGUuc2tpcExG KCk7CiAgICAgICAgIGlmICh3YXNTa2lwTEYpCiAgICAgICAgICAgICBzdGF0ZS5zZXRTa2lwTEYo ZmFsc2UpOwogCiAgICAgICAgIGlmICh3YXNTa2lwTEYgJiYgKGNjID09ICdcbicpKQotICAgICAg ICAgICAgc3JjLmFkdmFuY2UoKTsKKyAgICAgICAgICAgIG1fc3JjLmFkdmFuY2UoKTsKICAgICAg ICAgZWxzZSBpZiAoc3RhdGUubmVlZHNTcGVjaWFsV3JpdGVIYW5kbGluZygpKSB7CiAgICAgICAg ICAgICAvLyBpdCdzIGltcG9ydGFudCB0byBrZWVwIG5lZWRzU3BlY2lhbFdyaXRlSGFuZGxpbmcg d2l0aCB0aGUgZmxhZ3MgdGhpcyBibG9jayB0ZXN0cwogICAgICAgICAgICAgaWYgKHN0YXRlLmhh c0VudGl0eVN0YXRlKCkpCi0gICAgICAgICAgICAgICAgc3RhdGUgPSBwYXJzZUVudGl0eShzcmMs IGRlc3QsIHN0YXRlLCBtX2NCdWZmZXJQb3MsIGZhbHNlLCBzdGF0ZS5oYXNUYWdTdGF0ZSgpKTsK KyAgICAgICAgICAgICAgICBzdGF0ZSA9IHBhcnNlRW50aXR5KG1fc3JjLCBkZXN0LCBzdGF0ZSwg bV9jQnVmZmVyUG9zLCBmYWxzZSwgc3RhdGUuaGFzVGFnU3RhdGUoKSk7CiAgICAgICAgICAgICBl bHNlIGlmIChzdGF0ZS5pblBsYWluVGV4dCgpKQotICAgICAgICAgICAgICAgIHN0YXRlID0gcGFy c2VUZXh0KHNyYywgc3RhdGUpOworICAgICAgICAgICAgICAgIHN0YXRlID0gcGFyc2VUZXh0KG1f c3JjLCBzdGF0ZSk7CiAgICAgICAgICAgICBlbHNlIGlmIChzdGF0ZS5pbkFueVNwZWNpYWwoKSkK LSAgICAgICAgICAgICAgICBzdGF0ZSA9IHBhcnNlU3BlY2lhbChzcmMsIHN0YXRlKTsKKyAgICAg ICAgICAgICAgICBzdGF0ZSA9IHBhcnNlU3BlY2lhbChtX3NyYywgc3RhdGUpOwogICAgICAgICAg ICAgZWxzZSBpZiAoc3RhdGUuaW5Db21tZW50KCkpCi0gICAgICAgICAgICAgICAgc3RhdGUgPSBw YXJzZUNvbW1lbnQoc3JjLCBzdGF0ZSk7CisgICAgICAgICAgICAgICAgc3RhdGUgPSBwYXJzZUNv bW1lbnQobV9zcmMsIHN0YXRlKTsKICAgICAgICAgICAgIGVsc2UgaWYgKHN0YXRlLmluRG9jdHlw ZSgpKQotICAgICAgICAgICAgICAgIHN0YXRlID0gcGFyc2VEb2N0eXBlKHNyYywgc3RhdGUpOwor ICAgICAgICAgICAgICAgIHN0YXRlID0gcGFyc2VEb2N0eXBlKG1fc3JjLCBzdGF0ZSk7CiAgICAg ICAgICAgICBlbHNlIGlmIChzdGF0ZS5pblNlcnZlcigpKQotICAgICAgICAgICAgICAgIHN0YXRl ID0gcGFyc2VTZXJ2ZXIoc3JjLCBzdGF0ZSk7CisgICAgICAgICAgICAgICAgc3RhdGUgPSBwYXJz ZVNlcnZlcihtX3NyYywgc3RhdGUpOwogICAgICAgICAgICAgZWxzZSBpZiAoc3RhdGUuaW5Qcm9j ZXNzaW5nSW5zdHJ1Y3Rpb24oKSkKLSAgICAgICAgICAgICAgICBzdGF0ZSA9IHBhcnNlUHJvY2Vz c2luZ0luc3RydWN0aW9uKHNyYywgc3RhdGUpOworICAgICAgICAgICAgICAgIHN0YXRlID0gcGFy c2VQcm9jZXNzaW5nSW5zdHJ1Y3Rpb24obV9zcmMsIHN0YXRlKTsKICAgICAgICAgICAgIGVsc2Ug aWYgKHN0YXRlLmhhc1RhZ1N0YXRlKCkpCi0gICAgICAgICAgICAgICAgc3RhdGUgPSBwYXJzZVRh ZyhzcmMsIHN0YXRlKTsKKyAgICAgICAgICAgICAgICBzdGF0ZSA9IHBhcnNlVGFnKG1fc3JjLCBz dGF0ZSk7CiAgICAgICAgICAgICBlbHNlIGlmIChzdGF0ZS5zdGFydFRhZygpKSB7CiAgICAgICAg ICAgICAgICAgc3RhdGUuc2V0U3RhcnRUYWcoZmFsc2UpOwogICAgICAgICAgICAgICAgIApAQCAt MTY5MCw3ICsxNjkwLDcgQEAgYm9vbCBIVE1MVG9rZW5pemVyOjp3cml0ZShjb25zdCBTZWdtZW50 ZWRTdHJpbmcmIHN0ciwgYm9vbCBhcHBlbmREYXRhKQogICAgICAgICAgICAgICAgICAgICAvLyB4 bWwgcHJvY2Vzc2luZyBpbnN0cnVjdGlvbgogICAgICAgICAgICAgICAgICAgICBzdGF0ZS5zZXRJ blByb2Nlc3NpbmdJbnN0cnVjdGlvbih0cnVlKTsKICAgICAgICAgICAgICAgICAgICAgdHF1b3Rl ID0gTm9RdW90ZTsKLSAgICAgICAgICAgICAgICAgICAgc3RhdGUgPSBwYXJzZVByb2Nlc3NpbmdJ bnN0cnVjdGlvbihzcmMsIHN0YXRlKTsKKyAgICAgICAgICAgICAgICAgICAgc3RhdGUgPSBwYXJz ZVByb2Nlc3NpbmdJbnN0cnVjdGlvbihtX3NyYywgc3RhdGUpOwogICAgICAgICAgICAgICAgICAg ICBjb250aW51ZTsKIAogICAgICAgICAgICAgICAgICAgICBicmVhazsKQEAgLTE3MDAsNyArMTcw MCw3IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6d3JpdGUoY29uc3QgU2VnbWVudGVkU3RyaW5nJiBz dHIsIGJvb2wgYXBwZW5kRGF0YSkKICAgICAgICAgICAgICAgICAgICAgICAgIC8vIDwlIHNlcnZl ciBzdHVmZiwgaGFuZGxlIGFzIGNvbW1lbnQgJT4KICAgICAgICAgICAgICAgICAgICAgICAgIHN0 YXRlLnNldEluU2VydmVyKHRydWUpOwogICAgICAgICAgICAgICAgICAgICAgICAgdHF1b3RlID0g Tm9RdW90ZTsKLSAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRlID0gcGFyc2VTZXJ2ZXIoc3Jj LCBzdGF0ZSk7CisgICAgICAgICAgICAgICAgICAgICAgICBzdGF0ZSA9IHBhcnNlU2VydmVyKG1f c3JjLCBzdGF0ZSk7CiAgICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAg ICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICAvLyBlbHNlIGZhbGwgdGhyb3VnaApA QCAtMTcyMSwxNCArMTcyMSwxNCBAQCBib29sIEhUTUxUb2tlbml6ZXI6OndyaXRlKGNvbnN0IFNl Z21lbnRlZFN0cmluZyYgc3RyLCBib29sIGFwcGVuZERhdGEpCiAKICAgICAgICAgICAgICAgICBt X2NCdWZmZXJQb3MgPSAwOwogICAgICAgICAgICAgICAgIHN0YXRlLnNldFRhZ1N0YXRlKFRhZ05h bWUpOwotICAgICAgICAgICAgICAgIHN0YXRlID0gcGFyc2VUYWcoc3JjLCBzdGF0ZSk7CisgICAg ICAgICAgICAgICAgc3RhdGUgPSBwYXJzZVRhZyhtX3NyYywgc3RhdGUpOwogICAgICAgICAgICAg fQotICAgICAgICB9IGVsc2UgaWYgKGNjID09ICcmJyAmJiAhc3JjLmVzY2FwZWQoKSkgewotICAg ICAgICAgICAgc3JjLmFkdmFuY2VQYXN0Tm9uTmV3bGluZSgpOwotICAgICAgICAgICAgc3RhdGUg PSBwYXJzZUVudGl0eShzcmMsIGRlc3QsIHN0YXRlLCBtX2NCdWZmZXJQb3MsIHRydWUsIHN0YXRl Lmhhc1RhZ1N0YXRlKCkpOwotICAgICAgICB9IGVsc2UgaWYgKGNjID09ICc8JyAmJiAhc3JjLmVz Y2FwZWQoKSkgeworICAgICAgICB9IGVsc2UgaWYgKGNjID09ICcmJyAmJiAhbV9zcmMuZXNjYXBl ZCgpKSB7CisgICAgICAgICAgICBtX3NyYy5hZHZhbmNlUGFzdE5vbk5ld2xpbmUoKTsKKyAgICAg ICAgICAgIHN0YXRlID0gcGFyc2VFbnRpdHkobV9zcmMsIGRlc3QsIHN0YXRlLCBtX2NCdWZmZXJQ b3MsIHRydWUsIHN0YXRlLmhhc1RhZ1N0YXRlKCkpOworICAgICAgICB9IGVsc2UgaWYgKGNjID09 ICc8JyAmJiAhbV9zcmMuZXNjYXBlZCgpKSB7CiAgICAgICAgICAgICB0YWdTdGFydExpbmVubyA9 IG1fbGluZU51bWJlcjsKLSAgICAgICAgICAgIHNyYy5hZHZhbmNlUGFzdE5vbk5ld2xpbmUoKTsK KyAgICAgICAgICAgIG1fc3JjLmFkdmFuY2VQYXN0Tm9uTmV3bGluZSgpOwogICAgICAgICAgICAg c3RhdGUuc2V0U3RhcnRUYWcodHJ1ZSk7CiAgICAgICAgICAgICBzdGF0ZS5zZXREaXNjYXJkTEYo ZmFsc2UpOwogICAgICAgICB9IGVsc2UgaWYgKGNjID09ICdcbicgfHwgY2MgPT0gJ1xyJykgewpA QCAtMTczOCwxOCArMTczOCwxOCBAQCBib29sIEhUTUxUb2tlbml6ZXI6OndyaXRlKGNvbnN0IFNl Z21lbnRlZFN0cmluZyYgc3RyLCBib29sIGFwcGVuZERhdGEpCiAgICAgICAgICAgICBlbHNlIHsK ICAgICAgICAgICAgICAgICAvLyBQcm9jZXNzIHRoaXMgTEYKICAgICAgICAgICAgICAgICAqZGVz dCsrID0gJ1xuJzsKLSAgICAgICAgICAgICAgICBpZiAoY2MgPT0gJ1xyJyAmJiAhc3JjLmV4Y2x1 ZGVMaW5lTnVtYmVycygpKQorICAgICAgICAgICAgICAgIGlmIChjYyA9PSAnXHInICYmICFtX3Ny Yy5leGNsdWRlTGluZU51bWJlcnMoKSkKICAgICAgICAgICAgICAgICAgICAgbV9saW5lTnVtYmVy Kys7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIC8qIENoZWNrIGZvciBNUy1ET1MgQ1JM RiBzZXF1ZW5jZSAqLwogICAgICAgICAgICAgaWYgKGNjID09ICdccicpCiAgICAgICAgICAgICAg ICAgc3RhdGUuc2V0U2tpcExGKHRydWUpOwotICAgICAgICAgICAgc3JjLmFkdmFuY2UobV9saW5l TnVtYmVyKTsKKyAgICAgICAgICAgIG1fc3JjLmFkdmFuY2UobV9saW5lTnVtYmVyKTsKICAgICAg ICAgfSBlbHNlIHsKICAgICAgICAgICAgIHN0YXRlLnNldERpc2NhcmRMRihmYWxzZSk7CiAgICAg ICAgICAgICAqZGVzdCsrID0gY2M7Ci0gICAgICAgICAgICBzcmMuYWR2YW5jZVBhc3ROb25OZXds aW5lKCk7CisgICAgICAgICAgICBtX3NyYy5hZHZhbmNlUGFzdE5vbk5ld2xpbmUoKTsKICAgICAg ICAgfQogICAgIH0KICAgICAKQEAgLTIwMTMsOSArMjAxMyw5IEBAIGJvb2wgSFRNTFRva2VuaXpl cjo6aXNXYWl0aW5nRm9yU2NyaXB0cygpIGNvbnN0CiAgICAgcmV0dXJuIG1fc3RhdGUubG9hZGlu Z0V4dFNjcmlwdCgpOwogfQogCi12b2lkIEhUTUxUb2tlbml6ZXI6OnNldFNyYyhjb25zdCBTZWdt ZW50ZWRTdHJpbmcgJnNvdXJjZSkKK3ZvaWQgSFRNTFRva2VuaXplcjo6c2V0U3JjKGNvbnN0IFNl Z21lbnRlZFN0cmluZyYgc291cmNlKQogewotICAgIHNyYyA9IHNvdXJjZTsKKyAgICBtX3NyYyA9 IHNvdXJjZTsKIH0KIAogdm9pZCBwYXJzZUhUTUxEb2N1bWVudEZyYWdtZW50KGNvbnN0IFN0cmlu ZyYgc291cmNlLCBEb2N1bWVudEZyYWdtZW50KiBmcmFnbWVudCkKZGlmZiAtLWdpdCBhL1dlYkNv cmUvaHRtbC9IVE1MVG9rZW5pemVyLmggYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5oCmlu ZGV4IDQxYTE0NWQuLmQwYzgyYzMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5p emVyLmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuaApAQCAtMTQ0LDcgKzE0NCw3 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGludCBsaW5lTnVtYmVyKCkgY29uc3QgeyByZXR1cm4g bV9saW5lTnVtYmVyOyB9CiAgICAgdmlydHVhbCBpbnQgY29sdW1uTnVtYmVyKCkgY29uc3QgeyBy ZXR1cm4gMTsgfQogCi0gICAgYm9vbCBwcm9jZXNzaW5nQ29udGVudFdyaXR0ZW5CeVNjcmlwdCgp IGNvbnN0IHsgcmV0dXJuIHNyYy5leGNsdWRlTGluZU51bWJlcnMoKTsgfQorICAgIGJvb2wgcHJv Y2Vzc2luZ0NvbnRlbnRXcml0dGVuQnlTY3JpcHQoKSBjb25zdCB7IHJldHVybiBtX3NyYy5leGNs dWRlTGluZU51bWJlcnMoKTsgfQogICAgIAogICAgIHZpcnR1YWwgdm9pZCBleGVjdXRlU2NyaXB0 c1dhaXRpbmdGb3JTdHlsZXNoZWV0cygpOwogICAgIApAQCAtNDAzLDcgKzQwMyw3IEBAIHByaXZh dGU6CiAgICAgVUNoYXIgbV9jQnVmZmVyW0NCVUZMRU4gKyAyXTsKICAgICB1bnNpZ25lZCBpbnQg bV9jQnVmZmVyUG9zOwogCi0gICAgU2VnbWVudGVkU3RyaW5nIHNyYzsKKyAgICBTZWdtZW50ZWRT dHJpbmcgbV9zcmM7CiAgICAgRG9jdW1lbnQqIG1fZG9jOwogICAgIEhUTUxQYXJzZXIqIHBhcnNl cjsKICAgICBib29sIGluV3JpdGU7Cg== 25065 2008-11-11 15:17:53 -0800 2008-11-11 16:05:20 -0800 Rename parser to m_parser and make it an OwnPtr Rename-parser-to-m_parser-and-make-it-an-OwnPtr.patch text/plain 4461 eric ZTgwOWNhNjAzNWM0OWZlNTUyMTMyZDNjMzMzZDZjYTc1ZDNmNzcxYgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu Y3BwCmluZGV4IGYzNmU2Y2YuLjIwMzkzOTMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTE2 MCw3ICsxNjAsNyBAQCBIVE1MVG9rZW5pemVyOjpIVE1MVG9rZW5pemVyKEhUTUxEb2N1bWVudCog ZG9jLCBib29sIHJlcG9ydEVycm9ycykKICAgICAsIG1faGFzU2NyaXB0c1dhaXRpbmdGb3JTdHls ZXNoZWV0cyhmYWxzZSkKICAgICAsIG1fdGltZXIodGhpcywgJkhUTUxUb2tlbml6ZXI6OnRpbWVy RmlyZWQpCiAgICAgLCBtX2RvYyhkb2MpCi0gICAgLCBwYXJzZXIobmV3IEhUTUxQYXJzZXIoZG9j LCByZXBvcnRFcnJvcnMpKQorICAgICwgbV9wYXJzZXIobmV3IEhUTUxQYXJzZXIoZG9jLCByZXBv cnRFcnJvcnMpKQogICAgICwgaW5Xcml0ZShmYWxzZSkKICAgICAsIG1fZnJhZ21lbnQoZmFsc2Up CiB7CkBAIC0xNzksNyArMTc5LDcgQEAgSFRNTFRva2VuaXplcjo6SFRNTFRva2VuaXplcihIVE1M Vmlld1NvdXJjZURvY3VtZW50KiBkb2MpCiAgICAgLCBtX2hhc1NjcmlwdHNXYWl0aW5nRm9yU3R5 bGVzaGVldHMoZmFsc2UpCiAgICAgLCBtX3RpbWVyKHRoaXMsICZIVE1MVG9rZW5pemVyOjp0aW1l ckZpcmVkKQogICAgICwgbV9kb2MoZG9jKQotICAgICwgcGFyc2VyKDApCisgICAgLCBtX3BhcnNl cigwKQogICAgICwgaW5Xcml0ZShmYWxzZSkKICAgICAsIG1fZnJhZ21lbnQoZmFsc2UpCiB7CkBA IC0xOTcsMTAgKzE5NywxMCBAQCBIVE1MVG9rZW5pemVyOjpIVE1MVG9rZW5pemVyKERvY3VtZW50 RnJhZ21lbnQqIGZyYWcpCiAgICAgLCBtX2hhc1NjcmlwdHNXYWl0aW5nRm9yU3R5bGVzaGVldHMo ZmFsc2UpCiAgICAgLCBtX3RpbWVyKHRoaXMsICZIVE1MVG9rZW5pemVyOjp0aW1lckZpcmVkKQog ICAgICwgbV9kb2MoZnJhZy0+ZG9jdW1lbnQoKSkKKyAgICAsIG1fcGFyc2VyKG5ldyBIVE1MUGFy c2VyKGZyYWcpKQogICAgICwgaW5Xcml0ZShmYWxzZSkKICAgICAsIG1fZnJhZ21lbnQodHJ1ZSkK IHsKLSAgICBwYXJzZXIgPSBuZXcgSFRNTFBhcnNlcihmcmFnKTsKICAgICBiZWdpbigpOwogfQog CkBAIC00MjYsNyArNDI2LDcgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6 c2NyaXB0SGFuZGxlcihTdGF0ZSBzdGF0ZSkKICAgICBpZiAoIWluVmlld1NvdXJjZU1vZGUoKSkg ewogICAgICAgICBpZiAoIXNjcmlwdFNyYy5pc0VtcHR5KCkgJiYgbV9kb2MtPmZyYW1lKCkpIHsK ICAgICAgICAgICAgIC8vIGZvcmdldCB3aGF0IHdlIGp1c3QgZ290OyBsb2FkIGZyb20gc3JjIHVy bCBpbnN0ZWFkCi0gICAgICAgICAgICBpZiAoIXBhcnNlci0+c2tpcE1vZGUoKSAmJiAhZm9sbG93 aW5nRnJhbWVzZXQpIHsKKyAgICAgICAgICAgIGlmICghbV9wYXJzZXItPnNraXBNb2RlKCkgJiYg IWZvbGxvd2luZ0ZyYW1lc2V0KSB7CiAjaWZkZWYgSU5TVFJVTUVOVF9MQVlPVVRfU0NIRURVTElO RwogICAgICAgICAgICAgICAgIGlmICghbV9kb2MtPm93bmVyRWxlbWVudCgpKQogICAgICAgICAg ICAgICAgICAgICBwcmludGYoIlJlcXVlc3Rpbmcgc2NyaXB0IGF0IHRpbWUgJWRcbiIsIG1fZG9j LT5lbGFwc2VkVGltZSgpKTsKQEAgLTQ3NCw3ICs0NzQsNyBAQCBIVE1MVG9rZW5pemVyOjpTdGF0 ZSBIVE1MVG9rZW5pemVyOjpzY3JpcHRIYW5kbGVyKFN0YXRlIHN0YXRlKQogICAgIFNlZ21lbnRl ZFN0cmluZyBwcmVwZW5kaW5nU3JjOwogICAgIG1fY3VycmVudFByZXBlbmRpbmdTcmMgPSAmcHJl cGVuZGluZ1NyYzsKIAotICAgIGlmICghcGFyc2VyLT5za2lwTW9kZSgpICYmICFmb2xsb3dpbmdG cmFtZXNldCkgeworICAgIGlmICghbV9wYXJzZXItPnNraXBNb2RlKCkgJiYgIWZvbGxvd2luZ0Zy YW1lc2V0KSB7CiAgICAgICAgIGlmIChjcykgewogICAgICAgICAgICAgaWYgKHNhdmVkUHJlcGVu ZGluZ1NyYykKICAgICAgICAgICAgICAgICBzYXZlZFByZXBlbmRpbmdTcmMtPmFwcGVuZChtX3Ny Yyk7CkBAIC0xNDYzLDcgKzE0NjMsNyBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5p emVyOjpwYXJzZVRhZyhTZWdtZW50ZWRTdHJpbmcmIHNyYywgU3RhdGUgc3RhdGUpCiAgICAgICAg ICAgICAvLyBjb21wYXRpYmlsaXR5LgogICAgICAgICAgICAgYm9vbCBpc1NlbGZDbG9zaW5nU2Ny aXB0ID0gY3VyclRva2VuLmZsYXQgJiYgY3VyclRva2VuLmJlZ2luVGFnICYmIGN1cnJUb2tlbi50 YWdOYW1lID09IHNjcmlwdFRhZzsKICAgICAgICAgICAgIGJvb2wgYmVnaW5UYWcgPSAhY3VyclRv a2VuLmZsYXQgJiYgY3VyclRva2VuLmJlZ2luVGFnOwotICAgICAgICAgICAgaWYgKGN1cnJUb2tl bi5iZWdpblRhZyAmJiBjdXJyVG9rZW4udGFnTmFtZSA9PSBzY3JpcHRUYWcgJiYgIWluVmlld1Nv dXJjZU1vZGUoKSAmJiAhcGFyc2VyLT5za2lwTW9kZSgpKSB7CisgICAgICAgICAgICBpZiAoY3Vy clRva2VuLmJlZ2luVGFnICYmIGN1cnJUb2tlbi50YWdOYW1lID09IHNjcmlwdFRhZyAmJiAhaW5W aWV3U291cmNlTW9kZSgpICYmICFtX3BhcnNlci0+c2tpcE1vZGUoKSkgewogICAgICAgICAgICAg ICAgIEF0dHJpYnV0ZSogYSA9IDA7CiAgICAgICAgICAgICAgICAgc2NyaXB0U3JjID0gU3RyaW5n KCk7CiAgICAgICAgICAgICAgICAgc2NyaXB0U3JjQ2hhcnNldCA9IFN0cmluZygpOwpAQCAtMTgy Miw3ICsxODIyLDcgQEAgdm9pZCBIVE1MVG9rZW5pemVyOjplbmQoKQogICAgIH0KIAogICAgIGlm ICghaW5WaWV3U291cmNlTW9kZSgpKQotICAgICAgICBwYXJzZXItPmZpbmlzaGVkKCk7CisgICAg ICAgIG1fcGFyc2VyLT5maW5pc2hlZCgpOwogICAgIGVsc2UKICAgICAgICAgbV9kb2MtPmZpbmlz aGVkUGFyc2luZygpOwogfQpAQCAtMTg5Miw3ICsxODkyLDcgQEAgUGFzc1JlZlB0cjxOb2RlPiBI VE1MVG9rZW5pemVyOjpwcm9jZXNzVG9rZW4oKQogICAgICAgICAgICAgc3RhdGljX2Nhc3Q8SFRN TFZpZXdTb3VyY2VEb2N1bWVudCo+KG1fZG9jKS0+YWRkVmlld1NvdXJjZVRva2VuKCZjdXJyVG9r ZW4pOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICAvLyBwYXNzIHRoZSB0b2tlbiBvdmVyIHRv IHRoZSBwYXJzZXIsIHRoZSBwYXJzZXIgRE9FUyBOT1QgZGVsZXRlIHRoZSB0b2tlbgotICAgICAg ICAgICAgbiA9IHBhcnNlci0+cGFyc2VUb2tlbigmY3VyclRva2VuKTsKKyAgICAgICAgICAgIG4g PSBtX3BhcnNlci0+cGFyc2VUb2tlbigmY3VyclRva2VuKTsKICAgICB9CiAgICAgY3VyclRva2Vu LnJlc2V0KCk7CiAgICAgaWYgKGpzUHJveHkpCkBAIC0xOTA2LDE0ICsxOTA2LDEzIEBAIHZvaWQg SFRNTFRva2VuaXplcjo6cHJvY2Vzc0RvY3R5cGVUb2tlbigpCiAgICAgaWYgKGluVmlld1NvdXJj ZU1vZGUoKSkKICAgICAgICAgc3RhdGljX2Nhc3Q8SFRNTFZpZXdTb3VyY2VEb2N1bWVudCo+KG1f ZG9jKS0+YWRkVmlld1NvdXJjZURvY3R5cGVUb2tlbigmbV9kb2N0eXBlVG9rZW4pOwogICAgIGVs c2UKLSAgICAgICAgcGFyc2VyLT5wYXJzZURvY3R5cGVUb2tlbigmbV9kb2N0eXBlVG9rZW4pOwor ICAgICAgICBtX3BhcnNlci0+cGFyc2VEb2N0eXBlVG9rZW4oJm1fZG9jdHlwZVRva2VuKTsKIH0K IAogSFRNTFRva2VuaXplcjo6fkhUTUxUb2tlbml6ZXIoKQogewogICAgIEFTU0VSVCghaW5Xcml0 ZSk7CiAgICAgcmVzZXQoKTsKLSAgICBkZWxldGUgcGFyc2VyOwogfQogCiAKZGlmZiAtLWdpdCBh L1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmggYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXpl ci5oCmluZGV4IGQwYzgyYzMuLjNlMDA4MzEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuaApAQCAtMTQ5LDcg KzE0OSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZXhlY3V0ZVNjcmlwdHNXYWl0aW5n Rm9yU3R5bGVzaGVldHMoKTsKICAgICAKICAgICB2aXJ0dWFsIGJvb2wgaXNIVE1MVG9rZW5pemVy KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQotICAgIEhUTUxQYXJzZXIqIGh0bWxQYXJzZXIoKSBj b25zdCB7IHJldHVybiBwYXJzZXI7IH0KKyAgICBIVE1MUGFyc2VyKiBodG1sUGFyc2VyKCkgY29u c3QgeyByZXR1cm4gbV9wYXJzZXIuZ2V0KCk7IH0KIAogcHJpdmF0ZToKICAgICBjbGFzcyBTdGF0 ZTsKQEAgLTQwNSw3ICs0MDUsNyBAQCBwcml2YXRlOgogCiAgICAgU2VnbWVudGVkU3RyaW5nIG1f c3JjOwogICAgIERvY3VtZW50KiBtX2RvYzsKLSAgICBIVE1MUGFyc2VyKiBwYXJzZXI7CisgICAg T3duUHRyPEhUTUxQYXJzZXI+IG1fcGFyc2VyOwogICAgIGJvb2wgaW5Xcml0ZTsKICAgICBib29s IG1fZnJhZ21lbnQ7CiAK 25066 2008-11-11 15:17:55 -0800 2008-11-11 16:05:48 -0800 Rename inWrite to m_inWrite and jsProxy to scriptController Rename-inWrite-to-m_inWrite-and-jsProxy-to-scriptController.patch text/plain 4734 eric YWM5MDg1YTQwNTJkNzFkNWVmNWU5MzAwODc1Yjc1YmMwMGZiN2YwZApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu Y3BwCmluZGV4IDIwMzkzOTMuLmEzMDg3ZWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTE2 MSw3ICsxNjEsNyBAQCBIVE1MVG9rZW5pemVyOjpIVE1MVG9rZW5pemVyKEhUTUxEb2N1bWVudCog ZG9jLCBib29sIHJlcG9ydEVycm9ycykKICAgICAsIG1fdGltZXIodGhpcywgJkhUTUxUb2tlbml6 ZXI6OnRpbWVyRmlyZWQpCiAgICAgLCBtX2RvYyhkb2MpCiAgICAgLCBtX3BhcnNlcihuZXcgSFRN TFBhcnNlcihkb2MsIHJlcG9ydEVycm9ycykpCi0gICAgLCBpbldyaXRlKGZhbHNlKQorICAgICwg bV9pbldyaXRlKGZhbHNlKQogICAgICwgbV9mcmFnbWVudChmYWxzZSkKIHsKICAgICBiZWdpbigp OwpAQCAtMTgwLDcgKzE4MCw3IEBAIEhUTUxUb2tlbml6ZXI6OkhUTUxUb2tlbml6ZXIoSFRNTFZp ZXdTb3VyY2VEb2N1bWVudCogZG9jKQogICAgICwgbV90aW1lcih0aGlzLCAmSFRNTFRva2VuaXpl cjo6dGltZXJGaXJlZCkKICAgICAsIG1fZG9jKGRvYykKICAgICAsIG1fcGFyc2VyKDApCi0gICAg LCBpbldyaXRlKGZhbHNlKQorICAgICwgbV9pbldyaXRlKGZhbHNlKQogICAgICwgbV9mcmFnbWVu dChmYWxzZSkKIHsKICAgICBiZWdpbigpOwpAQCAtMTk4LDcgKzE5OCw3IEBAIEhUTUxUb2tlbml6 ZXI6OkhUTUxUb2tlbml6ZXIoRG9jdW1lbnRGcmFnbWVudCogZnJhZykKICAgICAsIG1fdGltZXIo dGhpcywgJkhUTUxUb2tlbml6ZXI6OnRpbWVyRmlyZWQpCiAgICAgLCBtX2RvYyhmcmFnLT5kb2N1 bWVudCgpKQogICAgICwgbV9wYXJzZXIobmV3IEhUTUxQYXJzZXIoZnJhZykpCi0gICAgLCBpbldy aXRlKGZhbHNlKQorICAgICwgbV9pbldyaXRlKGZhbHNlKQogICAgICwgbV9mcmFnbWVudCh0cnVl KQogewogICAgIGJlZ2luKCk7CkBAIC0xNjI2LDggKzE2MjYsOCBAQCBib29sIEhUTUxUb2tlbml6 ZXI6OndyaXRlKGNvbnN0IFNlZ21lbnRlZFN0cmluZyYgc3RyLCBib29sIGFwcGVuZERhdGEpCiAg ICAgaWYgKG1fdGltZXIuaXNBY3RpdmUoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAg Ym9vbCB3YXNJbldyaXRlID0gaW5Xcml0ZTsKLSAgICBpbldyaXRlID0gdHJ1ZTsKKyAgICBib29s IHdhc0luV3JpdGUgPSBtX2luV3JpdGU7CisgICAgbV9pbldyaXRlID0gdHJ1ZTsKICAgICAKICNp ZmRlZiBJTlNUUlVNRU5UX0xBWU9VVF9TQ0hFRFVMSU5HCiAgICAgaWYgKCFtX2RvYy0+b3duZXJF bGVtZW50KCkpCkBAIC0xNzU4LDExICsxNzU4LDExIEBAIGJvb2wgSFRNTFRva2VuaXplcjo6d3Jp dGUoY29uc3QgU2VnbWVudGVkU3RyaW5nJiBzdHIsIGJvb2wgYXBwZW5kRGF0YSkKICAgICAgICAg cHJpbnRmKCJFbmRpbmcgd3JpdGUgYXQgdGltZSAlZFxuIiwgbV9kb2MtPmVsYXBzZWRUaW1lKCkp OwogI2VuZGlmCiAgICAgCi0gICAgaW5Xcml0ZSA9IHdhc0luV3JpdGU7CisgICAgbV9pbldyaXRl ID0gd2FzSW5Xcml0ZTsKIAogICAgIG1fc3RhdGUgPSBzdGF0ZTsKIAotICAgIGlmIChtX25vTW9y ZURhdGEgJiYgIWluV3JpdGUgJiYgIXN0YXRlLmxvYWRpbmdFeHRTY3JpcHQoKSAmJiAhbV9leGVj dXRpbmdTY3JpcHQgJiYgIW1fdGltZXIuaXNBY3RpdmUoKSkgeworICAgIGlmIChtX25vTW9yZURh dGEgJiYgIW1faW5Xcml0ZSAmJiAhc3RhdGUubG9hZGluZ0V4dFNjcmlwdCgpICYmICFtX2V4ZWN1 dGluZ1NjcmlwdCAmJiAhbV90aW1lci5pc0FjdGl2ZSgpKSB7CiAgICAgICAgIGVuZCgpOyAvLyB0 aGlzIGFjdHVhbGx5IGNhdXNlcyB1cyB0byBiZSBkZWxldGVkCiAgICAgICAgIHJldHVybiB0cnVl OwogICAgIH0KQEAgLTE3ODIsNyArMTc4Miw3IEBAIHZvaWQgSFRNTFRva2VuaXplcjo6c3RvcFBh cnNpbmcoKQogCiBib29sIEhUTUxUb2tlbml6ZXI6OnByb2Nlc3NpbmdEYXRhKCkgY29uc3QKIHsK LSAgICByZXR1cm4gbV90aW1lci5pc0FjdGl2ZSgpIHx8IGluV3JpdGU7CisgICAgcmV0dXJuIG1f dGltZXIuaXNBY3RpdmUoKSB8fCBtX2luV3JpdGU7CiB9CiAKIHZvaWQgSFRNTFRva2VuaXplcjo6 dGltZXJGaXJlZChUaW1lcjxIVE1MVG9rZW5pemVyPiopCkBAIC0xODYxLDIzICsxODYxLDIzIEBA IHZvaWQgSFRNTFRva2VuaXplcjo6ZmluaXNoKCkKICAgICAvLyB0aGlzIGluZGljYXRlcyB3ZSB3 aWxsIG5vdCByZWNlaXZlIGFueSBtb3JlIGRhdGEuLi4gYnV0IGlmIHdlIGFyZSB3YWl0aW5nIG9u CiAgICAgLy8gYW4gZXh0ZXJuYWwgc2NyaXB0IHRvIGxvYWQsIHdlIGNhbid0IGZpbmlzaCBwYXJz aW5nIHVudGlsIHRoYXQgaXMgZG9uZQogICAgIG1fbm9Nb3JlRGF0YSA9IHRydWU7Ci0gICAgaWYg KCFpbldyaXRlICYmICFtX3N0YXRlLmxvYWRpbmdFeHRTY3JpcHQoKSAmJiAhbV9leGVjdXRpbmdT Y3JpcHQgJiYgIW1fdGltZXIuaXNBY3RpdmUoKSkKKyAgICBpZiAoIW1faW5Xcml0ZSAmJiAhbV9z dGF0ZS5sb2FkaW5nRXh0U2NyaXB0KCkgJiYgIW1fZXhlY3V0aW5nU2NyaXB0ICYmICFtX3RpbWVy LmlzQWN0aXZlKCkpCiAgICAgICAgIGVuZCgpOyAvLyB0aGlzIGFjdHVhbGx5IGNhdXNlcyB1cyB0 byBiZSBkZWxldGVkCiB9CiAKIFBhc3NSZWZQdHI8Tm9kZT4gSFRNTFRva2VuaXplcjo6cHJvY2Vz c1Rva2VuKCkKIHsKLSAgICBTY3JpcHRDb250cm9sbGVyKiBqc1Byb3h5ID0gKCFtX2ZyYWdtZW50 ICYmIG1fZG9jLT5mcmFtZSgpKSA/IG1fZG9jLT5mcmFtZSgpLT5zY3JpcHQoKSA6IDA7Ci0gICAg aWYgKGpzUHJveHkgJiYgbV9kb2MtPmZyYW1lKCktPnNjcmlwdCgpLT5pc0VuYWJsZWQoKSkKLSAg ICAgICAganNQcm94eS0+c2V0RXZlbnRIYW5kbGVyTGluZW5vKHRhZ1N0YXJ0TGluZW5vICsgMSk7 IC8vIFNjcmlwdCBsaW5lIG51bWJlcnMgYXJlIDEgYmFzZWQuCisgICAgU2NyaXB0Q29udHJvbGxl ciogc2NyaXB0Q29udHJvbGxlciA9ICghbV9mcmFnbWVudCAmJiBtX2RvYy0+ZnJhbWUoKSkgPyBt X2RvYy0+ZnJhbWUoKS0+c2NyaXB0KCkgOiAwOworICAgIGlmIChzY3JpcHRDb250cm9sbGVyICYm IHNjcmlwdENvbnRyb2xsZXItPmlzRW5hYmxlZCgpKQorICAgICAgICBzY3JpcHRDb250cm9sbGVy LT5zZXRFdmVudEhhbmRsZXJMaW5lbm8odGFnU3RhcnRMaW5lbm8gKyAxKTsgLy8gU2NyaXB0IGxp bmUgbnVtYmVycyBhcmUgMSBiYXNlZC4KICAgICBpZiAoZGVzdCA+IGJ1ZmZlcikgewogICAgICAg ICBjdXJyVG9rZW4udGV4dCA9IFN0cmluZ0ltcGw6OmNyZWF0ZVN0cmlwcGluZ051bGxDaGFyYWN0 ZXJzKGJ1ZmZlciwgZGVzdCAtIGJ1ZmZlcik7CiAgICAgICAgIGlmIChjdXJyVG9rZW4udGFnTmFt ZSAhPSBjb21tZW50QXRvbSkKICAgICAgICAgICAgIGN1cnJUb2tlbi50YWdOYW1lID0gdGV4dEF0 b207CiAgICAgfSBlbHNlIGlmIChjdXJyVG9rZW4udGFnTmFtZSA9PSBudWxsQXRvbSkgewogICAg ICAgICBjdXJyVG9rZW4ucmVzZXQoKTsKLSAgICAgICAgaWYgKGpzUHJveHkpCi0gICAgICAgICAg ICBqc1Byb3h5LT5zZXRFdmVudEhhbmRsZXJMaW5lbm8obV9saW5lTnVtYmVyICsgMSk7IC8vIFNj cmlwdCBsaW5lIG51bWJlcnMgYXJlIDEgYmFzZWQuCisgICAgICAgIGlmIChzY3JpcHRDb250cm9s bGVyKQorICAgICAgICAgICAgc2NyaXB0Q29udHJvbGxlci0+c2V0RXZlbnRIYW5kbGVyTGluZW5v KG1fbGluZU51bWJlciArIDEpOyAvLyBTY3JpcHQgbGluZSBudW1iZXJzIGFyZSAxIGJhc2VkLgog ICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKQEAgLTE4OTUsOCArMTg5NSw4IEBAIFBhc3NSZWZQ dHI8Tm9kZT4gSFRNTFRva2VuaXplcjo6cHJvY2Vzc1Rva2VuKCkKICAgICAgICAgICAgIG4gPSBt X3BhcnNlci0+cGFyc2VUb2tlbigmY3VyclRva2VuKTsKICAgICB9CiAgICAgY3VyclRva2VuLnJl c2V0KCk7Ci0gICAgaWYgKGpzUHJveHkpCi0gICAgICAgIGpzUHJveHktPnNldEV2ZW50SGFuZGxl ckxpbmVubygwKTsKKyAgICBpZiAoc2NyaXB0Q29udHJvbGxlcikKKyAgICAgICAgc2NyaXB0Q29u dHJvbGxlci0+c2V0RXZlbnRIYW5kbGVyTGluZW5vKDApOwogCiAgICAgcmV0dXJuIG4ucmVsZWFz ZSgpOwogfQpAQCAtMTkxMSw3ICsxOTExLDcgQEAgdm9pZCBIVE1MVG9rZW5pemVyOjpwcm9jZXNz RG9jdHlwZVRva2VuKCkKIAogSFRNTFRva2VuaXplcjo6fkhUTUxUb2tlbml6ZXIoKQogewotICAg IEFTU0VSVCghaW5Xcml0ZSk7CisgICAgQVNTRVJUKCFtX2luV3JpdGUpOwogICAgIHJlc2V0KCk7 CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmggYi9XZWJDb3Jl L2h0bWwvSFRNTFRva2VuaXplci5oCmluZGV4IDNlMDA4MzEuLjdiZjdhNWQgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tl bml6ZXIuaApAQCAtNDA2LDcgKzQwNiw3IEBAIHByaXZhdGU6CiAgICAgU2VnbWVudGVkU3RyaW5n IG1fc3JjOwogICAgIERvY3VtZW50KiBtX2RvYzsKICAgICBPd25QdHI8SFRNTFBhcnNlcj4gbV9w YXJzZXI7Ci0gICAgYm9vbCBpbldyaXRlOworICAgIGJvb2wgbV9pbldyaXRlOwogICAgIGJvb2wg bV9mcmFnbWVudDsKIAogICAgIE93blB0cjxQcmVsb2FkU2Nhbm5lcj4gbV9wcmVsb2FkU2Nhbm5l cjsK 25067 2008-11-11 15:17:58 -0800 2008-11-11 16:06:26 -0800 Rename brokenServer to m_brokenServer Rename-brokenServer-to-m_brokenServer.patch text/plain 1634 eric MTljMzEwNDM3ZmI4Y2Y2MzA5ODc5YzQzY2I2ZWY5ODRkNDc1MmIwNQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu Y3BwCmluZGV4IGEzMDg3ZWUuLmIyNTQ5MmMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTI1 MSw3ICsyNTEsNyBAQCB2b2lkIEhUTUxUb2tlbml6ZXI6OmJlZ2luKCkKICAgICBtX2N1cnJlbnRQ cmVwZW5kaW5nU3JjID0gMDsKICAgICBtX25vTW9yZURhdGEgPSBmYWxzZTsKICAgICBtX2Jyb2tl bkNvbW1lbnRzID0gZmFsc2U7Ci0gICAgYnJva2VuU2VydmVyID0gZmFsc2U7CisgICAgbV9icm9r ZW5TZXJ2ZXIgPSBmYWxzZTsKICAgICBtX2xpbmVOdW1iZXIgPSAwOwogICAgIHNjcmlwdFN0YXJ0 TGluZW5vID0gMDsKICAgICB0YWdTdGFydExpbmVubyA9IDA7CkBAIC0xNjk2LDcgKzE2OTYsNyBA QCBib29sIEhUTUxUb2tlbml6ZXI6OndyaXRlKGNvbnN0IFNlZ21lbnRlZFN0cmluZyYgc3RyLCBi b29sIGFwcGVuZERhdGEpCiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAg ICAgIH0KICAgICAgICAgICAgICAgICBjYXNlICclJzoKLSAgICAgICAgICAgICAgICAgICAgaWYg KCFicm9rZW5TZXJ2ZXIpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFtX2Jyb2tlblNlcnZl cikgewogICAgICAgICAgICAgICAgICAgICAgICAgLy8gPCUgc2VydmVyIHN0dWZmLCBoYW5kbGUg YXMgY29tbWVudCAlPgogICAgICAgICAgICAgICAgICAgICAgICAgc3RhdGUuc2V0SW5TZXJ2ZXIo dHJ1ZSk7CiAgICAgICAgICAgICAgICAgICAgICAgICB0cXVvdGUgPSBOb1F1b3RlOwpAQCAtMTgz NSw3ICsxODM1LDcgQEAgdm9pZCBIVE1MVG9rZW5pemVyOjpmaW5pc2goKQogICAgICAgICBpZiAo bV9zdGF0ZS5pbkNvbW1lbnQoKSkKICAgICAgICAgICAgIG1fYnJva2VuQ29tbWVudHMgPSB0cnVl OwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBicm9rZW5TZXJ2ZXIgPSB0cnVlOworICAgICAg ICAgICAgbV9icm9rZW5TZXJ2ZXIgPSB0cnVlOwogICAgICAgICBjaGVja1NjcmlwdEJ1ZmZlcigp OwogICAgICAgICBzY3JpcHRDb2RlW3NjcmlwdENvZGVTaXplXSA9IDA7CiAgICAgICAgIHNjcmlw dENvZGVbc2NyaXB0Q29kZVNpemUgKyAxXSA9IDA7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwv SFRNTFRva2VuaXplci5oIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuaAppbmRleCA3YmY3 YTVkLi43MGNmNGVhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5oCisr KyBiL1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmgKQEAgLTMzNSw3ICszMzUsNyBAQCBwcml2 YXRlOgogICAgIGludCBtX2RvY3R5cGVTZWFyY2hDb3VudDsKICAgICBpbnQgbV9kb2N0eXBlU2Vj b25kYXJ5U2VhcmNoQ291bnQ7CiAKLSAgICBib29sIGJyb2tlblNlcnZlcjsKKyAgICBib29sIG1f YnJva2VuU2VydmVyOwogCiAgICAgLy8gTmFtZSBvZiBhbiBhdHRyaWJ1dGUgdGhhdCB3ZSBqdXN0 IHNjYW5uZWQuCiAgICAgQXRvbWljU3RyaW5nIGF0dHJOYW1lOwo= 25068 2008-11-11 15:17:59 -0800 2008-11-11 16:06:47 -0800 Rename buffer to m_buffer and dest to m_dest Rename-buffer-to-m_buffer-and-dest-to-m_dest.patch text/plain 16762 eric MjM2ZDM1ZWZhNjdhZDdjZGFmZGU0NDA0MDk5MmE5MjVkMmFjOGE0OApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu Y3BwCmluZGV4IGIyNTQ5MmMuLjU0N2JmN2EgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTE1 MCw3ICsxNTAsNyBAQCBpbmxpbmUgdm9pZCBUb2tlbjo6YWRkQXR0cmlidXRlKERvY3VtZW50KiBk b2MsIEF0b21pY1N0cmluZyYgYXR0ck5hbWUsIGNvbnN0IEF0bwogCiBIVE1MVG9rZW5pemVyOjpI VE1MVG9rZW5pemVyKEhUTUxEb2N1bWVudCogZG9jLCBib29sIHJlcG9ydEVycm9ycykKICAgICA6 IFRva2VuaXplcigpCi0gICAgLCBidWZmZXIoMCkKKyAgICAsIG1fYnVmZmVyKDApCiAgICAgLCBz Y3JpcHRDb2RlKDApCiAgICAgLCBzY3JpcHRDb2RlU2l6ZSgwKQogICAgICwgc2NyaXB0Q29kZU1h eFNpemUoMCkKQEAgLTE2OSw3ICsxNjksNyBAQCBIVE1MVG9rZW5pemVyOjpIVE1MVG9rZW5pemVy KEhUTUxEb2N1bWVudCogZG9jLCBib29sIHJlcG9ydEVycm9ycykKIAogSFRNTFRva2VuaXplcjo6 SFRNTFRva2VuaXplcihIVE1MVmlld1NvdXJjZURvY3VtZW50KiBkb2MpCiAgICAgOiBUb2tlbml6 ZXIodHJ1ZSkKLSAgICAsIGJ1ZmZlcigwKQorICAgICwgbV9idWZmZXIoMCkKICAgICAsIHNjcmlw dENvZGUoMCkKICAgICAsIHNjcmlwdENvZGVTaXplKDApCiAgICAgLCBzY3JpcHRDb2RlTWF4U2l6 ZSgwKQpAQCAtMTg3LDcgKzE4Nyw3IEBAIEhUTUxUb2tlbml6ZXI6OkhUTUxUb2tlbml6ZXIoSFRN TFZpZXdTb3VyY2VEb2N1bWVudCogZG9jKQogfQogCiBIVE1MVG9rZW5pemVyOjpIVE1MVG9rZW5p emVyKERvY3VtZW50RnJhZ21lbnQqIGZyYWcpCi0gICAgOiBidWZmZXIoMCkKKyAgICA6IG1fYnVm ZmVyKDApCiAgICAgLCBzY3JpcHRDb2RlKDApCiAgICAgLCBzY3JpcHRDb2RlU2l6ZSgwKQogICAg ICwgc2NyaXB0Q29kZU1heFNpemUoMCkKQEAgLTIxNSw4ICsyMTUsOCBAQCB2b2lkIEhUTUxUb2tl bml6ZXI6OnJlc2V0KCkKICAgICAgICAgY3MtPnJlbW92ZUNsaWVudCh0aGlzKTsKICAgICB9CiAg ICAgCi0gICAgZmFzdEZyZWUoYnVmZmVyKTsKLSAgICBidWZmZXIgPSBkZXN0ID0gMDsKKyAgICBm YXN0RnJlZShtX2J1ZmZlcik7CisgICAgbV9idWZmZXIgPSBtX2Rlc3QgPSAwOwogICAgIHNpemUg PSAwOwogCiAgICAgZmFzdEZyZWUoc2NyaXB0Q29kZSk7CkBAIC0yNDEsOCArMjQxLDggQEAgdm9p ZCBIVE1MVG9rZW5pemVyOjpiZWdpbigpCiAgICAgbV9zdGF0ZS5zZXRMb2FkaW5nRXh0U2NyaXB0 KGZhbHNlKTsKICAgICByZXNldCgpOwogICAgIHNpemUgPSAyNTQ7Ci0gICAgYnVmZmVyID0gc3Rh dGljX2Nhc3Q8VUNoYXIqPihmYXN0TWFsbG9jKHNpemVvZihVQ2hhcikgKiAyNTQpKTsKLSAgICBk ZXN0ID0gYnVmZmVyOworICAgIG1fYnVmZmVyID0gc3RhdGljX2Nhc3Q8VUNoYXIqPihmYXN0TWFs bG9jKHNpemVvZihVQ2hhcikgKiAyNTQpKTsKKyAgICBtX2Rlc3QgPSBtX2J1ZmZlcjsKICAgICB0 cXVvdGUgPSBOb1F1b3RlOwogICAgIHNlYXJjaENvdW50ID0gMDsKICAgICBtX3N0YXRlLnNldEVu dGl0eVN0YXRlKE5vRW50aXR5KTsKQEAgLTI5NCw3ICsyOTQsNyBAQCBIVE1MVG9rZW5pemVyOjpT dGF0ZSBIVE1MVG9rZW5pemVyOjpwcm9jZXNzTGlzdGluZyhTZWdtZW50ZWRTdHJpbmcgbGlzdCwg U3RhdGUgcwogICAgICAgICAgICAgICAgIC8vIElnbm9yZSB0aGlzIExGCiAgICAgICAgICAgICAg ICAgc3RhdGUuc2V0RGlzY2FyZExGKGZhbHNlKTsgLy8gV2UgaGF2ZSBkaXNjYXJkZWQgMSBMRgog ICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICpkZXN0KysgPSAnXG4nOworICAgICAg ICAgICAgICAgICptX2Rlc3QrKyA9ICdcbic7CiAKICAgICAgICAgICAgIC8qIENoZWNrIGZvciBN Uy1ET1MgQ1JMRiBzZXF1ZW5jZSAqLwogICAgICAgICAgICAgaWYgKCpsaXN0ID09ICdccicpCkBA IC0zMDMsNyArMzAzLDcgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6cHJv Y2Vzc0xpc3RpbmcoU2VnbWVudGVkU3RyaW5nIGxpc3QsIFN0YXRlIHMKICAgICAgICAgICAgIGxp c3QuYWR2YW5jZSgpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgc3RhdGUuc2V0RGlz Y2FyZExGKGZhbHNlKTsKLSAgICAgICAgICAgICpkZXN0KysgPSAqbGlzdDsKKyAgICAgICAgICAg ICptX2Rlc3QrKyA9ICpsaXN0OwogICAgICAgICAgICAgbGlzdC5hZHZhbmNlKCk7CiAgICAgICAg IH0KICAgICB9CkBAIC03MTIsOSArNzEyLDkgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRv a2VuaXplcjo6cGFyc2VUZXh0KFNlZ21lbnRlZFN0cmluZyYgc3JjLCBTdGF0ZSBzdGF0ZSkKIAog ICAgICAgICBpZiAoY2MgPT0gJ1xyJykgewogICAgICAgICAgICAgc3RhdGUuc2V0U2tpcExGKHRy dWUpOwotICAgICAgICAgICAgKmRlc3QrKyA9ICdcbic7CisgICAgICAgICAgICAqbV9kZXN0Kysg PSAnXG4nOwogICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICpkZXN0KysgPSBjYzsKKyAgICAg ICAgICAgICptX2Rlc3QrKyA9IGNjOwogICAgICAgICBzcmMuYWR2YW5jZShtX2xpbmVOdW1iZXIp OwogICAgIH0KIApAQCAtMTEzNiw3ICsxMTM2LDcgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRN TFRva2VuaXplcjo6cGFyc2VUYWcoU2VnbWVudGVkU3RyaW5nJiBzcmMsIFN0YXRlIHN0YXRlKQog ICAgICAgICAgICAgICAgICAgICBpZiAoc2VhcmNoQ291bnQgPT0gNCkgewogICAgICAgICAgICAg ICAgICAgICAgICAgLy8gRm91bmQgJzwhLS0nIHNlcXVlbmNlCiAgICAgICAgICAgICAgICAgICAg ICAgICBzcmMuYWR2YW5jZVBhc3ROb25OZXdsaW5lKCk7Ci0gICAgICAgICAgICAgICAgICAgICAg ICBkZXN0ID0gYnVmZmVyOyAvLyBpZ25vcmUgdGhlIHByZXZpb3VzIHBhcnQgb2YgdGhpcyB0YWcK KyAgICAgICAgICAgICAgICAgICAgICAgIG1fZGVzdCA9IG1fYnVmZmVyOyAvLyBpZ25vcmUgdGhl IHByZXZpb3VzIHBhcnQgb2YgdGhpcyB0YWcKICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRl LnNldEluQ29tbWVudCh0cnVlKTsKICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRlLnNldFRh Z1N0YXRlKE5vVGFnKTsKIApAQCAtMTIyNiw3ICsxMjI2LDcgQEAgSFRNTFRva2VuaXplcjo6U3Rh dGUgSFRNTFRva2VuaXplcjo6cGFyc2VUYWcoU2VnbWVudGVkU3RyaW5nJiBzcmMsIFN0YXRlIHN0 YXRlKQogICAgICAgICAgICAgICAgICAgICBjdXJyVG9rZW4udGFnTmFtZSA9IEF0b21pY1N0cmlu ZyhwdHIpOwogICAgICAgICAgICAgICAgICAgICBjdXJyVG9rZW4uYmVnaW5UYWcgPSBiZWdpblRh ZzsKICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgZGVzdCA9IGJ1ZmZlcjsKKyAg ICAgICAgICAgICAgICBtX2Rlc3QgPSBtX2J1ZmZlcjsKICAgICAgICAgICAgICAgICBzdGF0ZS5z ZXRUYWdTdGF0ZShTZWFyY2hBdHRyaWJ1dGUpOwogICAgICAgICAgICAgICAgIGNCdWZmZXJQb3Mg PSAwOwogICAgICAgICAgICAgfQpAQCAtMTI2MCw4ICsxMjYwLDggQEAgSFRNTFRva2VuaXplcjo6 U3RhdGUgSFRNTFRva2VuaXplcjo6cGFyc2VUYWcoU2VnbWVudGVkU3RyaW5nJiBzcmMsIFN0YXRl IHN0YXRlKQogICAgICAgICAgICAgICAgIGlmIChjdXJjaGFyIDw9ICc+JyAmJiAoY3VyY2hhciA+ PSAnPCcgfHwgaXNBU0NJSVNwYWNlKGN1cmNoYXIpIHx8IGN1cmNoYXIgPT0gJy8nKSkgewogICAg ICAgICAgICAgICAgICAgICBtX2NCdWZmZXJbY0J1ZmZlclBvc10gPSAnXDAnOwogICAgICAgICAg ICAgICAgICAgICBhdHRyTmFtZSA9IEF0b21pY1N0cmluZyhtX2NCdWZmZXIpOwotICAgICAgICAg ICAgICAgICAgICBkZXN0ID0gYnVmZmVyOwotICAgICAgICAgICAgICAgICAgICAqZGVzdCsrID0g MDsKKyAgICAgICAgICAgICAgICAgICAgbV9kZXN0ID0gbV9idWZmZXI7CisgICAgICAgICAgICAg ICAgICAgICptX2Rlc3QrKyA9IDA7CiAgICAgICAgICAgICAgICAgICAgIHN0YXRlLnNldFRhZ1N0 YXRlKFNlYXJjaEVxdWFsKTsKICAgICAgICAgICAgICAgICAgICAgaWYgKGluVmlld1NvdXJjZU1v ZGUoKSkKICAgICAgICAgICAgICAgICAgICAgICAgIGN1cnJUb2tlbi5hZGRWaWV3U291cmNlQ2hh cignYScpOwpAQCAtMTI3OSw4ICsxMjc5LDggQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRv a2VuaXplcjo6cGFyc2VUYWcoU2VnbWVudGVkU3RyaW5nJiBzcmMsIFN0YXRlIHN0YXRlKQogICAg ICAgICAgICAgaWYgKGNCdWZmZXJQb3MgPT0gQ0JVRkxFTikgewogICAgICAgICAgICAgICAgIG1f Y0J1ZmZlcltjQnVmZmVyUG9zXSA9ICdcMCc7CiAgICAgICAgICAgICAgICAgYXR0ck5hbWUgPSBB dG9taWNTdHJpbmcobV9jQnVmZmVyKTsKLSAgICAgICAgICAgICAgICBkZXN0ID0gYnVmZmVyOwot ICAgICAgICAgICAgICAgICpkZXN0KysgPSAwOworICAgICAgICAgICAgICAgIG1fZGVzdCA9IG1f YnVmZmVyOworICAgICAgICAgICAgICAgICptX2Rlc3QrKyA9IDA7CiAgICAgICAgICAgICAgICAg c3RhdGUuc2V0VGFnU3RhdGUoU2VhcmNoRXF1YWwpOwogICAgICAgICAgICAgICAgIGlmIChpblZp ZXdTb3VyY2VNb2RlKCkpCiAgICAgICAgICAgICAgICAgICAgIGN1cnJUb2tlbi5hZGRWaWV3U291 cmNlQ2hhcignYScpOwpAQCAtMTMwOCw3ICsxMzA4LDcgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUg SFRNTFRva2VuaXplcjo6cGFyc2VUYWcoU2VnbWVudGVkU3RyaW5nJiBzcmMsIFN0YXRlIHN0YXRl KQogICAgICAgICAgICAgICAgICAgICAgICAgc3JjLmFkdmFuY2VQYXN0Tm9uTmV3bGluZSgpOwog ICAgICAgICAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgICAgICAgICAgY3Vy clRva2VuLmFkZEF0dHJpYnV0ZShtX2RvYywgYXR0ck5hbWUsIGVtcHR5QXRvbSwgaW5WaWV3U291 cmNlTW9kZSgpKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGRlc3QgPSBidWZmZXI7CisgICAg ICAgICAgICAgICAgICAgICAgICBtX2Rlc3QgPSBtX2J1ZmZlcjsKICAgICAgICAgICAgICAgICAg ICAgICAgIHN0YXRlLnNldFRhZ1N0YXRlKFNlYXJjaEF0dHJpYnV0ZSk7CiAgICAgICAgICAgICAg ICAgICAgICAgICBsYXN0SXNTbGFzaCA9IGZhbHNlOwogICAgICAgICAgICAgICAgICAgICB9CkBA IC0xMzU2LDMxICsxMzU2LDMxIEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6 OnBhcnNlVGFnKFNlZ21lbnRlZFN0cmluZyYgc3JjLCBTdGF0ZSBzdGF0ZSkKICAgICAgICAgICAg ICAgICAgICAgICAgIC8vIEZJWE1FOiBOb3RlIHRoYXQgdGhpcyBpcyBhY3R1YWxseSBub3QgYSB2 ZXJ5IGdvb2Qgc29sdXRpb24uCiAgICAgICAgICAgICAgICAgICAgICAgICAvLyBJdCBkb2Vzbid0 IGhhbmRsZSB0aGUgZ2VuZXJhbCBjYXNlIG9mCiAgICAgICAgICAgICAgICAgICAgICAgICAvLyB1 bm1hdGNoZWQgcXVvdGVzIGFtb25nIGF0dHJpYnV0ZXMgdGhhdCBoYXZlIG5hbWVzLiAtZHdoCi0g ICAgICAgICAgICAgICAgICAgICAgICB3aGlsZSAoZGVzdCA+IGJ1ZmZlciArIDEgJiYgKGRlc3Rb LTFdID09ICdcbicgfHwgZGVzdFstMV0gPT0gJ1xyJykpCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgZGVzdC0tOyAvLyByZW1vdmUgdHJhaWxpbmcgbmV3bGluZXMKLSAgICAgICAgICAgICAg ICAgICAgICAgIEF0b21pY1N0cmluZyB2KGJ1ZmZlciArIDEsIGRlc3QgLSBidWZmZXIgLSAxKTsK LSAgICAgICAgICAgICAgICAgICAgICAgIGlmICghdi5jb250YWlucygnLycpKQotICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGF0dHJOYW1lID0gdjsgLy8gSnVzdCBtYWtlIHRoZSBuYW1lL3Zh bHVlIG1hdGNoLiAoRklYTUU6IElzIHRoaXMgc29tZSBXaW5JRSBxdWlyaz8pCi0gICAgICAgICAg ICAgICAgICAgICAgICBjdXJyVG9rZW4uYWRkQXR0cmlidXRlKG1fZG9jLCBhdHRyTmFtZSwgdiwg aW5WaWV3U291cmNlTW9kZSgpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHdoaWxlIChtX2Rl c3QgPiBtX2J1ZmZlciArIDEgJiYgKG1fZGVzdFstMV0gPT0gJ1xuJyB8fCBtX2Rlc3RbLTFdID09 ICdccicpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fZGVzdC0tOyAvLyByZW1vdmUg dHJhaWxpbmcgbmV3bGluZXMKKyAgICAgICAgICAgICAgICAgICAgICAgIEF0b21pY1N0cmluZyBh dHRyaWJ1dGVWYWx1ZShtX2J1ZmZlciArIDEsIG1fZGVzdCAtIG1fYnVmZmVyIC0gMSk7CisgICAg ICAgICAgICAgICAgICAgICAgICBpZiAoIWF0dHJpYnV0ZVZhbHVlLmNvbnRhaW5zKCcvJykpCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgYXR0ck5hbWUgPSBhdHRyaWJ1dGVWYWx1ZTsgLy8g SnVzdCBtYWtlIHRoZSBuYW1lL3ZhbHVlIG1hdGNoLiAoRklYTUU6IElzIHRoaXMgc29tZSBXaW5J RSBxdWlyaz8pCisgICAgICAgICAgICAgICAgICAgICAgICBjdXJyVG9rZW4uYWRkQXR0cmlidXRl KG1fZG9jLCBhdHRyTmFtZSwgYXR0cmlidXRlVmFsdWUsIGluVmlld1NvdXJjZU1vZGUoKSk7CiAg ICAgICAgICAgICAgICAgICAgICAgICBpZiAoaW5WaWV3U291cmNlTW9kZSgpKQogICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGN1cnJUb2tlbi5hZGRWaWV3U291cmNlQ2hhcigneCcpOwogICAg ICAgICAgICAgICAgICAgICAgICAgc3RhdGUuc2V0VGFnU3RhdGUoU2VhcmNoQXR0cmlidXRlKTsK LSAgICAgICAgICAgICAgICAgICAgICAgIGRlc3QgPSBidWZmZXI7CisgICAgICAgICAgICAgICAg ICAgICAgICBtX2Rlc3QgPSBtX2J1ZmZlcjsKICAgICAgICAgICAgICAgICAgICAgICAgIHRxdW90 ZSA9IE5vUXVvdGU7CiAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAg ICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgaWYg KGN1cmNoYXIgPT0gJyYnKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICBzcmMuYWR2YW5jZVBh c3ROb25OZXdsaW5lKCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBzdGF0ZSA9IHBhcnNlRW50 aXR5KHNyYywgZGVzdCwgc3RhdGUsIGNCdWZmZXJQb3MsIHRydWUsIHRydWUpOworICAgICAgICAg ICAgICAgICAgICAgICAgc3RhdGUgPSBwYXJzZUVudGl0eShzcmMsIG1fZGVzdCwgc3RhdGUsIGNC dWZmZXJQb3MsIHRydWUsIHRydWUpOwogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgICAgICAgICBpZiAoKHRxdW90ZSA9 PSBTaW5nbGVRdW90ZSAmJiBjdXJjaGFyID09ICdcJycpIHx8ICh0cXVvdGUgPT0gRG91YmxlUXVv dGUgJiYgY3VyY2hhciA9PSAnXCInKSkgewogICAgICAgICAgICAgICAgICAgICAgICAgLy8gc29t ZSA8aW5wdXQgdHlwZT1oaWRkZW4+IHJlbHkgb24gdHJhaWxpbmcgc3BhY2VzLiBhcmdoCi0gICAg ICAgICAgICAgICAgICAgICAgICB3aGlsZSAoZGVzdCA+IGJ1ZmZlciArIDEgJiYgKGRlc3RbLTFd ID09ICdcbicgfHwgZGVzdFstMV0gPT0gJ1xyJykpCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgZGVzdC0tOyAvLyByZW1vdmUgdHJhaWxpbmcgbmV3bGluZXMKLSAgICAgICAgICAgICAgICAg ICAgICAgIEF0b21pY1N0cmluZyB2KGJ1ZmZlciArIDEsIGRlc3QgLSBidWZmZXIgLSAxKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIHdoaWxlIChtX2Rlc3QgPiBtX2J1ZmZlciArIDEgJiYgKG1f ZGVzdFstMV0gPT0gJ1xuJyB8fCBtX2Rlc3RbLTFdID09ICdccicpKQorICAgICAgICAgICAgICAg ICAgICAgICAgICAgIG1fZGVzdC0tOyAvLyByZW1vdmUgdHJhaWxpbmcgbmV3bGluZXMKKyAgICAg ICAgICAgICAgICAgICAgICAgIEF0b21pY1N0cmluZyB2KG1fYnVmZmVyICsgMSwgbV9kZXN0IC0g bV9idWZmZXIgLSAxKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChhdHRyTmFtZS5pc0Vt cHR5KCkgJiYgIXYuY29udGFpbnMoJy8nKSkgewogICAgICAgICAgICAgICAgICAgICAgICAgICAg IGF0dHJOYW1lID0gdjsgLy8gTWFrZSB0aGUgbmFtZSBtYXRjaCB0aGUgdmFsdWUuIChGSVhNRTog SXMgdGhpcyBhIFdpbklFIHF1aXJrPykKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAo aW5WaWV3U291cmNlTW9kZSgpKQpAQCAtMTM4OCw3ICsxMzg4LDcgQEAgSFRNTFRva2VuaXplcjo6 U3RhdGUgSFRNTFRva2VuaXplcjo6cGFyc2VUYWcoU2VnbWVudGVkU3RyaW5nJiBzcmMsIFN0YXRl IHN0YXRlKQogICAgICAgICAgICAgICAgICAgICAgICAgfSBlbHNlIGlmIChpblZpZXdTb3VyY2VN b2RlKCkpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3VyclRva2VuLmFkZFZpZXdTb3Vy Y2VDaGFyKCd2Jyk7CiAgICAgICAgICAgICAgICAgICAgICAgICBjdXJyVG9rZW4uYWRkQXR0cmli dXRlKG1fZG9jLCBhdHRyTmFtZSwgdiwgaW5WaWV3U291cmNlTW9kZSgpKTsKLSAgICAgICAgICAg ICAgICAgICAgICAgIGRlc3QgPSBidWZmZXI7CisgICAgICAgICAgICAgICAgICAgICAgICBtX2Rl c3QgPSBtX2J1ZmZlcjsKICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRlLnNldFRhZ1N0YXRl KFNlYXJjaEF0dHJpYnV0ZSk7CiAgICAgICAgICAgICAgICAgICAgICAgICB0cXVvdGUgPSBOb1F1 b3RlOwogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGluVmlld1NvdXJjZU1vZGUoKSkKQEAg LTEzOTgsNyArMTM5OCw3IEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnBh cnNlVGFnKFNlZ21lbnRlZFN0cmluZyYgc3JjLCBTdGF0ZSBzdGF0ZSkKICAgICAgICAgICAgICAg ICAgICAgfQogICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAgICpkZXN0KysgPSBj dXJjaGFyOworICAgICAgICAgICAgICAgICptX2Rlc3QrKyA9IGN1cmNoYXI7CiAgICAgICAgICAg ICAgICAgc3JjLmFkdmFuY2UobV9saW5lTnVtYmVyKTsKICAgICAgICAgICAgIH0KICAgICAgICAg ICAgIGJyZWFrOwpAQCAtMTQxMCwyMyArMTQxMCwyMyBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBI VE1MVG9rZW5pemVyOjpwYXJzZVRhZyhTZWdtZW50ZWRTdHJpbmcmIHNyYywgU3RhdGUgc3RhdGUp CiAgICAgICAgICAgICAgICAgICAgIC8vIHBhcnNlIEVudGl0aWVzCiAgICAgICAgICAgICAgICAg ICAgIGlmIChjdXJjaGFyID09ICcmJykgewogICAgICAgICAgICAgICAgICAgICAgICAgc3JjLmFk dmFuY2VQYXN0Tm9uTmV3bGluZSgpOwotICAgICAgICAgICAgICAgICAgICAgICAgc3RhdGUgPSBw YXJzZUVudGl0eShzcmMsIGRlc3QsIHN0YXRlLCBjQnVmZmVyUG9zLCB0cnVlLCB0cnVlKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIHN0YXRlID0gcGFyc2VFbnRpdHkoc3JjLCBtX2Rlc3QsIHN0 YXRlLCBjQnVmZmVyUG9zLCB0cnVlLCB0cnVlKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIC8vIG5vIHF1 b3Rlcy4gRXZlcnkgc3BhY2UgbWVhbnMgZW5kIG9mIHZhbHVlCiAgICAgICAgICAgICAgICAgICAg IC8vICcvJyBkb2VzIG5vdCBkZWxpbWl0IGluIElFIQogICAgICAgICAgICAgICAgICAgICBpZiAo aXNBU0NJSVNwYWNlKGN1cmNoYXIpIHx8IGN1cmNoYXIgPT0gJz4nKSB7Ci0gICAgICAgICAgICAg ICAgICAgICAgICBBdG9taWNTdHJpbmcgdihidWZmZXIrMSwgZGVzdC1idWZmZXItMSk7Ci0gICAg ICAgICAgICAgICAgICAgICAgICBjdXJyVG9rZW4uYWRkQXR0cmlidXRlKG1fZG9jLCBhdHRyTmFt ZSwgdiwgaW5WaWV3U291cmNlTW9kZSgpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIEF0b21p Y1N0cmluZyBhdHRyaWJ1dGVWYWx1ZShtX2J1ZmZlciArIDEsIG1fZGVzdCAtIG1fYnVmZmVyIC0g MSk7CisgICAgICAgICAgICAgICAgICAgICAgICBjdXJyVG9rZW4uYWRkQXR0cmlidXRlKG1fZG9j LCBhdHRyTmFtZSwgYXR0cmlidXRlVmFsdWUsIGluVmlld1NvdXJjZU1vZGUoKSk7CiAgICAgICAg ICAgICAgICAgICAgICAgICBpZiAoaW5WaWV3U291cmNlTW9kZSgpKQogICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGN1cnJUb2tlbi5hZGRWaWV3U291cmNlQ2hhcigndicpOwotICAgICAgICAg ICAgICAgICAgICAgICAgZGVzdCA9IGJ1ZmZlcjsKKyAgICAgICAgICAgICAgICAgICAgICAgIG1f ZGVzdCA9IG1fYnVmZmVyOwogICAgICAgICAgICAgICAgICAgICAgICAgc3RhdGUuc2V0VGFnU3Rh dGUoU2VhcmNoQXR0cmlidXRlKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAgICAg KmRlc3QrKyA9IGN1cmNoYXI7CisgICAgICAgICAgICAgICAgKm1fZGVzdCsrID0gY3VyY2hhcjsK ICAgICAgICAgICAgICAgICBzcmMuYWR2YW5jZShtX2xpbmVOdW1iZXIpOwogICAgICAgICAgICAg fQogICAgICAgICAgICAgYnJlYWs7CkBAIC0xNTg4LDcgKzE1ODgsNyBAQCBpbmxpbmUgYm9vbCBI VE1MVG9rZW5pemVyOjpjb250aW51ZVByb2Nlc3NpbmcoaW50JiBwcm9jZXNzZWRDb3VudCwgZG91 YmxlIHN0YXJ0VAogCiBib29sIEhUTUxUb2tlbml6ZXI6OndyaXRlKGNvbnN0IFNlZ21lbnRlZFN0 cmluZyYgc3RyLCBib29sIGFwcGVuZERhdGEpCiB7Ci0gICAgaWYgKCFidWZmZXIpCisgICAgaWYg KCFtX2J1ZmZlcikKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIAogICAgIGlmIChtX3BhcnNl clN0b3BwZWQpCkBAIC0xNjM3LDcgKzE2MzcsNyBAQCBib29sIEhUTUxUb2tlbml6ZXI6OndyaXRl KGNvbnN0IFNlZ21lbnRlZFN0cmluZyYgc3RyLCBib29sIGFwcGVuZERhdGEpCiAgICAgaW50IHBy b2Nlc3NlZENvdW50ID0gMDsKICAgICBkb3VibGUgc3RhcnRUaW1lID0gY3VycmVudFRpbWUoKTsK IAotICAgIEZyYW1lICpmcmFtZSA9IG1fZG9jLT5mcmFtZSgpOworICAgIEZyYW1lKiBmcmFtZSA9 IG1fZG9jLT5mcmFtZSgpOwogCiAgICAgU3RhdGUgc3RhdGUgPSBtX3N0YXRlOwogCkBAIC0xNjU5 LDcgKzE2NTksNyBAQCBib29sIEhUTUxUb2tlbml6ZXI6OndyaXRlKGNvbnN0IFNlZ21lbnRlZFN0 cmluZyYgc3RyLCBib29sIGFwcGVuZERhdGEpCiAgICAgICAgIGVsc2UgaWYgKHN0YXRlLm5lZWRz U3BlY2lhbFdyaXRlSGFuZGxpbmcoKSkgewogICAgICAgICAgICAgLy8gaXQncyBpbXBvcnRhbnQg dG8ga2VlcCBuZWVkc1NwZWNpYWxXcml0ZUhhbmRsaW5nIHdpdGggdGhlIGZsYWdzIHRoaXMgYmxv Y2sgdGVzdHMKICAgICAgICAgICAgIGlmIChzdGF0ZS5oYXNFbnRpdHlTdGF0ZSgpKQotICAgICAg ICAgICAgICAgIHN0YXRlID0gcGFyc2VFbnRpdHkobV9zcmMsIGRlc3QsIHN0YXRlLCBtX2NCdWZm ZXJQb3MsIGZhbHNlLCBzdGF0ZS5oYXNUYWdTdGF0ZSgpKTsKKyAgICAgICAgICAgICAgICBzdGF0 ZSA9IHBhcnNlRW50aXR5KG1fc3JjLCBtX2Rlc3QsIHN0YXRlLCBtX2NCdWZmZXJQb3MsIGZhbHNl LCBzdGF0ZS5oYXNUYWdTdGF0ZSgpKTsKICAgICAgICAgICAgIGVsc2UgaWYgKHN0YXRlLmluUGxh aW5UZXh0KCkpCiAgICAgICAgICAgICAgICAgc3RhdGUgPSBwYXJzZVRleHQobV9zcmMsIHN0YXRl KTsKICAgICAgICAgICAgIGVsc2UgaWYgKHN0YXRlLmluQW55U3BlY2lhbCgpKQpAQCAtMTcxMCw4 ICsxNzEwLDggQEAgYm9vbCBIVE1MVG9rZW5pemVyOjp3cml0ZShjb25zdCBTZWdtZW50ZWRTdHJp bmcmIHN0ciwgYm9vbCBhcHBlbmREYXRhKQogICAgICAgICAgICAgICAgICAgICB9IGVsc2Ugewog ICAgICAgICAgICAgICAgICAgICAgICAgLy8gSW52YWxpZCB0YWcKICAgICAgICAgICAgICAgICAg ICAgICAgIC8vIEFkZCBhcyBpcwotICAgICAgICAgICAgICAgICAgICAgICAgKmRlc3QgPSAnPCc7 Ci0gICAgICAgICAgICAgICAgICAgICAgICBkZXN0Kys7CisgICAgICAgICAgICAgICAgICAgICAg ICAqbV9kZXN0ID0gJzwnOworICAgICAgICAgICAgICAgICAgICAgICAgbV9kZXN0Kys7CiAgICAg ICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgICAgICAgICAgfQogICAg ICAgICAgICAgICAgIH0KQEAgLTE3MjUsNyArMTcyNSw3IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6 d3JpdGUoY29uc3QgU2VnbWVudGVkU3RyaW5nJiBzdHIsIGJvb2wgYXBwZW5kRGF0YSkKICAgICAg ICAgICAgIH0KICAgICAgICAgfSBlbHNlIGlmIChjYyA9PSAnJicgJiYgIW1fc3JjLmVzY2FwZWQo KSkgewogICAgICAgICAgICAgbV9zcmMuYWR2YW5jZVBhc3ROb25OZXdsaW5lKCk7Ci0gICAgICAg ICAgICBzdGF0ZSA9IHBhcnNlRW50aXR5KG1fc3JjLCBkZXN0LCBzdGF0ZSwgbV9jQnVmZmVyUG9z LCB0cnVlLCBzdGF0ZS5oYXNUYWdTdGF0ZSgpKTsKKyAgICAgICAgICAgIHN0YXRlID0gcGFyc2VF bnRpdHkobV9zcmMsIG1fZGVzdCwgc3RhdGUsIG1fY0J1ZmZlclBvcywgdHJ1ZSwgc3RhdGUuaGFz VGFnU3RhdGUoKSk7CiAgICAgICAgIH0gZWxzZSBpZiAoY2MgPT0gJzwnICYmICFtX3NyYy5lc2Nh cGVkKCkpIHsKICAgICAgICAgICAgIHRhZ1N0YXJ0TGluZW5vID0gbV9saW5lTnVtYmVyOwogICAg ICAgICAgICAgbV9zcmMuYWR2YW5jZVBhc3ROb25OZXdsaW5lKCk7CkBAIC0xNzM3LDcgKzE3Mzcs NyBAQCBib29sIEhUTUxUb2tlbml6ZXI6OndyaXRlKGNvbnN0IFNlZ21lbnRlZFN0cmluZyYgc3Ry LCBib29sIGFwcGVuZERhdGEpCiAgICAgICAgICAgICAgICAgc3RhdGUuc2V0RGlzY2FyZExGKGZh bHNlKTsgLy8gV2UgaGF2ZSBkaXNjYXJkZWQgMSBMRgogICAgICAgICAgICAgZWxzZSB7CiAgICAg ICAgICAgICAgICAgLy8gUHJvY2VzcyB0aGlzIExGCi0gICAgICAgICAgICAgICAgKmRlc3QrKyA9 ICdcbic7CisgICAgICAgICAgICAgICAgKm1fZGVzdCsrID0gJ1xuJzsKICAgICAgICAgICAgICAg ICBpZiAoY2MgPT0gJ1xyJyAmJiAhbV9zcmMuZXhjbHVkZUxpbmVOdW1iZXJzKCkpCiAgICAgICAg ICAgICAgICAgICAgIG1fbGluZU51bWJlcisrOwogICAgICAgICAgICAgfQpAQCAtMTc0OCw3ICsx NzQ4LDcgQEAgYm9vbCBIVE1MVG9rZW5pemVyOjp3cml0ZShjb25zdCBTZWdtZW50ZWRTdHJpbmcm IHN0ciwgYm9vbCBhcHBlbmREYXRhKQogICAgICAgICAgICAgbV9zcmMuYWR2YW5jZShtX2xpbmVO dW1iZXIpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgc3RhdGUuc2V0RGlzY2FyZExG KGZhbHNlKTsKLSAgICAgICAgICAgICpkZXN0KysgPSBjYzsKKyAgICAgICAgICAgICptX2Rlc3Qr KyA9IGNjOwogICAgICAgICAgICAgbV9zcmMuYWR2YW5jZVBhc3ROb25OZXdsaW5lKCk7CiAgICAg ICAgIH0KICAgICB9CkBAIC0xODA4LDcgKzE4MDgsNyBAQCB2b2lkIEhUTUxUb2tlbml6ZXI6OmVu ZCgpCiAgICAgQVNTRVJUKCFtX3RpbWVyLmlzQWN0aXZlKCkpOwogICAgIG1fdGltZXIuc3RvcCgp OyAvLyBPbmx5IGhlbHBzIGlmIGFzc2VydGlvbiBhYm92ZSBmaXJlcywgYnV0IGRvIGl0IGFueXdh eS4KIAotICAgIGlmIChidWZmZXIpIHsKKyAgICBpZiAobV9idWZmZXIpIHsKICAgICAgICAgLy8g cGFyc2VUYWcgaXMgdXNpbmcgdGhlIGJ1ZmZlciBmb3IgZGlmZmVyZW50IG1hdHRlcnMKICAgICAg ICAgaWYgKCFtX3N0YXRlLmhhc1RhZ1N0YXRlKCkpCiAgICAgICAgICAgICBwcm9jZXNzVG9rZW4o KTsKQEAgLTE4MTcsOCArMTgxNyw4IEBAIHZvaWQgSFRNTFRva2VuaXplcjo6ZW5kKCkKICAgICAg ICAgc2NyaXB0Q29kZSA9IDA7CiAgICAgICAgIHNjcmlwdENvZGVTaXplID0gc2NyaXB0Q29kZU1h eFNpemUgPSBzY3JpcHRDb2RlUmVzeW5jID0gMDsKIAotICAgICAgICBmYXN0RnJlZShidWZmZXIp OwotICAgICAgICBidWZmZXIgPSAwOworICAgICAgICBmYXN0RnJlZShtX2J1ZmZlcik7CisgICAg ICAgIG1fYnVmZmVyID0gMDsKICAgICB9CiAKICAgICBpZiAoIWluVmlld1NvdXJjZU1vZGUoKSkK QEAgLTE4NzAsOCArMTg3MCw4IEBAIFBhc3NSZWZQdHI8Tm9kZT4gSFRNTFRva2VuaXplcjo6cHJv Y2Vzc1Rva2VuKCkKICAgICBTY3JpcHRDb250cm9sbGVyKiBzY3JpcHRDb250cm9sbGVyID0gKCFt X2ZyYWdtZW50ICYmIG1fZG9jLT5mcmFtZSgpKSA/IG1fZG9jLT5mcmFtZSgpLT5zY3JpcHQoKSA6 IDA7CiAgICAgaWYgKHNjcmlwdENvbnRyb2xsZXIgJiYgc2NyaXB0Q29udHJvbGxlci0+aXNFbmFi bGVkKCkpCiAgICAgICAgIHNjcmlwdENvbnRyb2xsZXItPnNldEV2ZW50SGFuZGxlckxpbmVubyh0 YWdTdGFydExpbmVubyArIDEpOyAvLyBTY3JpcHQgbGluZSBudW1iZXJzIGFyZSAxIGJhc2VkLgot ICAgIGlmIChkZXN0ID4gYnVmZmVyKSB7Ci0gICAgICAgIGN1cnJUb2tlbi50ZXh0ID0gU3RyaW5n SW1wbDo6Y3JlYXRlU3RyaXBwaW5nTnVsbENoYXJhY3RlcnMoYnVmZmVyLCBkZXN0IC0gYnVmZmVy KTsKKyAgICBpZiAobV9kZXN0ID4gbV9idWZmZXIpIHsKKyAgICAgICAgY3VyclRva2VuLnRleHQg PSBTdHJpbmdJbXBsOjpjcmVhdGVTdHJpcHBpbmdOdWxsQ2hhcmFjdGVycyhtX2J1ZmZlciwgbV9k ZXN0IC0gbV9idWZmZXIpOwogICAgICAgICBpZiAoY3VyclRva2VuLnRhZ05hbWUgIT0gY29tbWVu dEF0b20pCiAgICAgICAgICAgICBjdXJyVG9rZW4udGFnTmFtZSA9IHRleHRBdG9tOwogICAgIH0g ZWxzZSBpZiAoY3VyclRva2VuLnRhZ05hbWUgPT0gbnVsbEF0b20pIHsKQEAgLTE4ODEsNyArMTg4 MSw3IEBAIFBhc3NSZWZQdHI8Tm9kZT4gSFRNTFRva2VuaXplcjo6cHJvY2Vzc1Rva2VuKCkKICAg ICAgICAgcmV0dXJuIDA7CiAgICAgfQogCi0gICAgZGVzdCA9IGJ1ZmZlcjsKKyAgICBtX2Rlc3Qg PSBtX2J1ZmZlcjsKIAogICAgIFJlZlB0cjxOb2RlPiBuOwogICAgIApAQCAtMTkxOSw5ICsxOTE5 LDkgQEAgSFRNTFRva2VuaXplcjo6fkhUTUxUb2tlbml6ZXIoKQogdm9pZCBIVE1MVG9rZW5pemVy OjplbmxhcmdlQnVmZmVyKGludCBsZW4pCiB7CiAgICAgaW50IG5ld1NpemUgPSBtYXgoc2l6ZSAq IDIsIHNpemUgKyBsZW4pOwotICAgIGludCBvbGRPZmZzZXQgPSBkZXN0IC0gYnVmZmVyOwotICAg IGJ1ZmZlciA9IHN0YXRpY19jYXN0PFVDaGFyKj4oZmFzdFJlYWxsb2MoYnVmZmVyLCBuZXdTaXpl ICogc2l6ZW9mKFVDaGFyKSkpOwotICAgIGRlc3QgPSBidWZmZXIgKyBvbGRPZmZzZXQ7CisgICAg aW50IG9sZE9mZnNldCA9IG1fZGVzdCAtIG1fYnVmZmVyOworICAgIG1fYnVmZmVyID0gc3RhdGlj X2Nhc3Q8VUNoYXIqPihmYXN0UmVhbGxvYyhtX2J1ZmZlciwgbmV3U2l6ZSAqIHNpemVvZihVQ2hh cikpKTsKKyAgICBtX2Rlc3QgPSBtX2J1ZmZlciArIG9sZE9mZnNldDsKICAgICBzaXplID0gbmV3 U2l6ZTsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuaCBiL1dl YkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmgKaW5kZXggNzBjZjRlYS4uYjBmM2IxMyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuaAorKysgYi9XZWJDb3JlL2h0bWwvSFRN TFRva2VuaXplci5oCkBAIC0xNzAsNyArMTcwLDcgQEAgcHJpdmF0ZToKICAgICBTdGF0ZSBwYXJz ZVRleHQoU2VnbWVudGVkU3RyaW5nJiwgU3RhdGUpOwogICAgIFN0YXRlIHBhcnNlU3BlY2lhbChT ZWdtZW50ZWRTdHJpbmcmLCBTdGF0ZSk7CiAgICAgU3RhdGUgcGFyc2VUYWcoU2VnbWVudGVkU3Ry aW5nJiwgU3RhdGUpOwotICAgIFN0YXRlIHBhcnNlRW50aXR5KFNlZ21lbnRlZFN0cmluZyYsIFVD aGFyKiYgZGVzdCwgU3RhdGUsIHVuc2lnbmVkJiBfY0J1ZmZlclBvcywgYm9vbCBzdGFydCwgYm9v bCBwYXJzaW5nVGFnKTsKKyAgICBTdGF0ZSBwYXJzZUVudGl0eShTZWdtZW50ZWRTdHJpbmcmLCBV Q2hhciomIGRlc3QsIFN0YXRlLCB1bnNpZ25lZCYgY0J1ZmZlclBvcywgYm9vbCBzdGFydCwgYm9v bCBwYXJzaW5nVGFnKTsKICAgICBTdGF0ZSBwYXJzZVByb2Nlc3NpbmdJbnN0cnVjdGlvbihTZWdt ZW50ZWRTdHJpbmcmLCBTdGF0ZSk7CiAgICAgU3RhdGUgc2NyaXB0SGFuZGxlcihTdGF0ZSk7CiAg ICAgU3RhdGUgc2NyaXB0RXhlY3V0aW9uKGNvbnN0IFN0cmluZyYgc2NyaXB0LCBTdGF0ZSwgY29u c3QgU3RyaW5nJiBzY3JpcHRVUkwsIGludCBiYXNlTGluZSA9IDEpOwpAQCAtMTgwLDcgKzE4MCw3 IEBAIHByaXZhdGU6CiAgICAgLy8gaWYgbm90IGVubGFyZ2UgaXQKICAgICBpbmxpbmUgdm9pZCBj aGVja0J1ZmZlcihpbnQgbGVuID0gMTApCiAgICAgewotICAgICAgICBpZiAoKGRlc3QgLSBidWZm ZXIpID4gc2l6ZSAtIGxlbikKKyAgICAgICAgaWYgKChtX2Rlc3QgLSBtX2J1ZmZlcikgPiBzaXpl IC0gbGVuKQogICAgICAgICAgICAgZW5sYXJnZUJ1ZmZlcihsZW4pOwogICAgIH0KIApAQCAtMTk4 LDEyICsxOTgsMTIgQEAgcHJpdmF0ZToKICAgICB2b2lkIGFsbERhdGFQcm9jZXNzZWQoKTsKIAog ICAgIC8vIGZyb20gQ2FjaGVkUmVzb3VyY2VDbGllbnQKLSAgICB2b2lkIG5vdGlmeUZpbmlzaGVk KENhY2hlZFJlc291cmNlICpmaW5pc2hlZE9iaik7CisgICAgdm9pZCBub3RpZnlGaW5pc2hlZChD YWNoZWRSZXNvdXJjZSopOwogCiAgICAgLy8gSW50ZXJuYWwgYnVmZmVycwogICAgIC8vLy8vLy8v Ly8vLy8vLy8vLy8KLSAgICBVQ2hhciogYnVmZmVyOwotICAgIFVDaGFyKiBkZXN0OworICAgIFVD aGFyKiBtX2J1ZmZlcjsKKyAgICBVQ2hhciogbV9kZXN0OwogCiAgICAgVG9rZW4gY3VyclRva2Vu OwogCg== 25069 2008-11-11 15:18:01 -0800 2008-11-11 16:07:07 -0800 Rename size to m_bufferSize Rename-size-to-m_bufferSize.patch text/plain 1935 eric ZjI0Mzg3NmYzODAwZWM4ZDZhNzY2YWI2MDQzMTkwMWI0OWM0MmNlMgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu Y3BwCmluZGV4IDU0N2JmN2EuLjM0OGMxODIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTIx Nyw3ICsyMTcsNyBAQCB2b2lkIEhUTUxUb2tlbml6ZXI6OnJlc2V0KCkKICAgICAKICAgICBmYXN0 RnJlZShtX2J1ZmZlcik7CiAgICAgbV9idWZmZXIgPSBtX2Rlc3QgPSAwOwotICAgIHNpemUgPSAw OworICAgIG1fYnVmZmVyU2l6ZSA9IDA7CiAKICAgICBmYXN0RnJlZShzY3JpcHRDb2RlKTsKICAg ICBzY3JpcHRDb2RlID0gMDsKQEAgLTI0MCw3ICsyNDAsNyBAQCB2b2lkIEhUTUxUb2tlbml6ZXI6 OmJlZ2luKCkKICAgICBtX2hhc1NjcmlwdHNXYWl0aW5nRm9yU3R5bGVzaGVldHMgPSBmYWxzZTsK ICAgICBtX3N0YXRlLnNldExvYWRpbmdFeHRTY3JpcHQoZmFsc2UpOwogICAgIHJlc2V0KCk7Ci0g ICAgc2l6ZSA9IDI1NDsKKyAgICBtX2J1ZmZlclNpemUgPSAyNTQ7CiAgICAgbV9idWZmZXIgPSBz dGF0aWNfY2FzdDxVQ2hhcio+KGZhc3RNYWxsb2Moc2l6ZW9mKFVDaGFyKSAqIDI1NCkpOwogICAg IG1fZGVzdCA9IG1fYnVmZmVyOwogICAgIHRxdW90ZSA9IE5vUXVvdGU7CkBAIC0xOTE4LDExICsx OTE4LDExIEBAIEhUTUxUb2tlbml6ZXI6On5IVE1MVG9rZW5pemVyKCkKIAogdm9pZCBIVE1MVG9r ZW5pemVyOjplbmxhcmdlQnVmZmVyKGludCBsZW4pCiB7Ci0gICAgaW50IG5ld1NpemUgPSBtYXgo c2l6ZSAqIDIsIHNpemUgKyBsZW4pOworICAgIGludCBuZXdTaXplID0gbWF4KG1fYnVmZmVyU2l6 ZSAqIDIsIG1fYnVmZmVyU2l6ZSArIGxlbik7CiAgICAgaW50IG9sZE9mZnNldCA9IG1fZGVzdCAt IG1fYnVmZmVyOwogICAgIG1fYnVmZmVyID0gc3RhdGljX2Nhc3Q8VUNoYXIqPihmYXN0UmVhbGxv YyhtX2J1ZmZlciwgbmV3U2l6ZSAqIHNpemVvZihVQ2hhcikpKTsKICAgICBtX2Rlc3QgPSBtX2J1 ZmZlciArIG9sZE9mZnNldDsKLSAgICBzaXplID0gbmV3U2l6ZTsKKyAgICBtX2J1ZmZlclNpemUg PSBuZXdTaXplOwogfQogCiB2b2lkIEhUTUxUb2tlbml6ZXI6OmVubGFyZ2VTY3JpcHRCdWZmZXIo aW50IGxlbikKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmggYi9XZWJD b3JlL2h0bWwvSFRNTFRva2VuaXplci5oCmluZGV4IGIwZjNiMTMuLjAzYjM0MWQgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxU b2tlbml6ZXIuaApAQCAtMTgwLDcgKzE4MCw3IEBAIHByaXZhdGU6CiAgICAgLy8gaWYgbm90IGVu bGFyZ2UgaXQKICAgICBpbmxpbmUgdm9pZCBjaGVja0J1ZmZlcihpbnQgbGVuID0gMTApCiAgICAg ewotICAgICAgICBpZiAoKG1fZGVzdCAtIG1fYnVmZmVyKSA+IHNpemUgLSBsZW4pCisgICAgICAg IGlmICgobV9kZXN0IC0gbV9idWZmZXIpID4gbV9idWZmZXJTaXplIC0gbGVuKQogICAgICAgICAg ICAgZW5sYXJnZUJ1ZmZlcihsZW4pOwogICAgIH0KIApAQCAtMjAzLDEzICsyMDMsMTEgQEAgcHJp dmF0ZToKICAgICAvLyBJbnRlcm5hbCBidWZmZXJzCiAgICAgLy8vLy8vLy8vLy8vLy8vLy8vLwog ICAgIFVDaGFyKiBtX2J1ZmZlcjsKKyAgICBpbnQgbV9idWZmZXJTaXplOwogICAgIFVDaGFyKiBt X2Rlc3Q7CiAKICAgICBUb2tlbiBjdXJyVG9rZW47CiAKLSAgICAvLyB0aGUgc2l6ZSBvZiBidWZm ZXIKLSAgICBpbnQgc2l6ZTsKLQogICAgIC8vIFRva2VuaXplciBmbGFncwogICAgIC8vLy8vLy8v Ly8vLy8vLy8vLwogICAgIC8vIGFyZSB3ZSBpbiBxdW90ZXMgd2l0aGluIGEgaHRtbCB0YWcK 25070 2008-11-11 15:18:06 -0800 2008-11-11 16:07:34 -0800 Rename attrName to m_attrName Rename-attrName-to-m_attrName.patch text/plain 6722 eric MzBlYjczODQzM2Y4NDFlNjYwMjMzMTU1NzYxYmZmYTg1NTFiY2M1MwpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu Y3BwCmluZGV4IDM0OGMxODIuLmZhYjg1Y2MgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTEz MSwxMSArMTMxLDExIEBAIHN0YXRpYyBpbmxpbmUgYm9vbCB0YWdNYXRjaChjb25zdCBjaGFyKiBz MSwgY29uc3QgVUNoYXIqIHMyLCB1bnNpZ25lZCBsZW5ndGgpCiAgICAgcmV0dXJuIHRydWU7CiB9 CiAKLWlubGluZSB2b2lkIFRva2VuOjphZGRBdHRyaWJ1dGUoRG9jdW1lbnQqIGRvYywgQXRvbWlj U3RyaW5nJiBhdHRyTmFtZSwgY29uc3QgQXRvbWljU3RyaW5nJiB2LCBib29sIHZpZXdTb3VyY2VN b2RlKQoraW5saW5lIHZvaWQgVG9rZW46OmFkZEF0dHJpYnV0ZShEb2N1bWVudCogZG9jLCBBdG9t aWNTdHJpbmcmIGF0dHJOYW1lLCBjb25zdCBBdG9taWNTdHJpbmcmIGF0dHJpYnV0ZVZhbHVlLCBi b29sIHZpZXdTb3VyY2VNb2RlKQogewogICAgIGlmICghYXR0ck5hbWUuaXNFbXB0eSgpKSB7CiAg ICAgICAgIEFTU0VSVCghYXR0ck5hbWUuY29udGFpbnMoJy8nKSk7Ci0gICAgICAgIFJlZlB0cjxN YXBwZWRBdHRyaWJ1dGU+IGEgPSBNYXBwZWRBdHRyaWJ1dGU6OmNyZWF0ZShhdHRyTmFtZSwgdik7 CisgICAgICAgIFJlZlB0cjxNYXBwZWRBdHRyaWJ1dGU+IGEgPSBNYXBwZWRBdHRyaWJ1dGU6OmNy ZWF0ZShhdHRyTmFtZSwgYXR0cmlidXRlVmFsdWUpOwogICAgICAgICBpZiAoIWF0dHJzKSB7CiAg ICAgICAgICAgICBhdHRycyA9IE5hbWVkTWFwcGVkQXR0ck1hcDo6Y3JlYXRlKCk7CiAgICAgICAg ICAgICBhdHRycy0+cmVzZXJ2ZUNhcGFjaXR5KDEwKTsKQEAgLTEyNTksNyArMTI1OSw3IEBAIEhU TUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnBhcnNlVGFnKFNlZ21lbnRlZFN0cmlu ZyYgc3JjLCBTdGF0ZSBzdGF0ZSkKICAgICAgICAgICAgICAgICAvLyBjYXNlcyBsaWtlIDxpbnB1 dCB0eXBlPWNoZWNrYm94IGNoZWNrZWQvPiB0byB3b3JrIChhbmQgYWNjb21tb2RhdGVzIFhNTC1z dHlsZSBzeW50YXggYXMgcGVyIEhUTUw1KS4KICAgICAgICAgICAgICAgICBpZiAoY3VyY2hhciA8 PSAnPicgJiYgKGN1cmNoYXIgPj0gJzwnIHx8IGlzQVNDSUlTcGFjZShjdXJjaGFyKSB8fCBjdXJj aGFyID09ICcvJykpIHsKICAgICAgICAgICAgICAgICAgICAgbV9jQnVmZmVyW2NCdWZmZXJQb3Nd ID0gJ1wwJzsKLSAgICAgICAgICAgICAgICAgICAgYXR0ck5hbWUgPSBBdG9taWNTdHJpbmcobV9j QnVmZmVyKTsKKyAgICAgICAgICAgICAgICAgICAgbV9hdHRyTmFtZSA9IEF0b21pY1N0cmluZyht X2NCdWZmZXIpOwogICAgICAgICAgICAgICAgICAgICBtX2Rlc3QgPSBtX2J1ZmZlcjsKICAgICAg ICAgICAgICAgICAgICAgKm1fZGVzdCsrID0gMDsKICAgICAgICAgICAgICAgICAgICAgc3RhdGUu c2V0VGFnU3RhdGUoU2VhcmNoRXF1YWwpOwpAQCAtMTI3OCw3ICsxMjc4LDcgQEAgSFRNTFRva2Vu aXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6cGFyc2VUYWcoU2VnbWVudGVkU3RyaW5nJiBzcmMs IFN0YXRlIHN0YXRlKQogICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKGNCdWZmZXJQb3Mg PT0gQ0JVRkxFTikgewogICAgICAgICAgICAgICAgIG1fY0J1ZmZlcltjQnVmZmVyUG9zXSA9ICdc MCc7Ci0gICAgICAgICAgICAgICAgYXR0ck5hbWUgPSBBdG9taWNTdHJpbmcobV9jQnVmZmVyKTsK KyAgICAgICAgICAgICAgICBtX2F0dHJOYW1lID0gQXRvbWljU3RyaW5nKG1fY0J1ZmZlcik7CiAg ICAgICAgICAgICAgICAgbV9kZXN0ID0gbV9idWZmZXI7CiAgICAgICAgICAgICAgICAgKm1fZGVz dCsrID0gMDsKICAgICAgICAgICAgICAgICBzdGF0ZS5zZXRUYWdTdGF0ZShTZWFyY2hFcXVhbCk7 CkBAIC0xMzA3LDcgKzEzMDcsNyBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVy OjpwYXJzZVRhZyhTZWdtZW50ZWRTdHJpbmcmIHNyYywgU3RhdGUgc3RhdGUpCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY3VyclRva2VuLmFkZFZpZXdTb3VyY2VDaGFyKGN1cmNoYXIpOwog ICAgICAgICAgICAgICAgICAgICAgICAgc3JjLmFkdmFuY2VQYXN0Tm9uTmV3bGluZSgpOwogICAg ICAgICAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgICAgICAgICAgY3VyclRv a2VuLmFkZEF0dHJpYnV0ZShtX2RvYywgYXR0ck5hbWUsIGVtcHR5QXRvbSwgaW5WaWV3U291cmNl TW9kZSgpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGN1cnJUb2tlbi5hZGRBdHRyaWJ1dGUo bV9kb2MsIG1fYXR0ck5hbWUsIGVtcHR5QXRvbSwgaW5WaWV3U291cmNlTW9kZSgpKTsKICAgICAg ICAgICAgICAgICAgICAgICAgIG1fZGVzdCA9IG1fYnVmZmVyOwogICAgICAgICAgICAgICAgICAg ICAgICAgc3RhdGUuc2V0VGFnU3RhdGUoU2VhcmNoQXR0cmlidXRlKTsKICAgICAgICAgICAgICAg ICAgICAgICAgIGxhc3RJc1NsYXNoID0gZmFsc2U7CkBAIC0xMzQ4LDcgKzEzNDgsNyBAQCBIVE1M VG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZVRhZyhTZWdtZW50ZWRTdHJpbmcm IHNyYywgU3RhdGUgc3RhdGUpCiAKICAgICAgICAgICAgICAgICBVQ2hhciBjdXJjaGFyID0gKnNy YzsKICAgICAgICAgICAgICAgICBpZiAoY3VyY2hhciA8PSAnPicgJiYgIXNyYy5lc2NhcGVkKCkp IHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGN1cmNoYXIgPT0gJz4nICYmIGF0dHJOYW1lLmlz RW1wdHkoKSkgeworICAgICAgICAgICAgICAgICAgICBpZiAoY3VyY2hhciA9PSAnPicgJiYgbV9h dHRyTmFtZS5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIC8vIEhhbmRsZSBh IGNhc2UgbGlrZSA8aW1nICc+LiAgSnVzdCBnbyBhaGVhZCBhbmQgYmUgd2lsbGluZwogICAgICAg ICAgICAgICAgICAgICAgICAgLy8gdG8gY2xvc2UgdGhlIHdob2xlIHRhZy4gIERvbid0IGNvbnN1 bWUgdGhlIGNoYXJhY3RlciBhbmQKICAgICAgICAgICAgICAgICAgICAgICAgIC8vIGp1c3QgZ28g YmFjayBpbnRvIFNlYXJjaEVuZCB3aGlsZSBpZ25vcmluZyB0aGUgd2hvbGUKQEAgLTEzNjAsOCAr MTM2MCw4IEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnBhcnNlVGFnKFNl Z21lbnRlZFN0cmluZyYgc3JjLCBTdGF0ZSBzdGF0ZSkKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBtX2Rlc3QtLTsgLy8gcmVtb3ZlIHRyYWlsaW5nIG5ld2xpbmVzCiAgICAgICAgICAgICAg ICAgICAgICAgICBBdG9taWNTdHJpbmcgYXR0cmlidXRlVmFsdWUobV9idWZmZXIgKyAxLCBtX2Rl c3QgLSBtX2J1ZmZlciAtIDEpOwogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKCFhdHRyaWJ1 dGVWYWx1ZS5jb250YWlucygnLycpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGF0dHJO YW1lID0gYXR0cmlidXRlVmFsdWU7IC8vIEp1c3QgbWFrZSB0aGUgbmFtZS92YWx1ZSBtYXRjaC4g KEZJWE1FOiBJcyB0aGlzIHNvbWUgV2luSUUgcXVpcms/KQotICAgICAgICAgICAgICAgICAgICAg ICAgY3VyclRva2VuLmFkZEF0dHJpYnV0ZShtX2RvYywgYXR0ck5hbWUsIGF0dHJpYnV0ZVZhbHVl LCBpblZpZXdTb3VyY2VNb2RlKCkpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fYXR0 ck5hbWUgPSBhdHRyaWJ1dGVWYWx1ZTsgLy8gSnVzdCBtYWtlIHRoZSBuYW1lL3ZhbHVlIG1hdGNo LiAoRklYTUU6IElzIHRoaXMgc29tZSBXaW5JRSBxdWlyaz8pCisgICAgICAgICAgICAgICAgICAg ICAgICBjdXJyVG9rZW4uYWRkQXR0cmlidXRlKG1fZG9jLCBtX2F0dHJOYW1lLCBhdHRyaWJ1dGVW YWx1ZSwgaW5WaWV3U291cmNlTW9kZSgpKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChp blZpZXdTb3VyY2VNb2RlKCkpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3VyclRva2Vu LmFkZFZpZXdTb3VyY2VDaGFyKCd4Jyk7CiAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0ZS5z ZXRUYWdTdGF0ZShTZWFyY2hBdHRyaWJ1dGUpOwpAQCAtMTM4MCwxNCArMTM4MCwxNCBAQCBIVE1M VG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZVRhZyhTZWdtZW50ZWRTdHJpbmcm IHNyYywgU3RhdGUgc3RhdGUpCiAgICAgICAgICAgICAgICAgICAgICAgICAvLyBzb21lIDxpbnB1 dCB0eXBlPWhpZGRlbj4gcmVseSBvbiB0cmFpbGluZyBzcGFjZXMuIGFyZ2gKICAgICAgICAgICAg ICAgICAgICAgICAgIHdoaWxlIChtX2Rlc3QgPiBtX2J1ZmZlciArIDEgJiYgKG1fZGVzdFstMV0g PT0gJ1xuJyB8fCBtX2Rlc3RbLTFdID09ICdccicpKQogICAgICAgICAgICAgICAgICAgICAgICAg ICAgIG1fZGVzdC0tOyAvLyByZW1vdmUgdHJhaWxpbmcgbmV3bGluZXMKLSAgICAgICAgICAgICAg ICAgICAgICAgIEF0b21pY1N0cmluZyB2KG1fYnVmZmVyICsgMSwgbV9kZXN0IC0gbV9idWZmZXIg LSAxKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlmIChhdHRyTmFtZS5pc0VtcHR5KCkgJiYg IXYuY29udGFpbnMoJy8nKSkgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGF0dHJOYW1l ID0gdjsgLy8gTWFrZSB0aGUgbmFtZSBtYXRjaCB0aGUgdmFsdWUuIChGSVhNRTogSXMgdGhpcyBh IFdpbklFIHF1aXJrPykKKyAgICAgICAgICAgICAgICAgICAgICAgIEF0b21pY1N0cmluZyBhdHRy aWJ1dGVWYWx1ZShtX2J1ZmZlciArIDEsIG1fZGVzdCAtIG1fYnVmZmVyIC0gMSk7CisgICAgICAg ICAgICAgICAgICAgICAgICBpZiAobV9hdHRyTmFtZS5pc0VtcHR5KCkgJiYgIWF0dHJpYnV0ZVZh bHVlLmNvbnRhaW5zKCcvJykpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2F0dHJO YW1lID0gYXR0cmlidXRlVmFsdWU7IC8vIE1ha2UgdGhlIG5hbWUgbWF0Y2ggdGhlIHZhbHVlLiAo RklYTUU6IElzIHRoaXMgYSBXaW5JRSBxdWlyaz8pCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaWYgKGluVmlld1NvdXJjZU1vZGUoKSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY3VyclRva2VuLmFkZFZpZXdTb3VyY2VDaGFyKCd4Jyk7CiAgICAgICAgICAgICAgICAgICAg ICAgICB9IGVsc2UgaWYgKGluVmlld1NvdXJjZU1vZGUoKSkKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjdXJyVG9rZW4uYWRkVmlld1NvdXJjZUNoYXIoJ3YnKTsKLSAgICAgICAgICAgICAg ICAgICAgICAgIGN1cnJUb2tlbi5hZGRBdHRyaWJ1dGUobV9kb2MsIGF0dHJOYW1lLCB2LCBpblZp ZXdTb3VyY2VNb2RlKCkpOworICAgICAgICAgICAgICAgICAgICAgICAgY3VyclRva2VuLmFkZEF0 dHJpYnV0ZShtX2RvYywgbV9hdHRyTmFtZSwgYXR0cmlidXRlVmFsdWUsIGluVmlld1NvdXJjZU1v ZGUoKSk7CiAgICAgICAgICAgICAgICAgICAgICAgICBtX2Rlc3QgPSBtX2J1ZmZlcjsKICAgICAg ICAgICAgICAgICAgICAgICAgIHN0YXRlLnNldFRhZ1N0YXRlKFNlYXJjaEF0dHJpYnV0ZSk7CiAg ICAgICAgICAgICAgICAgICAgICAgICB0cXVvdGUgPSBOb1F1b3RlOwpAQCAtMTQxNyw3ICsxNDE3 LDcgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6cGFyc2VUYWcoU2VnbWVu dGVkU3RyaW5nJiBzcmMsIFN0YXRlIHN0YXRlKQogICAgICAgICAgICAgICAgICAgICAvLyAnLycg ZG9lcyBub3QgZGVsaW1pdCBpbiBJRSEKICAgICAgICAgICAgICAgICAgICAgaWYgKGlzQVNDSUlT cGFjZShjdXJjaGFyKSB8fCBjdXJjaGFyID09ICc+JykgewogICAgICAgICAgICAgICAgICAgICAg ICAgQXRvbWljU3RyaW5nIGF0dHJpYnV0ZVZhbHVlKG1fYnVmZmVyICsgMSwgbV9kZXN0IC0gbV9i dWZmZXIgLSAxKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGN1cnJUb2tlbi5hZGRBdHRyaWJ1 dGUobV9kb2MsIGF0dHJOYW1lLCBhdHRyaWJ1dGVWYWx1ZSwgaW5WaWV3U291cmNlTW9kZSgpKTsK KyAgICAgICAgICAgICAgICAgICAgICAgIGN1cnJUb2tlbi5hZGRBdHRyaWJ1dGUobV9kb2MsIG1f YXR0ck5hbWUsIGF0dHJpYnV0ZVZhbHVlLCBpblZpZXdTb3VyY2VNb2RlKCkpOwogICAgICAgICAg ICAgICAgICAgICAgICAgaWYgKGluVmlld1NvdXJjZU1vZGUoKSkKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjdXJyVG9rZW4uYWRkVmlld1NvdXJjZUNoYXIoJ3YnKTsKICAgICAgICAgICAg ICAgICAgICAgICAgIG1fZGVzdCA9IG1fYnVmZmVyOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1s L0hUTUxUb2tlbml6ZXIuaCBiL1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmgKaW5kZXggMDNi MzQxZC4uMmFiODdlMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuaAor KysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5oCkBAIC0zMzYsNyArMzM2LDcgQEAgcHJp dmF0ZToKICAgICBib29sIG1fYnJva2VuU2VydmVyOwogCiAgICAgLy8gTmFtZSBvZiBhbiBhdHRy aWJ1dGUgdGhhdCB3ZSBqdXN0IHNjYW5uZWQuCi0gICAgQXRvbWljU3RyaW5nIGF0dHJOYW1lOwor ICAgIEF0b21pY1N0cmluZyBtX2F0dHJOYW1lOwogCiAgICAgLy8gVXNlZCB0byBzdG9yZSB0aGUg Y29kZSBvZiBhIHNjcmlwdGluZyBzZXF1ZW5jZQogICAgIFVDaGFyKiBzY3JpcHRDb2RlOwo= 25071 2008-11-11 15:18:09 -0800 2008-11-11 16:18:06 -0800 Rename searchStopper to m_searchStopper and searchStopperLen to m_searchStopperLen Rename-searchStopper-to-m_searchStopper-and-searchStopperLen-to-m_searchStopperLen.patch text/plain 4836 eric MjllNzNkNWQyNDY3MzgzZjUwZjAzNTZmYTZhNDk5NTg5NjE1ZjhhNQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu Y3BwCmluZGV4IGZhYjg1Y2MuLjE3MWM3OTcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTM3 NSwxMCArMzc1LDEwIEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnBhcnNl U3BlY2lhbChTZWdtZW50ZWRTdHJpbmcmIHNyYywgU3RhdGUgc3RhCiAgICAgICAgIH0KICAgICAg ICAgLy8gcG9zc2libGUgZW5kIG9mIHRhZ25hbWUsIGxldHMgY2hlY2suCiAgICAgICAgIGlmICgh c2NyaXB0Q29kZVJlc3luYyAmJiAhc3RhdGUuZXNjYXBlZCgpICYmICFzcmMuZXNjYXBlZCgpICYm IChjaCA9PSAnPicgfHwgY2ggPT0gJy8nIHx8IGlzQVNDSUlTcGFjZShjaCkpICYmCi0gICAgICAg ICAgICAgc2NyaXB0Q29kZVNpemUgPj0gc2VhcmNoU3RvcHBlckxlbiAmJgotICAgICAgICAgICAg IHRhZ01hdGNoKHNlYXJjaFN0b3BwZXIsIHNjcmlwdENvZGUgKyBzY3JpcHRDb2RlU2l6ZSAtIHNl YXJjaFN0b3BwZXJMZW4sIHNlYXJjaFN0b3BwZXJMZW4pICYmCi0gICAgICAgICAgICAgKGxhc3RE ZWNvZGVkRW50aXR5UG9zaXRpb24gPCBzY3JpcHRDb2RlU2l6ZSAtIHNlYXJjaFN0b3BwZXJMZW4p KSB7Ci0gICAgICAgICAgICBzY3JpcHRDb2RlUmVzeW5jID0gc2NyaXB0Q29kZVNpemUtc2VhcmNo U3RvcHBlckxlbisxOworICAgICAgICAgICAgIHNjcmlwdENvZGVTaXplID49IG1fc2VhcmNoU3Rv cHBlckxlbiAmJgorICAgICAgICAgICAgIHRhZ01hdGNoKG1fc2VhcmNoU3RvcHBlciwgc2NyaXB0 Q29kZSArIHNjcmlwdENvZGVTaXplIC0gbV9zZWFyY2hTdG9wcGVyTGVuLCBtX3NlYXJjaFN0b3Bw ZXJMZW4pICYmCisgICAgICAgICAgICAgKGxhc3REZWNvZGVkRW50aXR5UG9zaXRpb24gPCBzY3Jp cHRDb2RlU2l6ZSAtIG1fc2VhcmNoU3RvcHBlckxlbikpIHsKKyAgICAgICAgICAgIHNjcmlwdENv ZGVSZXN5bmMgPSBzY3JpcHRDb2RlU2l6ZS1tX3NlYXJjaFN0b3BwZXJMZW4rMTsKICAgICAgICAg ICAgIHRxdW90ZSA9IE5vUXVvdGU7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQpA QCAtMTQ4Nyw4ICsxNDg3LDggQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6 cGFyc2VUYWcoU2VnbWVudGVkU3RyaW5nJiBzcmMsIFN0YXRlIHN0YXRlKQogICAgICAgICAgICAg ICAgICAgICBpZiAobV9zY3JpcHROb2RlKQogICAgICAgICAgICAgICAgICAgICAgICAgc2NyaXB0 U3JjQ2hhcnNldCA9IG1fc2NyaXB0Tm9kZS0+c2NyaXB0Q2hhcnNldCgpOwogICAgICAgICAgICAg ICAgICAgICBpZiAoYmVnaW5UYWcpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHNlYXJjaFN0 b3BwZXIgPSBzY3JpcHRFbmQ7Ci0gICAgICAgICAgICAgICAgICAgICAgICBzZWFyY2hTdG9wcGVy TGVuID0gODsKKyAgICAgICAgICAgICAgICAgICAgICAgIG1fc2VhcmNoU3RvcHBlciA9IHNjcmlw dEVuZDsKKyAgICAgICAgICAgICAgICAgICAgICAgIG1fc2VhcmNoU3RvcHBlckxlbiA9IDg7CiAg ICAgICAgICAgICAgICAgICAgICAgICBzdGF0ZS5zZXRJblNjcmlwdCh0cnVlKTsKICAgICAgICAg ICAgICAgICAgICAgICAgIHN0YXRlID0gcGFyc2VTcGVjaWFsKHNyYywgc3RhdGUpOwogICAgICAg ICAgICAgICAgICAgICB9IGVsc2UgaWYgKGlzU2VsZkNsb3NpbmdTY3JpcHQpIHsgLy8gSGFuZGxl IDxzY3JpcHQgc3JjPSJmb28iLz4KQEAgLTE0OTcsMjIgKzE0OTcsMjIgQEAgSFRNTFRva2VuaXpl cjo6U3RhdGUgSFRNTFRva2VuaXplcjo6cGFyc2VUYWcoU2VnbWVudGVkU3RyaW5nJiBzcmMsIFN0 YXRlIHN0YXRlKQogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfSBlbHNl IGlmICh0YWdOYW1lID09IHN0eWxlVGFnKSB7CiAgICAgICAgICAgICAgICAgICAgIGlmIChiZWdp blRhZykgewotICAgICAgICAgICAgICAgICAgICAgICAgc2VhcmNoU3RvcHBlciA9IHN0eWxlRW5k OwotICAgICAgICAgICAgICAgICAgICAgICAgc2VhcmNoU3RvcHBlckxlbiA9IDc7CisgICAgICAg ICAgICAgICAgICAgICAgICBtX3NlYXJjaFN0b3BwZXIgPSBzdHlsZUVuZDsKKyAgICAgICAgICAg ICAgICAgICAgICAgIG1fc2VhcmNoU3RvcHBlckxlbiA9IDc7CiAgICAgICAgICAgICAgICAgICAg ICAgICBzdGF0ZS5zZXRJblN0eWxlKHRydWUpOwogICAgICAgICAgICAgICAgICAgICAgICAgc3Rh dGUgPSBwYXJzZVNwZWNpYWwoc3JjLCBzdGF0ZSk7CiAgICAgICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgICAgICB9IGVsc2UgaWYgKHRhZ05hbWUgPT0gdGV4dGFyZWFUYWcpIHsKICAgICAg ICAgICAgICAgICAgICAgaWYgKGJlZ2luVGFnKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBz ZWFyY2hTdG9wcGVyID0gdGV4dGFyZWFFbmQ7Ci0gICAgICAgICAgICAgICAgICAgICAgICBzZWFy Y2hTdG9wcGVyTGVuID0gMTA7CisgICAgICAgICAgICAgICAgICAgICAgICBtX3NlYXJjaFN0b3Bw ZXIgPSB0ZXh0YXJlYUVuZDsKKyAgICAgICAgICAgICAgICAgICAgICAgIG1fc2VhcmNoU3RvcHBl ckxlbiA9IDEwOwogICAgICAgICAgICAgICAgICAgICAgICAgc3RhdGUuc2V0SW5UZXh0QXJlYSh0 cnVlKTsKICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRlID0gcGFyc2VTcGVjaWFsKHNyYywg c3RhdGUpOwogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfSBlbHNlIGlm ICh0YWdOYW1lID09IHRpdGxlVGFnKSB7CiAgICAgICAgICAgICAgICAgICAgIGlmIChiZWdpblRh ZykgewotICAgICAgICAgICAgICAgICAgICAgICAgc2VhcmNoU3RvcHBlciA9IHRpdGxlRW5kOwot ICAgICAgICAgICAgICAgICAgICAgICAgc2VhcmNoU3RvcHBlckxlbiA9IDc7CisgICAgICAgICAg ICAgICAgICAgICAgICBtX3NlYXJjaFN0b3BwZXIgPSB0aXRsZUVuZDsKKyAgICAgICAgICAgICAg ICAgICAgICAgIG1fc2VhcmNoU3RvcHBlckxlbiA9IDc7CiAgICAgICAgICAgICAgICAgICAgICAg ICBTdGF0ZSBzYXZlZFN0YXRlID0gc3RhdGU7CiAgICAgICAgICAgICAgICAgICAgICAgICBTZWdt ZW50ZWRTdHJpbmcgc2F2ZWRTcmMgPSBzcmM7CiAgICAgICAgICAgICAgICAgICAgICAgICBsb25n IHNhdmVkTGluZW5vID0gbV9saW5lTnVtYmVyOwpAQCAtMTUzNCwxNSArMTUzNCwxNSBAQCBIVE1M VG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZVRhZyhTZWdtZW50ZWRTdHJpbmcm IHNyYywgU3RhdGUgc3RhdGUpCiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAg ICB9IGVsc2UgaWYgKHRhZ05hbWUgPT0geG1wVGFnKSB7CiAgICAgICAgICAgICAgICAgICAgIGlm IChiZWdpblRhZykgewotICAgICAgICAgICAgICAgICAgICAgICAgc2VhcmNoU3RvcHBlciA9IHht cEVuZDsKLSAgICAgICAgICAgICAgICAgICAgICAgIHNlYXJjaFN0b3BwZXJMZW4gPSA1OworICAg ICAgICAgICAgICAgICAgICAgICAgbV9zZWFyY2hTdG9wcGVyID0geG1wRW5kOworICAgICAgICAg ICAgICAgICAgICAgICAgbV9zZWFyY2hTdG9wcGVyTGVuID0gNTsKICAgICAgICAgICAgICAgICAg ICAgICAgIHN0YXRlLnNldEluWG1wKHRydWUpOwogICAgICAgICAgICAgICAgICAgICAgICAgc3Rh dGUgPSBwYXJzZVNwZWNpYWwoc3JjLCBzdGF0ZSk7CiAgICAgICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgICAgICB9IGVsc2UgaWYgKHRhZ05hbWUgPT0gaWZyYW1lVGFnKSB7CiAgICAgICAg ICAgICAgICAgICAgIGlmIChiZWdpblRhZykgewotICAgICAgICAgICAgICAgICAgICAgICAgc2Vh cmNoU3RvcHBlciA9IGlmcmFtZUVuZDsKLSAgICAgICAgICAgICAgICAgICAgICAgIHNlYXJjaFN0 b3BwZXJMZW4gPSA4OworICAgICAgICAgICAgICAgICAgICAgICAgbV9zZWFyY2hTdG9wcGVyID0g aWZyYW1lRW5kOworICAgICAgICAgICAgICAgICAgICAgICAgbV9zZWFyY2hTdG9wcGVyTGVuID0g ODsKICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRlLnNldEluSUZyYW1lKHRydWUpOwogICAg ICAgICAgICAgICAgICAgICAgICAgc3RhdGUgPSBwYXJzZVNwZWNpYWwoc3JjLCBzdGF0ZSk7CiAg ICAgICAgICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5p emVyLmggYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5oCmluZGV4IDJhYjg3ZTMuLjJjNzRk ZWIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmgKKysrIGIvV2ViQ29y ZS9odG1sL0hUTUxUb2tlbml6ZXIuaApAQCAtMzUzLDkgKzM1Myw5IEBAIHByaXZhdGU6CiAgICAg Ly8gQ291bnRzIHdoZXJlIHdlIGFyZSBpbiB0aGUgc3RyaW5nIHdlIGFyZSBzY2FubmluZyBmb3IK ICAgICBpbnQgc2VhcmNoQ291bnQ7CiAgICAgLy8gdGhlIHN0b3BwZXIgc3RyaW5nCi0gICAgY29u c3QgY2hhciogc2VhcmNoU3RvcHBlcjsKKyAgICBjb25zdCBjaGFyKiBtX3NlYXJjaFN0b3BwZXI7 CiAgICAgLy8gdGhlIHN0b3BwZXIgbGVuCi0gICAgaW50IHNlYXJjaFN0b3BwZXJMZW47CisgICAg aW50IG1fc2VhcmNoU3RvcHBlckxlbjsKICAgICAKICAgICAvLyBpZiBubyBtb3JlIGRhdGEgaXMg Y29taW5nLCBqdXN0IHBhcnNlIHdoYXQgd2UgaGF2ZSAoaW5jbHVkaW5nIGV4dCBzY3JpcHRzIHRo YXQKICAgICAvLyBtYXkgYmUgc3RpbGwgZG93bmxvYWRpbmcpIGFuZCBmaW5pc2gK 25072 2008-11-11 15:18:10 -0800 2008-11-11 16:18:50 -0800 Rename scriptCode* to m_scriptCode* and change scriptCodeMax to m_scriptCodeCapacity Rename-scriptCode-to-m_scriptCode-and-change-scriptCodeMax-to-m_scriptCodeCapacity.patch text/plain 16124 eric MGIwNWRlN2Y5Yzg5MmQzNWNhN2E4YTZkM2Q3MDdjYWUzZWY2NDRjZApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu Y3BwCmluZGV4IDE3MWM3OTcuLjEyY2U5NjQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTE1 MSwxMCArMTUxLDEwIEBAIGlubGluZSB2b2lkIFRva2VuOjphZGRBdHRyaWJ1dGUoRG9jdW1lbnQq IGRvYywgQXRvbWljU3RyaW5nJiBhdHRyTmFtZSwgY29uc3QgQXRvCiBIVE1MVG9rZW5pemVyOjpI VE1MVG9rZW5pemVyKEhUTUxEb2N1bWVudCogZG9jLCBib29sIHJlcG9ydEVycm9ycykKICAgICA6 IFRva2VuaXplcigpCiAgICAgLCBtX2J1ZmZlcigwKQotICAgICwgc2NyaXB0Q29kZSgwKQotICAg ICwgc2NyaXB0Q29kZVNpemUoMCkKLSAgICAsIHNjcmlwdENvZGVNYXhTaXplKDApCi0gICAgLCBz Y3JpcHRDb2RlUmVzeW5jKDApCisgICAgLCBtX3NjcmlwdENvZGUoMCkKKyAgICAsIG1fc2NyaXB0 Q29kZVNpemUoMCkKKyAgICAsIG1fc2NyaXB0Q29kZUNhcGFjaXR5KDApCisgICAgLCBtX3Njcmlw dENvZGVSZXN5bmMoMCkKICAgICAsIG1fZXhlY3V0aW5nU2NyaXB0KDApCiAgICAgLCBtX3JlcXVl c3RpbmdTY3JpcHQoZmFsc2UpCiAgICAgLCBtX2hhc1NjcmlwdHNXYWl0aW5nRm9yU3R5bGVzaGVl dHMoZmFsc2UpCkBAIC0xNzAsMTAgKzE3MCwxMCBAQCBIVE1MVG9rZW5pemVyOjpIVE1MVG9rZW5p emVyKEhUTUxEb2N1bWVudCogZG9jLCBib29sIHJlcG9ydEVycm9ycykKIEhUTUxUb2tlbml6ZXI6 OkhUTUxUb2tlbml6ZXIoSFRNTFZpZXdTb3VyY2VEb2N1bWVudCogZG9jKQogICAgIDogVG9rZW5p emVyKHRydWUpCiAgICAgLCBtX2J1ZmZlcigwKQotICAgICwgc2NyaXB0Q29kZSgwKQotICAgICwg c2NyaXB0Q29kZVNpemUoMCkKLSAgICAsIHNjcmlwdENvZGVNYXhTaXplKDApCi0gICAgLCBzY3Jp cHRDb2RlUmVzeW5jKDApCisgICAgLCBtX3NjcmlwdENvZGUoMCkKKyAgICAsIG1fc2NyaXB0Q29k ZVNpemUoMCkKKyAgICAsIG1fc2NyaXB0Q29kZUNhcGFjaXR5KDApCisgICAgLCBtX3NjcmlwdENv ZGVSZXN5bmMoMCkKICAgICAsIG1fZXhlY3V0aW5nU2NyaXB0KDApCiAgICAgLCBtX3JlcXVlc3Rp bmdTY3JpcHQoZmFsc2UpCiAgICAgLCBtX2hhc1NjcmlwdHNXYWl0aW5nRm9yU3R5bGVzaGVldHMo ZmFsc2UpCkBAIC0xODgsMTAgKzE4OCwxMCBAQCBIVE1MVG9rZW5pemVyOjpIVE1MVG9rZW5pemVy KEhUTUxWaWV3U291cmNlRG9jdW1lbnQqIGRvYykKIAogSFRNTFRva2VuaXplcjo6SFRNTFRva2Vu aXplcihEb2N1bWVudEZyYWdtZW50KiBmcmFnKQogICAgIDogbV9idWZmZXIoMCkKLSAgICAsIHNj cmlwdENvZGUoMCkKLSAgICAsIHNjcmlwdENvZGVTaXplKDApCi0gICAgLCBzY3JpcHRDb2RlTWF4 U2l6ZSgwKQotICAgICwgc2NyaXB0Q29kZVJlc3luYygwKQorICAgICwgbV9zY3JpcHRDb2RlKDAp CisgICAgLCBtX3NjcmlwdENvZGVTaXplKDApCisgICAgLCBtX3NjcmlwdENvZGVDYXBhY2l0eSgw KQorICAgICwgbV9zY3JpcHRDb2RlUmVzeW5jKDApCiAgICAgLCBtX2V4ZWN1dGluZ1NjcmlwdCgw KQogICAgICwgbV9yZXF1ZXN0aW5nU2NyaXB0KGZhbHNlKQogICAgICwgbV9oYXNTY3JpcHRzV2Fp dGluZ0ZvclN0eWxlc2hlZXRzKGZhbHNlKQpAQCAtMjE5LDkgKzIxOSw5IEBAIHZvaWQgSFRNTFRv a2VuaXplcjo6cmVzZXQoKQogICAgIG1fYnVmZmVyID0gbV9kZXN0ID0gMDsKICAgICBtX2J1ZmZl clNpemUgPSAwOwogCi0gICAgZmFzdEZyZWUoc2NyaXB0Q29kZSk7Ci0gICAgc2NyaXB0Q29kZSA9 IDA7Ci0gICAgc2NyaXB0Q29kZVNpemUgPSBzY3JpcHRDb2RlTWF4U2l6ZSA9IHNjcmlwdENvZGVS ZXN5bmMgPSAwOworICAgIGZhc3RGcmVlKG1fc2NyaXB0Q29kZSk7CisgICAgbV9zY3JpcHRDb2Rl ID0gMDsKKyAgICBtX3NjcmlwdENvZGVTaXplID0gbV9zY3JpcHRDb2RlQ2FwYWNpdHkgPSBtX3Nj cmlwdENvZGVSZXN5bmMgPSAwOwogCiAgICAgbV90aW1lci5zdG9wKCk7CiAgICAgbV9zdGF0ZS5z ZXRBbGxvd1lpZWxkKGZhbHNlKTsKQEAgLTMyNywyMyArMzI3LDIzIEBAIEhUTUxUb2tlbml6ZXI6 OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnBhcnNlU3BlY2lhbChTZWdtZW50ZWRTdHJpbmcmIHNyYywg U3RhdGUgc3RhCiAgICAgICAgIGNoZWNrU2NyaXB0QnVmZmVyKCk7CiAgICAgICAgIFVDaGFyIGNo ID0gKnNyYzsKIAotICAgICAgICBpZiAoIXNjcmlwdENvZGVSZXN5bmMgJiYgIW1fYnJva2VuQ29t bWVudHMgJiYKLSAgICAgICAgICAgICFzdGF0ZS5pblhtcCgpICYmIGNoID09ICctJyAmJiBzY3Jp cHRDb2RlU2l6ZSA+PSAzICYmICFzcmMuZXNjYXBlZCgpICYmCi0gICAgICAgICAgICBzY3JpcHRD b2RlW3NjcmlwdENvZGVTaXplLTNdID09ICc8JyAmJiBzY3JpcHRDb2RlW3NjcmlwdENvZGVTaXpl LTJdID09ICchJyAmJiBzY3JpcHRDb2RlW3NjcmlwdENvZGVTaXplLTFdID09ICctJyAmJgotICAg ICAgICAgICAgKGxhc3REZWNvZGVkRW50aXR5UG9zaXRpb24gPCBzY3JpcHRDb2RlU2l6ZSAtIDMp KSB7CisgICAgICAgIGlmICghbV9zY3JpcHRDb2RlUmVzeW5jICYmICFtX2Jyb2tlbkNvbW1lbnRz ICYmCisgICAgICAgICAgICAhc3RhdGUuaW5YbXAoKSAmJiBjaCA9PSAnLScgJiYgbV9zY3JpcHRD b2RlU2l6ZSA+PSAzICYmICFzcmMuZXNjYXBlZCgpICYmCisgICAgICAgICAgICBtX3NjcmlwdENv ZGVbbV9zY3JpcHRDb2RlU2l6ZSAtIDNdID09ICc8JyAmJiBtX3NjcmlwdENvZGVbbV9zY3JpcHRD b2RlU2l6ZSAtIDJdID09ICchJyAmJiBtX3NjcmlwdENvZGVbbV9zY3JpcHRDb2RlU2l6ZSAtIDFd ID09ICctJyAmJgorICAgICAgICAgICAgKGxhc3REZWNvZGVkRW50aXR5UG9zaXRpb24gPCBtX3Nj cmlwdENvZGVTaXplIC0gMykpIHsKICAgICAgICAgICAgIHN0YXRlLnNldEluQ29tbWVudCh0cnVl KTsKICAgICAgICAgICAgIHN0YXRlID0gcGFyc2VDb21tZW50KHNyYywgc3RhdGUpOwogICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgIH0KLSAgICAgICAgaWYgKHNjcmlwdENvZGVSZXN5bmMg JiYgIXRxdW90ZSAmJiBjaCA9PSAnPicpIHsKKyAgICAgICAgaWYgKG1fc2NyaXB0Q29kZVJlc3lu YyAmJiAhdHF1b3RlICYmIGNoID09ICc+JykgewogICAgICAgICAgICAgc3JjLmFkdmFuY2VQYXN0 Tm9uTmV3bGluZSgpOwotICAgICAgICAgICAgc2NyaXB0Q29kZVNpemUgPSBzY3JpcHRDb2RlUmVz eW5jLTE7Ci0gICAgICAgICAgICBzY3JpcHRDb2RlUmVzeW5jID0gMDsKLSAgICAgICAgICAgIHNj cmlwdENvZGVbIHNjcmlwdENvZGVTaXplIF0gPSBzY3JpcHRDb2RlWyBzY3JpcHRDb2RlU2l6ZSAr IDEgXSA9IDA7CisgICAgICAgICAgICBtX3NjcmlwdENvZGVTaXplID0gbV9zY3JpcHRDb2RlUmVz eW5jIC0gMTsKKyAgICAgICAgICAgIG1fc2NyaXB0Q29kZVJlc3luYyA9IDA7CisgICAgICAgICAg ICBtX3NjcmlwdENvZGVbbV9zY3JpcHRDb2RlU2l6ZV0gPSBtX3NjcmlwdENvZGVbbV9zY3JpcHRD b2RlU2l6ZSArIDFdID0gMDsKICAgICAgICAgICAgIGlmIChzdGF0ZS5pblNjcmlwdCgpKQogICAg ICAgICAgICAgICAgIHN0YXRlID0gc2NyaXB0SGFuZGxlcihzdGF0ZSk7CiAgICAgICAgICAgICBl bHNlIHsKLSAgICAgICAgICAgICAgICBzdGF0ZSA9IHByb2Nlc3NMaXN0aW5nKFNlZ21lbnRlZFN0 cmluZyhzY3JpcHRDb2RlLCBzY3JpcHRDb2RlU2l6ZSksIHN0YXRlKTsKKyAgICAgICAgICAgICAg ICBzdGF0ZSA9IHByb2Nlc3NMaXN0aW5nKFNlZ21lbnRlZFN0cmluZyhtX3NjcmlwdENvZGUsIG1f c2NyaXB0Q29kZVNpemUpLCBzdGF0ZSk7CiAgICAgICAgICAgICAgICAgcHJvY2Vzc1Rva2VuKCk7 CiAgICAgICAgICAgICAgICAgaWYgKHN0YXRlLmluU3R5bGUoKSkgeyAKICAgICAgICAgICAgICAg ICAgICAgY3VyclRva2VuLnRhZ05hbWUgPSBzdHlsZVRhZy5sb2NhbE5hbWUoKTsgCkBAIC0zNjks MjAgKzM2OSwyMCBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZVNw ZWNpYWwoU2VnbWVudGVkU3RyaW5nJiBzcmMsIFN0YXRlIHN0YQogICAgICAgICAgICAgICAgIHN0 YXRlLnNldEluWG1wKGZhbHNlKTsKICAgICAgICAgICAgICAgICBzdGF0ZS5zZXRJbklGcmFtZShm YWxzZSk7CiAgICAgICAgICAgICAgICAgdHF1b3RlID0gTm9RdW90ZTsKLSAgICAgICAgICAgICAg ICBzY3JpcHRDb2RlU2l6ZSA9IHNjcmlwdENvZGVSZXN5bmMgPSAwOworICAgICAgICAgICAgICAg IG1fc2NyaXB0Q29kZVNpemUgPSBtX3NjcmlwdENvZGVSZXN5bmMgPSAwOwogICAgICAgICAgICAg fQogICAgICAgICAgICAgcmV0dXJuIHN0YXRlOwogICAgICAgICB9CiAgICAgICAgIC8vIHBvc3Np YmxlIGVuZCBvZiB0YWduYW1lLCBsZXRzIGNoZWNrLgotICAgICAgICBpZiAoIXNjcmlwdENvZGVS ZXN5bmMgJiYgIXN0YXRlLmVzY2FwZWQoKSAmJiAhc3JjLmVzY2FwZWQoKSAmJiAoY2ggPT0gJz4n IHx8IGNoID09ICcvJyB8fCBpc0FTQ0lJU3BhY2UoY2gpKSAmJgotICAgICAgICAgICAgIHNjcmlw dENvZGVTaXplID49IG1fc2VhcmNoU3RvcHBlckxlbiAmJgotICAgICAgICAgICAgIHRhZ01hdGNo KG1fc2VhcmNoU3RvcHBlciwgc2NyaXB0Q29kZSArIHNjcmlwdENvZGVTaXplIC0gbV9zZWFyY2hT dG9wcGVyTGVuLCBtX3NlYXJjaFN0b3BwZXJMZW4pICYmCi0gICAgICAgICAgICAgKGxhc3REZWNv ZGVkRW50aXR5UG9zaXRpb24gPCBzY3JpcHRDb2RlU2l6ZSAtIG1fc2VhcmNoU3RvcHBlckxlbikp IHsKLSAgICAgICAgICAgIHNjcmlwdENvZGVSZXN5bmMgPSBzY3JpcHRDb2RlU2l6ZS1tX3NlYXJj aFN0b3BwZXJMZW4rMTsKKyAgICAgICAgaWYgKCFtX3NjcmlwdENvZGVSZXN5bmMgJiYgIXN0YXRl LmVzY2FwZWQoKSAmJiAhc3JjLmVzY2FwZWQoKSAmJiAoY2ggPT0gJz4nIHx8IGNoID09ICcvJyB8 fCBpc0FTQ0lJU3BhY2UoY2gpKSAmJgorICAgICAgICAgICAgIG1fc2NyaXB0Q29kZVNpemUgPj0g bV9zZWFyY2hTdG9wcGVyTGVuICYmCisgICAgICAgICAgICAgdGFnTWF0Y2gobV9zZWFyY2hTdG9w cGVyLCBtX3NjcmlwdENvZGUgKyBtX3NjcmlwdENvZGVTaXplIC0gbV9zZWFyY2hTdG9wcGVyTGVu LCBtX3NlYXJjaFN0b3BwZXJMZW4pICYmCisgICAgICAgICAgICAgKGxhc3REZWNvZGVkRW50aXR5 UG9zaXRpb24gPCBtX3NjcmlwdENvZGVTaXplIC0gbV9zZWFyY2hTdG9wcGVyTGVuKSkgeworICAg ICAgICAgICAgbV9zY3JpcHRDb2RlUmVzeW5jID0gbV9zY3JpcHRDb2RlU2l6ZS1tX3NlYXJjaFN0 b3BwZXJMZW4rMTsKICAgICAgICAgICAgIHRxdW90ZSA9IE5vUXVvdGU7CiAgICAgICAgICAgICBj b250aW51ZTsKICAgICAgICAgfQotICAgICAgICBpZiAoc2NyaXB0Q29kZVJlc3luYyAmJiAhc3Rh dGUuZXNjYXBlZCgpKSB7CisgICAgICAgIGlmIChtX3NjcmlwdENvZGVSZXN5bmMgJiYgIXN0YXRl LmVzY2FwZWQoKSkgewogICAgICAgICAgICAgaWYgKGNoID09ICdcIicpCiAgICAgICAgICAgICAg ICAgdHF1b3RlID0gKHRxdW90ZSA9PSBOb1F1b3RlKSA/IERvdWJsZVF1b3RlIDogKCh0cXVvdGUg PT0gU2luZ2xlUXVvdGUpID8gU2luZ2xlUXVvdGUgOiBOb1F1b3RlKTsKICAgICAgICAgICAgIGVs c2UgaWYgKGNoID09ICdcJycpCkBAIC0zOTEsMTYgKzM5MSwxNiBAQCBIVE1MVG9rZW5pemVyOjpT dGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZVNwZWNpYWwoU2VnbWVudGVkU3RyaW5nJiBzcmMsIFN0 YXRlIHN0YQogICAgICAgICAgICAgICAgIHRxdW90ZSA9IE5vUXVvdGU7CiAgICAgICAgIH0KICAg ICAgICAgc3RhdGUuc2V0RXNjYXBlZCghc3RhdGUuZXNjYXBlZCgpICYmIGNoID09ICdcXCcpOwot ICAgICAgICBpZiAoIXNjcmlwdENvZGVSZXN5bmMgJiYgKHN0YXRlLmluVGV4dEFyZWEoKSB8fCBz dGF0ZS5pblRpdGxlKCkgfHwgc3RhdGUuaW5JRnJhbWUoKSkgJiYgIXNyYy5lc2NhcGVkKCkgJiYg Y2ggPT0gJyYnKSB7Ci0gICAgICAgICAgICBVQ2hhciogc2NyaXB0Q29kZURlc3QgPSBzY3JpcHRD b2RlK3NjcmlwdENvZGVTaXplOworICAgICAgICBpZiAoIW1fc2NyaXB0Q29kZVJlc3luYyAmJiAo c3RhdGUuaW5UZXh0QXJlYSgpIHx8IHN0YXRlLmluVGl0bGUoKSB8fCBzdGF0ZS5pbklGcmFtZSgp KSAmJiAhc3JjLmVzY2FwZWQoKSAmJiBjaCA9PSAnJicpIHsKKyAgICAgICAgICAgIFVDaGFyKiBz Y3JpcHRDb2RlRGVzdCA9IG1fc2NyaXB0Q29kZSArIG1fc2NyaXB0Q29kZVNpemU7CiAgICAgICAg ICAgICBzcmMuYWR2YW5jZVBhc3ROb25OZXdsaW5lKCk7CiAgICAgICAgICAgICBzdGF0ZSA9IHBh cnNlRW50aXR5KHNyYywgc2NyaXB0Q29kZURlc3QsIHN0YXRlLCBtX2NCdWZmZXJQb3MsIHRydWUs IGZhbHNlKTsKLSAgICAgICAgICAgIGlmIChzY3JpcHRDb2RlRGVzdCA9PSBzY3JpcHRDb2RlICsg c2NyaXB0Q29kZVNpemUpCi0gICAgICAgICAgICAgICAgbGFzdERlY29kZWRFbnRpdHlQb3NpdGlv biA9IHNjcmlwdENvZGVTaXplOworICAgICAgICAgICAgaWYgKHNjcmlwdENvZGVEZXN0ID09IG1f c2NyaXB0Q29kZSArIG1fc2NyaXB0Q29kZVNpemUpCisgICAgICAgICAgICAgICAgbGFzdERlY29k ZWRFbnRpdHlQb3NpdGlvbiA9IG1fc2NyaXB0Q29kZVNpemU7CiAgICAgICAgICAgICBlbHNlCi0g ICAgICAgICAgICAgICAgc2NyaXB0Q29kZVNpemUgPSBzY3JpcHRDb2RlRGVzdCAtIHNjcmlwdENv ZGU7CisgICAgICAgICAgICAgICAgbV9zY3JpcHRDb2RlU2l6ZSA9IHNjcmlwdENvZGVEZXN0IC0g bV9zY3JpcHRDb2RlOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgc2NyaXB0Q29kZVtz Y3JpcHRDb2RlU2l6ZSsrXSA9IGNoOworICAgICAgICAgICAgbV9zY3JpcHRDb2RlW21fc2NyaXB0 Q29kZVNpemUrK10gPSBjaDsKICAgICAgICAgICAgIHNyYy5hZHZhbmNlKG1fbGluZU51bWJlcik7 CiAgICAgICAgIH0KICAgICB9CkBAIC00NDEsNyArNDQxLDcgQEAgSFRNTFRva2VuaXplcjo6U3Rh dGUgSFRNTFRva2VuaXplcjo6c2NyaXB0SGFuZGxlcihTdGF0ZSBzdGF0ZSkKICAgICAgICAgICAg ICAgICBtX3NjcmlwdE5vZGUgPSAwOwogICAgICAgICAgICAgc2NyaXB0U3JjID0gU3RyaW5nKCk7 CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAvLyBQYXJzZSBzY3JpcHRDb2RlIGNvbnRh aW5pbmcgPHNjcmlwdD4gaW5mbworICAgICAgICAgICAgLy8gUGFyc2UgbV9zY3JpcHRDb2RlIGNv bnRhaW5pbmcgPHNjcmlwdD4gaW5mbwogI2lmIFVTRShMT1dfQkFORFdJRFRIX0RJU1BMQVkpCiAg ICAgICAgICAgICBpZiAobV9kb2MtPmluTG93QmFuZHdpZHRoRGlzcGxheSgpKSB7CiAgICAgICAg ICAgICAgICAgLy8gaWRlYWwgc29sdXRpb24gaXMgb25seSBza2lwcGluZyBpbnRlcm5hbCBKYXZh U2NyaXB0IGlmIHRoZXJlIGlzIGV4dGVybmFsIEphdmFTY3JpcHQuCkBAIC00NTYsNyArNDU2LDcg QEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6c2NyaXB0SGFuZGxlcihTdGF0 ZSBzdGF0ZSkKICAgICAgICAgfQogICAgIH0KIAotICAgIHN0YXRlID0gcHJvY2Vzc0xpc3Rpbmco U2VnbWVudGVkU3RyaW5nKHNjcmlwdENvZGUsIHNjcmlwdENvZGVTaXplKSwgc3RhdGUpOworICAg IHN0YXRlID0gcHJvY2Vzc0xpc3RpbmcoU2VnbWVudGVkU3RyaW5nKG1fc2NyaXB0Q29kZSwgbV9z Y3JpcHRDb2RlU2l6ZSksIHN0YXRlKTsKICAgICBSZWZQdHI8Tm9kZT4gbm9kZSA9IHByb2Nlc3NU b2tlbigpOwogICAgIFN0cmluZyBzY3JpcHRTdHJpbmcgPSBub2RlID8gbm9kZS0+dGV4dENvbnRl bnQoKSA6ICIiOwogICAgIGN1cnJUb2tlbi50YWdOYW1lID0gc2NyaXB0VGFnLmxvY2FsTmFtZSgp OwpAQCAtNDY0LDcgKzQ2NCw3IEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6 OnNjcmlwdEhhbmRsZXIoU3RhdGUgc3RhdGUpCiAgICAgcHJvY2Vzc1Rva2VuKCk7CiAKICAgICBz dGF0ZS5zZXRJblNjcmlwdChmYWxzZSk7Ci0gICAgc2NyaXB0Q29kZVNpemUgPSBzY3JpcHRDb2Rl UmVzeW5jID0gMDsKKyAgICBtX3NjcmlwdENvZGVTaXplID0gbV9zY3JpcHRDb2RlUmVzeW5jID0g MDsKICAgICAKICAgICAvLyBGSVhNRTogVGhlIHNjcmlwdCBzaG91bGQgYmUgc3ludGF4IGhpZ2hs aWdodGVkLgogICAgIGlmIChpblZpZXdTb3VyY2VNb2RlKCkpCkBAIC02MTQsMTQgKzYxNCwxNCBA QCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZUNvbW1lbnQoU2VnbWVu dGVkU3RyaW5nJiBzcmMsIFN0YXRlIHN0YQogICAgIGNoZWNrU2NyaXB0QnVmZmVyKHNyYy5sZW5n dGgoKSk7CiAgICAgd2hpbGUgKCFzcmMuaXNFbXB0eSgpKSB7CiAgICAgICAgIFVDaGFyIGNoID0g KnNyYzsKLSAgICAgICAgc2NyaXB0Q29kZVtzY3JpcHRDb2RlU2l6ZSsrXSA9IGNoOworICAgICAg ICBtX3NjcmlwdENvZGVbbV9zY3JpcHRDb2RlU2l6ZSsrXSA9IGNoOwogICAgICAgICBpZiAoY2gg PT0gJz4nKSB7CiAgICAgICAgICAgICBib29sIGhhbmRsZUJyb2tlbkNvbW1lbnRzID0gbV9icm9r ZW5Db21tZW50cyAmJiAhKHN0YXRlLmluU2NyaXB0KCkgfHwgc3RhdGUuaW5TdHlsZSgpKTsKICAg ICAgICAgICAgIGludCBlbmRDaGFyc0NvdW50ID0gMTsgLy8gc3RhcnQgb2ZmIHdpdGggb25lIGZv ciB0aGUgJz4nIGNoYXJhY3RlcgotICAgICAgICAgICAgaWYgKHNjcmlwdENvZGVTaXplID4gMiAm JiBzY3JpcHRDb2RlW3NjcmlwdENvZGVTaXplLTNdID09ICctJyAmJiBzY3JpcHRDb2RlW3Njcmlw dENvZGVTaXplLTJdID09ICctJykgeworICAgICAgICAgICAgaWYgKG1fc2NyaXB0Q29kZVNpemUg PiAyICYmIG1fc2NyaXB0Q29kZVttX3NjcmlwdENvZGVTaXplLTNdID09ICctJyAmJiBtX3Njcmlw dENvZGVbbV9zY3JpcHRDb2RlU2l6ZS0yXSA9PSAnLScpIHsKICAgICAgICAgICAgICAgICBlbmRD aGFyc0NvdW50ID0gMzsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAoc2NyaXB0Q29kZVNpemUgPiAz ICYmIHNjcmlwdENvZGVbc2NyaXB0Q29kZVNpemUtNF0gPT0gJy0nICYmIHNjcmlwdENvZGVbc2Ny aXB0Q29kZVNpemUtM10gPT0gJy0nICYmIAotICAgICAgICAgICAgICAgIHNjcmlwdENvZGVbc2Ny aXB0Q29kZVNpemUtMl0gPT0gJyEnKSB7CisgICAgICAgICAgICB9IGVsc2UgaWYgKG1fc2NyaXB0 Q29kZVNpemUgPiAzICYmIG1fc2NyaXB0Q29kZVttX3NjcmlwdENvZGVTaXplLTRdID09ICctJyAm JiBtX3NjcmlwdENvZGVbbV9zY3JpcHRDb2RlU2l6ZS0zXSA9PSAnLScgJiYgCisgICAgICAgICAg ICAgICAgbV9zY3JpcHRDb2RlW21fc2NyaXB0Q29kZVNpemUtMl0gPT0gJyEnKSB7CiAgICAgICAg ICAgICAgICAgLy8gT3RoZXIgYnJvd3NlcnMgd2lsbCBhY2NlcHQgLS0hPiBhcyBhIGNsb3NlIGNv bW1lbnQsIGV2ZW4gdGhvdWdoIGl0J3MKICAgICAgICAgICAgICAgICAvLyBub3QgdGVjaG5pY2Fs bHkgdmFsaWQuCiAgICAgICAgICAgICAgICAgZW5kQ2hhcnNDb3VudCA9IDQ7CkBAIC02MzAsMTYg KzYzMCwxNiBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZUNvbW1l bnQoU2VnbWVudGVkU3RyaW5nJiBzcmMsIFN0YXRlIHN0YQogICAgICAgICAgICAgICAgIHNyYy5h ZHZhbmNlUGFzdE5vbk5ld2xpbmUoKTsKICAgICAgICAgICAgICAgICBpZiAoIShzdGF0ZS5pblRp dGxlKCkgfHwgc3RhdGUuaW5TY3JpcHQoKSB8fCBzdGF0ZS5pblhtcCgpIHx8IHN0YXRlLmluVGV4 dEFyZWEoKSB8fCBzdGF0ZS5pblN0eWxlKCkgfHwgc3RhdGUuaW5JRnJhbWUoKSkpIHsKICAgICAg ICAgICAgICAgICAgICAgY2hlY2tTY3JpcHRCdWZmZXIoKTsKLSAgICAgICAgICAgICAgICAgICAg c2NyaXB0Q29kZVtzY3JpcHRDb2RlU2l6ZV0gPSAwOwotICAgICAgICAgICAgICAgICAgICBzY3Jp cHRDb2RlW3NjcmlwdENvZGVTaXplICsgMV0gPSAwOworICAgICAgICAgICAgICAgICAgICBtX3Nj cmlwdENvZGVbbV9zY3JpcHRDb2RlU2l6ZV0gPSAwOworICAgICAgICAgICAgICAgICAgICBtX3Nj cmlwdENvZGVbbV9zY3JpcHRDb2RlU2l6ZSArIDFdID0gMDsKICAgICAgICAgICAgICAgICAgICAg Y3VyclRva2VuLnRhZ05hbWUgPSBjb21tZW50QXRvbTsKICAgICAgICAgICAgICAgICAgICAgY3Vy clRva2VuLmJlZ2luVGFnID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICAgICAgc3RhdGUgPSBwcm9j ZXNzTGlzdGluZyhTZWdtZW50ZWRTdHJpbmcoc2NyaXB0Q29kZSwgc2NyaXB0Q29kZVNpemUgLSBl bmRDaGFyc0NvdW50KSwgc3RhdGUpOworICAgICAgICAgICAgICAgICAgICBzdGF0ZSA9IHByb2Nl c3NMaXN0aW5nKFNlZ21lbnRlZFN0cmluZyhtX3NjcmlwdENvZGUsIG1fc2NyaXB0Q29kZVNpemUg LSBlbmRDaGFyc0NvdW50KSwgc3RhdGUpOwogICAgICAgICAgICAgICAgICAgICBwcm9jZXNzVG9r ZW4oKTsKICAgICAgICAgICAgICAgICAgICAgY3VyclRva2VuLnRhZ05hbWUgPSBjb21tZW50QXRv bTsKICAgICAgICAgICAgICAgICAgICAgY3VyclRva2VuLmJlZ2luVGFnID0gZmFsc2U7CiAgICAg ICAgICAgICAgICAgICAgIHByb2Nlc3NUb2tlbigpOwotICAgICAgICAgICAgICAgICAgICBzY3Jp cHRDb2RlU2l6ZSA9IDA7CisgICAgICAgICAgICAgICAgICAgIG1fc2NyaXB0Q29kZVNpemUgPSAw OwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBzdGF0ZS5zZXRJbkNvbW1lbnQo ZmFsc2UpOwogICAgICAgICAgICAgICAgIHJldHVybiBzdGF0ZTsgLy8gRmluaXNoZWQgcGFyc2lu ZyBjb21tZW50CkBAIC02NTYsMTEgKzY1NiwxMSBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1M VG9rZW5pemVyOjpwYXJzZVNlcnZlcihTZWdtZW50ZWRTdHJpbmcmIHNyYywgU3RhdGUgc3RhdAog ICAgIGNoZWNrU2NyaXB0QnVmZmVyKHNyYy5sZW5ndGgoKSk7CiAgICAgd2hpbGUgKCFzcmMuaXNF bXB0eSgpKSB7CiAgICAgICAgIFVDaGFyIGNoID0gKnNyYzsKLSAgICAgICAgc2NyaXB0Q29kZVtz Y3JpcHRDb2RlU2l6ZSsrXSA9IGNoOwotICAgICAgICBpZiAoY2ggPT0gJz4nICYmIHNjcmlwdENv ZGVTaXplID4gMSAmJiBzY3JpcHRDb2RlW3NjcmlwdENvZGVTaXplLTJdID09ICclJykgeworICAg ICAgICBtX3NjcmlwdENvZGVbbV9zY3JpcHRDb2RlU2l6ZSsrXSA9IGNoOworICAgICAgICBpZiAo Y2ggPT0gJz4nICYmIG1fc2NyaXB0Q29kZVNpemUgPiAxICYmIG1fc2NyaXB0Q29kZVttX3Njcmlw dENvZGVTaXplIC0gMl0gPT0gJyUnKSB7CiAgICAgICAgICAgICBzcmMuYWR2YW5jZVBhc3ROb25O ZXdsaW5lKCk7CiAgICAgICAgICAgICBzdGF0ZS5zZXRJblNlcnZlcihmYWxzZSk7Ci0gICAgICAg ICAgICBzY3JpcHRDb2RlU2l6ZSA9IDA7CisgICAgICAgICAgICBtX3NjcmlwdENvZGVTaXplID0g MDsKICAgICAgICAgICAgIHJldHVybiBzdGF0ZTsgLy8gRmluaXNoZWQgcGFyc2luZyBzZXJ2ZXIg aW5jbHVkZQogICAgICAgICB9CiAgICAgICAgIHNyYy5hZHZhbmNlKG1fbGluZU51bWJlcik7CkBA IC0xNTI5LDcgKzE1MjksNyBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpw YXJzZVRhZyhTZWdtZW50ZWRTdHJpbmcmIHNyYywgU3RhdGUgc3RhdGUpCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgc3RhdGUgPSBzYXZlZFN0YXRlOwogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHNyYyA9IHNhdmVkU3JjOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fbGlu ZU51bWJlciA9IHNhdmVkTGluZW5vOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNjcmlw dENvZGVTaXplID0gMDsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX3NjcmlwdENvZGVT aXplID0gMDsKICAgICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAodGFnTmFtZSA9PSB4bXBUYWcpIHsKQEAgLTE4 MTMsOSArMTgxMyw5IEBAIHZvaWQgSFRNTFRva2VuaXplcjo6ZW5kKCkKICAgICAgICAgaWYgKCFt X3N0YXRlLmhhc1RhZ1N0YXRlKCkpCiAgICAgICAgICAgICBwcm9jZXNzVG9rZW4oKTsKIAotICAg ICAgICBmYXN0RnJlZShzY3JpcHRDb2RlKTsKLSAgICAgICAgc2NyaXB0Q29kZSA9IDA7Ci0gICAg ICAgIHNjcmlwdENvZGVTaXplID0gc2NyaXB0Q29kZU1heFNpemUgPSBzY3JpcHRDb2RlUmVzeW5j ID0gMDsKKyAgICAgICAgZmFzdEZyZWUobV9zY3JpcHRDb2RlKTsKKyAgICAgICAgbV9zY3JpcHRD b2RlID0gMDsKKyAgICAgICAgbV9zY3JpcHRDb2RlU2l6ZSA9IG1fc2NyaXB0Q29kZUNhcGFjaXR5 ID0gbV9zY3JpcHRDb2RlUmVzeW5jID0gMDsKIAogICAgICAgICBmYXN0RnJlZShtX2J1ZmZlcik7 CiAgICAgICAgIG1fYnVmZmVyID0gMDsKQEAgLTE4MzAsMjkgKzE4MzAsMjkgQEAgdm9pZCBIVE1M VG9rZW5pemVyOjplbmQoKQogdm9pZCBIVE1MVG9rZW5pemVyOjpmaW5pc2goKQogewogICAgIC8v IGRvIHRoaXMgYXMgbG9uZyBhcyB3ZSBkb24ndCBmaW5kIG1hdGNoaW5nIGNvbW1lbnQgZW5kcwot ICAgIHdoaWxlICgobV9zdGF0ZS5pbkNvbW1lbnQoKSB8fCBtX3N0YXRlLmluU2VydmVyKCkpICYm IHNjcmlwdENvZGUgJiYgc2NyaXB0Q29kZVNpemUpIHsKKyAgICB3aGlsZSAoKG1fc3RhdGUuaW5D b21tZW50KCkgfHwgbV9zdGF0ZS5pblNlcnZlcigpKSAmJiBtX3NjcmlwdENvZGUgJiYgbV9zY3Jp cHRDb2RlU2l6ZSkgewogICAgICAgICAvLyB3ZSd2ZSBmb3VuZCBhbiB1bm1hdGNoZWQgY29tbWVu dCBzdGFydAogICAgICAgICBpZiAobV9zdGF0ZS5pbkNvbW1lbnQoKSkKICAgICAgICAgICAgIG1f YnJva2VuQ29tbWVudHMgPSB0cnVlOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBtX2Jyb2tl blNlcnZlciA9IHRydWU7CiAgICAgICAgIGNoZWNrU2NyaXB0QnVmZmVyKCk7Ci0gICAgICAgIHNj cmlwdENvZGVbc2NyaXB0Q29kZVNpemVdID0gMDsKLSAgICAgICAgc2NyaXB0Q29kZVtzY3JpcHRD b2RlU2l6ZSArIDFdID0gMDsKKyAgICAgICAgbV9zY3JpcHRDb2RlW21fc2NyaXB0Q29kZVNpemVd ID0gMDsKKyAgICAgICAgbV9zY3JpcHRDb2RlW21fc2NyaXB0Q29kZVNpemUgKyAxXSA9IDA7CiAg ICAgICAgIGludCBwb3M7CiAgICAgICAgIFN0cmluZyBmb29kOwogICAgICAgICBpZiAobV9zdGF0 ZS5pblNjcmlwdCgpIHx8IG1fc3RhdGUuaW5TdHlsZSgpIHx8IG1fc3RhdGUuaW5UZXh0QXJlYSgp KQotICAgICAgICAgICAgZm9vZCA9IFN0cmluZyhzY3JpcHRDb2RlLCBzY3JpcHRDb2RlU2l6ZSk7 CisgICAgICAgICAgICBmb29kID0gU3RyaW5nKG1fc2NyaXB0Q29kZSwgbV9zY3JpcHRDb2RlU2l6 ZSk7CiAgICAgICAgIGVsc2UgaWYgKG1fc3RhdGUuaW5TZXJ2ZXIoKSkgewogICAgICAgICAgICAg Zm9vZCA9ICI8IjsKLSAgICAgICAgICAgIGZvb2QuYXBwZW5kKHNjcmlwdENvZGUsIHNjcmlwdENv ZGVTaXplKTsKKyAgICAgICAgICAgIGZvb2QuYXBwZW5kKG1fc2NyaXB0Q29kZSwgbV9zY3JpcHRD b2RlU2l6ZSk7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBwb3MgPSBmaW5kKHNjcmlw dENvZGUsIHNjcmlwdENvZGVTaXplLCAnPicpOwotICAgICAgICAgICAgZm9vZCA9IFN0cmluZyhz Y3JpcHRDb2RlICsgcG9zICsgMSwgc2NyaXB0Q29kZVNpemUgLSBwb3MgLSAxKTsKKyAgICAgICAg ICAgIHBvcyA9IGZpbmQobV9zY3JpcHRDb2RlLCBtX3NjcmlwdENvZGVTaXplLCAnPicpOworICAg ICAgICAgICAgZm9vZCA9IFN0cmluZyhtX3NjcmlwdENvZGUgKyBwb3MgKyAxLCBtX3NjcmlwdENv ZGVTaXplIC0gcG9zIC0gMSk7CiAgICAgICAgIH0KLSAgICAgICAgZmFzdEZyZWUoc2NyaXB0Q29k ZSk7Ci0gICAgICAgIHNjcmlwdENvZGUgPSAwOwotICAgICAgICBzY3JpcHRDb2RlU2l6ZSA9IHNj cmlwdENvZGVNYXhTaXplID0gc2NyaXB0Q29kZVJlc3luYyA9IDA7CisgICAgICAgIGZhc3RGcmVl KG1fc2NyaXB0Q29kZSk7CisgICAgICAgIG1fc2NyaXB0Q29kZSA9IDA7CisgICAgICAgIG1fc2Ny aXB0Q29kZVNpemUgPSBtX3NjcmlwdENvZGVDYXBhY2l0eSA9IG1fc2NyaXB0Q29kZVJlc3luYyA9 IDA7CiAgICAgICAgIG1fc3RhdGUuc2V0SW5Db21tZW50KGZhbHNlKTsKICAgICAgICAgbV9zdGF0 ZS5zZXRJblNlcnZlcihmYWxzZSk7CiAgICAgICAgIGlmICghZm9vZC5pc0VtcHR5KCkpCkBAIC0x OTI3LDkgKzE5MjcsOSBAQCB2b2lkIEhUTUxUb2tlbml6ZXI6OmVubGFyZ2VCdWZmZXIoaW50IGxl bikKIAogdm9pZCBIVE1MVG9rZW5pemVyOjplbmxhcmdlU2NyaXB0QnVmZmVyKGludCBsZW4pCiB7 Ci0gICAgaW50IG5ld1NpemUgPSBtYXgoc2NyaXB0Q29kZU1heFNpemUgKiAyLCBzY3JpcHRDb2Rl TWF4U2l6ZSArIGxlbik7Ci0gICAgc2NyaXB0Q29kZSA9IHN0YXRpY19jYXN0PFVDaGFyKj4oZmFz dFJlYWxsb2Moc2NyaXB0Q29kZSwgbmV3U2l6ZSAqIHNpemVvZihVQ2hhcikpKTsKLSAgICBzY3Jp cHRDb2RlTWF4U2l6ZSA9IG5ld1NpemU7CisgICAgaW50IG5ld1NpemUgPSBtYXgobV9zY3JpcHRD b2RlQ2FwYWNpdHkgKiAyLCBtX3NjcmlwdENvZGVDYXBhY2l0eSArIGxlbik7CisgICAgbV9zY3Jp cHRDb2RlID0gc3RhdGljX2Nhc3Q8VUNoYXIqPihmYXN0UmVhbGxvYyhtX3NjcmlwdENvZGUsIG5l d1NpemUgKiBzaXplb2YoVUNoYXIpKSk7CisgICAgbV9zY3JpcHRDb2RlQ2FwYWNpdHkgPSBuZXdT aXplOwogfQogICAgIAogdm9pZCBIVE1MVG9rZW5pemVyOjpleGVjdXRlU2NyaXB0c1dhaXRpbmdG b3JTdHlsZXNoZWV0cygpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5o IGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuaAppbmRleCAyYzc0ZGViLi5hZDE5NGFlIDEw MDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5oCisrKyBiL1dlYkNvcmUvaHRt bC9IVE1MVG9rZW5pemVyLmgKQEAgLTE4Niw3ICsxODYsNyBAQCBwcml2YXRlOgogCiAgICAgaW5s aW5lIHZvaWQgY2hlY2tTY3JpcHRCdWZmZXIoaW50IGxlbiA9IDEwKQogICAgIHsKLSAgICAgICAg aWYgKHNjcmlwdENvZGVTaXplICsgbGVuID49IHNjcmlwdENvZGVNYXhTaXplKQorICAgICAgICBp ZiAobV9zY3JpcHRDb2RlU2l6ZSArIGxlbiA+PSBtX3NjcmlwdENvZGVDYXBhY2l0eSkKICAgICAg ICAgICAgIGVubGFyZ2VTY3JpcHRCdWZmZXIobGVuKTsKICAgICB9CiAKQEAgLTMzOSwxMyArMzM5 LDEzIEBAIHByaXZhdGU6CiAgICAgQXRvbWljU3RyaW5nIG1fYXR0ck5hbWU7CiAKICAgICAvLyBV c2VkIHRvIHN0b3JlIHRoZSBjb2RlIG9mIGEgc2NyaXB0aW5nIHNlcXVlbmNlCi0gICAgVUNoYXIq IHNjcmlwdENvZGU7CisgICAgVUNoYXIqIG1fc2NyaXB0Q29kZTsKICAgICAvLyBTaXplIG9mIHRo ZSBzY3JpcHQgc2VxdWVuemUgc3RvcmVkIGluIEByZWYgI3NjcmlwdENvZGUKLSAgICBpbnQgc2Ny aXB0Q29kZVNpemU7CisgICAgaW50IG1fc2NyaXB0Q29kZVNpemU7CiAgICAgLy8gTWF4aW1hbCBz aXplIHRoYXQgY2FuIGJlIHN0b3JlZCBpbiBAcmVmICNzY3JpcHRDb2RlCi0gICAgaW50IHNjcmlw dENvZGVNYXhTaXplOworICAgIGludCBtX3NjcmlwdENvZGVDYXBhY2l0eTsKICAgICAvLyByZXN5 bmMgcG9pbnQgb2Ygc2NyaXB0IGNvZGUgc2l6ZQotICAgIGludCBzY3JpcHRDb2RlUmVzeW5jOwor ICAgIGludCBtX3NjcmlwdENvZGVSZXN5bmM7CiAKICAgICAvLyBTdG9yZXMgY2hhcmFjdGVycyBp ZiB3ZSBhcmUgc2Nhbm5pbmcgZm9yIGEgc3RyaW5nIGxpa2UgIjwvc2NyaXB0PiIKICAgICBVQ2hh ciBzZWFyY2hCdWZmZXJbMTBdOwpAQCAtMzU0LDcgKzM1NCw2IEBAIHByaXZhdGU6CiAgICAgaW50 IHNlYXJjaENvdW50OwogICAgIC8vIHRoZSBzdG9wcGVyIHN0cmluZwogICAgIGNvbnN0IGNoYXIq IG1fc2VhcmNoU3RvcHBlcjsKLSAgICAvLyB0aGUgc3RvcHBlciBsZW4KICAgICBpbnQgbV9zZWFy Y2hTdG9wcGVyTGVuOwogICAgIAogICAgIC8vIGlmIG5vIG1vcmUgZGF0YSBpcyBjb21pbmcsIGp1 c3QgcGFyc2Ugd2hhdCB3ZSBoYXZlIChpbmNsdWRpbmcgZXh0IHNjcmlwdHMgdGhhdAo= 25073 2008-11-11 15:18:12 -0800 2008-11-11 16:20:11 -0800 Rename scriptStartLineno to m_currentScriptTagStartLineNumber and tagStartLineno to m_currentTagStartLineNumber tLineno-to-m_currentScriptTagStartLineNumber-and-tagStartLineno-to-m_currentTagStartLineNumber.patch text/plain 3795 eric OWY5ODc5ODNmZjRkNWE3MzJmOTdlNjU4NzgzZGM5NTg5OTYwZTlhNwpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu Y3BwCmluZGV4IDEyY2U5NjQuLmMwYWRmNTEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTI1 Myw4ICsyNTMsOCBAQCB2b2lkIEhUTUxUb2tlbml6ZXI6OmJlZ2luKCkKICAgICBtX2Jyb2tlbkNv bW1lbnRzID0gZmFsc2U7CiAgICAgbV9icm9rZW5TZXJ2ZXIgPSBmYWxzZTsKICAgICBtX2xpbmVO dW1iZXIgPSAwOwotICAgIHNjcmlwdFN0YXJ0TGluZW5vID0gMDsKLSAgICB0YWdTdGFydExpbmVu byA9IDA7CisgICAgbV9jdXJyZW50U2NyaXB0VGFnU3RhcnRMaW5lTnVtYmVyID0gMDsKKyAgICBt X2N1cnJlbnRUYWdTdGFydExpbmVOdW1iZXIgPSAwOwogICAgIG1fc3RhdGUuc2V0Rm9yY2VTeW5j aHJvbm91cyhmYWxzZSk7CiAKICAgICBQYWdlKiBwYWdlID0gbV9kb2MtPnBhZ2UoKTsKQEAgLTMx Niw4ICszMTYsOCBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZVNw ZWNpYWwoU2VnbWVudGVkU3RyaW5nJiBzcmMsIFN0YXRlIHN0YQogICAgIEFTU0VSVChzdGF0ZS5p blRleHRBcmVhKCkgfHwgc3RhdGUuaW5UaXRsZSgpIHx8IHN0YXRlLmluSUZyYW1lKCkgfHwgIXN0 YXRlLmhhc0VudGl0eVN0YXRlKCkpOwogICAgIEFTU0VSVCghc3RhdGUuaGFzVGFnU3RhdGUoKSk7 CiAgICAgQVNTRVJUKHN0YXRlLmluWG1wKCkgKyBzdGF0ZS5pblRleHRBcmVhKCkgKyBzdGF0ZS5p blRpdGxlKCkgKyBzdGF0ZS5pblN0eWxlKCkgKyBzdGF0ZS5pblNjcmlwdCgpICsgc3RhdGUuaW5J RnJhbWUoKSA9PSAxICk7Ci0gICAgaWYgKHN0YXRlLmluU2NyaXB0KCkgJiYgIXNjcmlwdFN0YXJ0 TGluZW5vKQotICAgICAgICBzY3JpcHRTdGFydExpbmVubyA9IG1fbGluZU51bWJlciArIDE7IC8v IFNjcmlwdCBsaW5lIG51bWJlcnMgYXJlIDEgYmFzZWQuCisgICAgaWYgKHN0YXRlLmluU2NyaXB0 KCkgJiYgIW1fY3VycmVudFNjcmlwdFRhZ1N0YXJ0TGluZU51bWJlcikKKyAgICAgICAgbV9jdXJy ZW50U2NyaXB0VGFnU3RhcnRMaW5lTnVtYmVyID0gbV9saW5lTnVtYmVyOwogCiAgICAgaWYgKHN0 YXRlLmluQ29tbWVudCgpKSAKICAgICAgICAgc3RhdGUgPSBwYXJzZUNvbW1lbnQoc3JjLCBzdGF0 ZSk7CkBAIC00MTIsMTAgKzQxMiwxMCBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5p emVyOjpzY3JpcHRIYW5kbGVyKFN0YXRlIHN0YXRlKQogewogICAgIC8vIFdlIGFyZSBpbnNpZGUg YSA8c2NyaXB0PgogICAgIGJvb2wgZG9TY3JpcHRFeGVjID0gZmFsc2U7Ci0gICAgaW50IHN0YXJ0 TGluZSA9IHNjcmlwdFN0YXJ0TGluZW5vOworICAgIGludCBzdGFydExpbmUgPSBtX2N1cnJlbnRT Y3JpcHRUYWdTdGFydExpbmVOdW1iZXIgKyAxOyAvLyBTY3JpcHQgbGluZSBudW1iZXJzIGFyZSAx IGJhc2VkLCBIVE1MVG9rZW56aWVyIGxpbmUgbnVtYmVycyBhcmUgMCBiYXNlZAogCi0gICAgLy8g UmVzZXQgc2NyaXB0U3RhcnRMaW5lbm8gdG8gaW5kaWNhdGUgdGhhdCB3ZSd2ZSBmaW5pc2hlZCBw YXJzaW5nIHRoZSBjdXJyZW50IHNjcmlwdCBlbGVtZW50Ci0gICAgc2NyaXB0U3RhcnRMaW5lbm8g PSAwOworICAgIC8vIFJlc2V0IG1fY3VycmVudFNjcmlwdFRhZ1N0YXJ0TGluZU51bWJlciB0byBp bmRpY2F0ZSB0aGF0IHdlJ3ZlIGZpbmlzaGVkIHBhcnNpbmcgdGhlIGN1cnJlbnQgc2NyaXB0IGVs ZW1lbnQKKyAgICBtX2N1cnJlbnRTY3JpcHRUYWdTdGFydExpbmVOdW1iZXIgPSAwOwogCiAgICAg Ly8gKEJ1Z3ppbGxhIDM4MzcpIFNjcmlwdHMgZm9sbG93aW5nIGEgZnJhbWVzZXQgZWxlbWVudCBz aG91bGQgbm90IGV4ZWN1dGUgb3IsIAogICAgIC8vIGluIHRoZSBjYXNlIG9mIGV4dGVybiBzY3Jp cHRzLCBldmVuIGxvYWQuCkBAIC0xNzI3LDcgKzE3MjcsNyBAQCBib29sIEhUTUxUb2tlbml6ZXI6 OndyaXRlKGNvbnN0IFNlZ21lbnRlZFN0cmluZyYgc3RyLCBib29sIGFwcGVuZERhdGEpCiAgICAg ICAgICAgICBtX3NyYy5hZHZhbmNlUGFzdE5vbk5ld2xpbmUoKTsKICAgICAgICAgICAgIHN0YXRl ID0gcGFyc2VFbnRpdHkobV9zcmMsIG1fZGVzdCwgc3RhdGUsIG1fY0J1ZmZlclBvcywgdHJ1ZSwg c3RhdGUuaGFzVGFnU3RhdGUoKSk7CiAgICAgICAgIH0gZWxzZSBpZiAoY2MgPT0gJzwnICYmICFt X3NyYy5lc2NhcGVkKCkpIHsKLSAgICAgICAgICAgIHRhZ1N0YXJ0TGluZW5vID0gbV9saW5lTnVt YmVyOworICAgICAgICAgICAgbV9jdXJyZW50VGFnU3RhcnRMaW5lTnVtYmVyID0gbV9saW5lTnVt YmVyOwogICAgICAgICAgICAgbV9zcmMuYWR2YW5jZVBhc3ROb25OZXdsaW5lKCk7CiAgICAgICAg ICAgICBzdGF0ZS5zZXRTdGFydFRhZyh0cnVlKTsKICAgICAgICAgICAgIHN0YXRlLnNldERpc2Nh cmRMRihmYWxzZSk7CkBAIC0xODY5LDcgKzE4NjksOCBAQCBQYXNzUmVmUHRyPE5vZGU+IEhUTUxU b2tlbml6ZXI6OnByb2Nlc3NUb2tlbigpCiB7CiAgICAgU2NyaXB0Q29udHJvbGxlciogc2NyaXB0 Q29udHJvbGxlciA9ICghbV9mcmFnbWVudCAmJiBtX2RvYy0+ZnJhbWUoKSkgPyBtX2RvYy0+ZnJh bWUoKS0+c2NyaXB0KCkgOiAwOwogICAgIGlmIChzY3JpcHRDb250cm9sbGVyICYmIHNjcmlwdENv bnRyb2xsZXItPmlzRW5hYmxlZCgpKQotICAgICAgICBzY3JpcHRDb250cm9sbGVyLT5zZXRFdmVu dEhhbmRsZXJMaW5lbm8odGFnU3RhcnRMaW5lbm8gKyAxKTsgLy8gU2NyaXB0IGxpbmUgbnVtYmVy cyBhcmUgMSBiYXNlZC4KKyAgICAgICAgLy8gRklYTUU6IFdoeSBpc24ndCB0aGlzIG1fY3VycmVu dFNjcmlwdFRhZ1N0YXJ0TGluZU51bWJlcj8gIEkgc3VzcGVjdCB0aGlzIGlzIHdyb25nLgorICAg ICAgICBzY3JpcHRDb250cm9sbGVyLT5zZXRFdmVudEhhbmRsZXJMaW5lbm8obV9jdXJyZW50VGFn U3RhcnRMaW5lTnVtYmVyICsgMSk7IC8vIFNjcmlwdCBsaW5lIG51bWJlcnMgYXJlIDEgYmFzZWQu CiAgICAgaWYgKG1fZGVzdCA+IG1fYnVmZmVyKSB7CiAgICAgICAgIGN1cnJUb2tlbi50ZXh0ID0g U3RyaW5nSW1wbDo6Y3JlYXRlU3RyaXBwaW5nTnVsbENoYXJhY3RlcnMobV9idWZmZXIsIG1fZGVz dCAtIG1fYnVmZmVyKTsKICAgICAgICAgaWYgKGN1cnJUb2tlbi50YWdOYW1lICE9IGNvbW1lbnRB dG9tKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuaCBiL1dlYkNvcmUv aHRtbC9IVE1MVG9rZW5pemVyLmgKaW5kZXggYWQxOTRhZS4uZWI0NjkyZSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuaAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2Vu aXplci5oCkBAIC0zODMsOSArMzgzLDggQEAgcHJpdmF0ZToKICAgICBib29sIG1fYnJva2VuQ29t bWVudHM7CiAgICAgLy8gY3VycmVudCBsaW5lIG51bWJlcgogICAgIGludCBtX2xpbmVOdW1iZXI7 Ci0gICAgLy8gbGluZSBudW1iZXIgYXQgd2hpY2ggdGhlIGN1cnJlbnQgPHNjcmlwdD4gc3RhcnRl ZAotICAgIGludCBzY3JpcHRTdGFydExpbmVubzsKLSAgICBpbnQgdGFnU3RhcnRMaW5lbm87Cisg ICAgaW50IG1fY3VycmVudFNjcmlwdFRhZ1N0YXJ0TGluZU51bWJlcjsKKyAgICBpbnQgbV9jdXJy ZW50VGFnU3RhcnRMaW5lTnVtYmVyOwogCiAgICAgZG91YmxlIG1fdG9rZW5pemVyVGltZURlbGF5 OwogICAgIGludCBtX3Rva2VuaXplckNodW5rU2l6ZTsK 25074 2008-11-11 15:18:16 -0800 2008-11-11 16:20:38 -0800 Rename scriptSrc to m_scriptTagSrcAttrValue and scriptSrcCharset to m_scriptTagCharsetAttrValue -- a bit unwieldy, but more precise cAttrValue-and-scriptSrcCharset-to-m_scriptTagCharsetAttrValue-a-bit-unwieldy-but-more-precise.patch text/plain 4024 eric NzFmZjBlMTJhNDQwYTc4NmI0MTMxY2E2YWIzNDcxMzk5MWMwNzVmOQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu Y3BwCmluZGV4IGMwYWRmNTEuLmMyZWY0MWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTI0 Niw3ICsyNDYsNyBAQCB2b2lkIEhUTUxUb2tlbml6ZXI6OmJlZ2luKCkKICAgICB0cXVvdGUgPSBO b1F1b3RlOwogICAgIHNlYXJjaENvdW50ID0gMDsKICAgICBtX3N0YXRlLnNldEVudGl0eVN0YXRl KE5vRW50aXR5KTsKLSAgICBzY3JpcHRTcmMgPSBTdHJpbmcoKTsKKyAgICBtX3NjcmlwdFRhZ1Ny Y0F0dHJWYWx1ZSA9IFN0cmluZygpOwogICAgIG1fcGVuZGluZ1NyYy5jbGVhcigpOwogICAgIG1f Y3VycmVudFByZXBlbmRpbmdTcmMgPSAwOwogICAgIG1fbm9Nb3JlRGF0YSA9IGZhbHNlOwpAQCAt NDI0LDcgKzQyNCw3IEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnNjcmlw dEhhbmRsZXIoU3RhdGUgc3RhdGUpCiAgICAgQ2FjaGVkU2NyaXB0KiBjcyA9IDA7CiAgICAgLy8g ZG9uJ3QgbG9hZCBleHRlcm5hbCBzY3JpcHRzIGZvciBzdGFuZGFsb25lIGRvY3VtZW50cyAoZm9y IG5vdykKICAgICBpZiAoIWluVmlld1NvdXJjZU1vZGUoKSkgewotICAgICAgICBpZiAoIXNjcmlw dFNyYy5pc0VtcHR5KCkgJiYgbV9kb2MtPmZyYW1lKCkpIHsKKyAgICAgICAgaWYgKCFtX3Njcmlw dFRhZ1NyY0F0dHJWYWx1ZS5pc0VtcHR5KCkgJiYgbV9kb2MtPmZyYW1lKCkpIHsKICAgICAgICAg ICAgIC8vIGZvcmdldCB3aGF0IHdlIGp1c3QgZ290OyBsb2FkIGZyb20gc3JjIHVybCBpbnN0ZWFk CiAgICAgICAgICAgICBpZiAoIW1fcGFyc2VyLT5za2lwTW9kZSgpICYmICFmb2xsb3dpbmdGcmFt ZXNldCkgewogI2lmZGVmIElOU1RSVU1FTlRfTEFZT1VUX1NDSEVEVUxJTkcKQEAgLTQzMywxMyAr NDMzLDEzIEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnNjcmlwdEhhbmRs ZXIoU3RhdGUgc3RhdGUpCiAjZW5kaWYKICAgICAgICAgICAgICAgICAvLyBUaGUgcGFyc2VyIG1p Z2h0IGhhdmUgYmVlbiBzdG9wcGVkIGJ5IGZvciBleGFtcGxlIGEgd2luZG93LmNsb3NlIGNhbGwg aW4gYW4gZWFybGllciBzY3JpcHQuCiAgICAgICAgICAgICAgICAgLy8gSWYgc28sIHdlIGRvbid0 IHdhbnQgdG8gbG9hZCBzY3JpcHRzLgotICAgICAgICAgICAgICAgIGlmICghbV9wYXJzZXJTdG9w cGVkICYmIChjcyA9IG1fZG9jLT5kb2NMb2FkZXIoKS0+cmVxdWVzdFNjcmlwdChzY3JpcHRTcmMs IHNjcmlwdFNyY0NoYXJzZXQpKSkKKyAgICAgICAgICAgICAgICBpZiAoIW1fcGFyc2VyU3RvcHBl ZCAmJiAoY3MgPSBtX2RvYy0+ZG9jTG9hZGVyKCktPnJlcXVlc3RTY3JpcHQobV9zY3JpcHRUYWdT cmNBdHRyVmFsdWUsIG1fc2NyaXB0VGFnQ2hhcnNldEF0dHJWYWx1ZSkpKQogICAgICAgICAgICAg ICAgICAgICBtX3BlbmRpbmdTY3JpcHRzLmFwcGVuZChjcyk7CiAgICAgICAgICAgICAgICAgZWxz ZQogICAgICAgICAgICAgICAgICAgICBtX3NjcmlwdE5vZGUgPSAwOwogICAgICAgICAgICAgfSBl bHNlCiAgICAgICAgICAgICAgICAgbV9zY3JpcHROb2RlID0gMDsKLSAgICAgICAgICAgIHNjcmlw dFNyYyA9IFN0cmluZygpOworICAgICAgICAgICAgbV9zY3JpcHRUYWdTcmNBdHRyVmFsdWUgPSBT dHJpbmcoKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIC8vIFBhcnNlIG1fc2NyaXB0 Q29kZSBjb250YWluaW5nIDxzY3JpcHQ+IGluZm8KICNpZiBVU0UoTE9XX0JBTkRXSURUSF9ESVNQ TEFZKQpAQCAtMTQ2NSwxMiArMTQ2NSwxMiBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9r ZW5pemVyOjpwYXJzZVRhZyhTZWdtZW50ZWRTdHJpbmcmIHNyYywgU3RhdGUgc3RhdGUpCiAgICAg ICAgICAgICBib29sIGJlZ2luVGFnID0gIWN1cnJUb2tlbi5mbGF0ICYmIGN1cnJUb2tlbi5iZWdp blRhZzsKICAgICAgICAgICAgIGlmIChjdXJyVG9rZW4uYmVnaW5UYWcgJiYgY3VyclRva2VuLnRh Z05hbWUgPT0gc2NyaXB0VGFnICYmICFpblZpZXdTb3VyY2VNb2RlKCkgJiYgIW1fcGFyc2VyLT5z a2lwTW9kZSgpKSB7CiAgICAgICAgICAgICAgICAgQXR0cmlidXRlKiBhID0gMDsKLSAgICAgICAg ICAgICAgICBzY3JpcHRTcmMgPSBTdHJpbmcoKTsKLSAgICAgICAgICAgICAgICBzY3JpcHRTcmND aGFyc2V0ID0gU3RyaW5nKCk7CisgICAgICAgICAgICAgICAgbV9zY3JpcHRUYWdTcmNBdHRyVmFs dWUgPSBTdHJpbmcoKTsKKyAgICAgICAgICAgICAgICBtX3NjcmlwdFRhZ0NoYXJzZXRBdHRyVmFs dWUgPSBTdHJpbmcoKTsKICAgICAgICAgICAgICAgICBpZiAoY3VyclRva2VuLmF0dHJzICYmICFt X2ZyYWdtZW50KSB7CiAgICAgICAgICAgICAgICAgICAgIGlmIChtX2RvYy0+ZnJhbWUoKSAmJiBt X2RvYy0+ZnJhbWUoKS0+c2NyaXB0KCktPmlzRW5hYmxlZCgpKSB7CiAgICAgICAgICAgICAgICAg ICAgICAgICBpZiAoKGEgPSBjdXJyVG9rZW4uYXR0cnMtPmdldEF0dHJpYnV0ZUl0ZW0oc3JjQXR0 cikpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNjcmlwdFNyYyA9IG1fZG9jLT5jb21w bGV0ZVVSTChwYXJzZVVSTChhLT52YWx1ZSgpKSkuc3RyaW5nKCk7CisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbV9zY3JpcHRUYWdTcmNBdHRyVmFsdWUgPSBtX2RvYy0+Y29tcGxldGVVUkwo cGFyc2VVUkwoYS0+dmFsdWUoKSkpLnN0cmluZygpOwogICAgICAgICAgICAgICAgICAgICB9CiAg ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQpAQCAtMTQ4NSw3ICsxNDg1LDcgQEAgSFRN TFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6cGFyc2VUYWcoU2VnbWVudGVkU3RyaW5n JiBzcmMsIFN0YXRlIHN0YXRlKQogICAgICAgICAgICAgICAgICAgICBBU1NFUlQoIW1fc2NyaXB0 Tm9kZSk7CiAgICAgICAgICAgICAgICAgICAgIG1fc2NyaXB0Tm9kZSA9IHN0YXRpY19wb2ludGVy X2Nhc3Q8SFRNTFNjcmlwdEVsZW1lbnQ+KG4pOwogICAgICAgICAgICAgICAgICAgICBpZiAobV9z Y3JpcHROb2RlKQotICAgICAgICAgICAgICAgICAgICAgICAgc2NyaXB0U3JjQ2hhcnNldCA9IG1f c2NyaXB0Tm9kZS0+c2NyaXB0Q2hhcnNldCgpOworICAgICAgICAgICAgICAgICAgICAgICAgbV9z Y3JpcHRUYWdDaGFyc2V0QXR0clZhbHVlID0gbV9zY3JpcHROb2RlLT5zY3JpcHRDaGFyc2V0KCk7 CiAgICAgICAgICAgICAgICAgICAgIGlmIChiZWdpblRhZykgewogICAgICAgICAgICAgICAgICAg ICAgICAgbV9zZWFyY2hTdG9wcGVyID0gc2NyaXB0RW5kOwogICAgICAgICAgICAgICAgICAgICAg ICAgbV9zZWFyY2hTdG9wcGVyTGVuID0gODsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmggYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5oCmluZGV4IGViNDY5MmUu LjdlNWRlMTYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmgKKysrIGIv V2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuaApAQCAtMzYwLDggKzM2MCw4IEBAIHByaXZhdGU6 CiAgICAgLy8gbWF5IGJlIHN0aWxsIGRvd25sb2FkaW5nKSBhbmQgZmluaXNoCiAgICAgYm9vbCBt X25vTW9yZURhdGE7CiAgICAgLy8gVVJMIHRvIGdldCBzb3VyY2UgY29kZSBvZiBzY3JpcHQgZnJv bQotICAgIFN0cmluZyBzY3JpcHRTcmM7Ci0gICAgU3RyaW5nIHNjcmlwdFNyY0NoYXJzZXQ7Cisg ICAgU3RyaW5nIG1fc2NyaXB0VGFnU3JjQXR0clZhbHVlOworICAgIFN0cmluZyBtX3NjcmlwdFRh Z0NoYXJzZXRBdHRyVmFsdWU7CiAgICAgLy8gdGhlIEhUTUwgY29kZSB3ZSB3aWxsIHBhcnNlIGFm dGVyIHRoZSBleHRlcm5hbCBzY3JpcHQgd2UgYXJlIHdhaXRpbmcgZm9yIGhhcyBsb2FkZWQKICAg ICBTZWdtZW50ZWRTdHJpbmcgbV9wZW5kaW5nU3JjOwogCg== 25075 2008-11-11 15:18:17 -0800 2008-11-11 16:25:15 -0800 Rename flat to selfClosingTag Rename-flat-to-selfClosingTag.patch text/plain 3073 eric MTM2ODNjNjBiNzI1YmY0OTA4ODY1NDU1YWFhZTU2OTk5YTQwOTFiZApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu Y3BwCmluZGV4IGMyZWY0MWUuLjJlNjRjMjkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTEy OTUsNyArMTI5NSw3IEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnBhcnNl VGFnKFNlZ21lbnRlZFN0cmluZyYgc3JjLCBTdGF0ZSBzdGF0ZSkKICAgICAgICAgICAgICAgICAg ICAgLy8gVGhpcyBpcyBhIHF1aXJrICh3aXRoIGEgbG9uZyBzYWQgaGlzdG9yeSkuICBXZSBoYXZl IHRvIGRvIHRoaXMKICAgICAgICAgICAgICAgICAgICAgLy8gc2luY2Ugd2lkZ2V0cyBkbyA8c2Ny aXB0IHNyYz0iZm9vLmpzIi8+IGFuZCBleHBlY3QgdGhlIHRhZyB0byBjbG9zZS4KICAgICAgICAg ICAgICAgICAgICAgaWYgKGN1cnJUb2tlbi50YWdOYW1lID09IHNjcmlwdFRhZykKLSAgICAgICAg ICAgICAgICAgICAgICAgIGN1cnJUb2tlbi5mbGF0ID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICAg ICAgICAgIGN1cnJUb2tlbi5zZWxmQ2xvc2luZ1RhZyA9IHRydWU7CiAgICAgICAgICAgICAgICAg ICAgIGN1cnJUb2tlbi5icm9rZW5YTUxTdHlsZSA9IHRydWU7CiAgICAgICAgICAgICAgICAgfQog CkBAIC0xNDM3LDcgKzE0MzcsNyBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVy OjpwYXJzZVRhZyhTZWdtZW50ZWRTdHJpbmcmIHNyYywgU3RhdGUgc3RhdGUpCiAgICAgICAgICAg ICAgICAgaWYgKGNoID09ICc+JyB8fCBjaCA9PSAnPCcpCiAgICAgICAgICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICAgICAgICAgIGlmIChjaCA9PSAnLycpCi0gICAgICAgICAgICAgICAgICAg IGN1cnJUb2tlbi5mbGF0ID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICAgICAgY3VyclRva2VuLnNl bGZDbG9zaW5nVGFnID0gdHJ1ZTsKICAgICAgICAgICAgICAgICBpZiAoaW5WaWV3U291cmNlTW9k ZSgpKQogICAgICAgICAgICAgICAgICAgICBjdXJyVG9rZW4uYWRkVmlld1NvdXJjZUNoYXIoY2gp OwogICAgICAgICAgICAgICAgIHNyYy5hZHZhbmNlKG1fbGluZU51bWJlcik7CkBAIC0xNDYxLDgg KzE0NjEsOCBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJzZVRhZyhT ZWdtZW50ZWRTdHJpbmcmIHNyYywgU3RhdGUgc3RhdGUpCiAKICAgICAgICAgICAgIC8vIEhhbmRs ZSA8c2NyaXB0IHNyYz0iZm9vIi8+IGxpa2UgTW96aWxsYS9PcGVyYS4gV2UgaGF2ZSB0byBkbyB0 aGlzIG5vdyBmb3IgRGFzaGJvYXJkCiAgICAgICAgICAgICAvLyBjb21wYXRpYmlsaXR5LgotICAg ICAgICAgICAgYm9vbCBpc1NlbGZDbG9zaW5nU2NyaXB0ID0gY3VyclRva2VuLmZsYXQgJiYgY3Vy clRva2VuLmJlZ2luVGFnICYmIGN1cnJUb2tlbi50YWdOYW1lID09IHNjcmlwdFRhZzsKLSAgICAg ICAgICAgIGJvb2wgYmVnaW5UYWcgPSAhY3VyclRva2VuLmZsYXQgJiYgY3VyclRva2VuLmJlZ2lu VGFnOworICAgICAgICAgICAgYm9vbCBpc1NlbGZDbG9zaW5nU2NyaXB0ID0gY3VyclRva2VuLnNl bGZDbG9zaW5nVGFnICYmIGN1cnJUb2tlbi5iZWdpblRhZyAmJiBjdXJyVG9rZW4udGFnTmFtZSA9 PSBzY3JpcHRUYWc7CisgICAgICAgICAgICBib29sIGJlZ2luVGFnID0gIWN1cnJUb2tlbi5zZWxm Q2xvc2luZ1RhZyAmJiBjdXJyVG9rZW4uYmVnaW5UYWc7CiAgICAgICAgICAgICBpZiAoY3VyclRv a2VuLmJlZ2luVGFnICYmIGN1cnJUb2tlbi50YWdOYW1lID09IHNjcmlwdFRhZyAmJiAhaW5WaWV3 U291cmNlTW9kZSgpICYmICFtX3BhcnNlci0+c2tpcE1vZGUoKSkgewogICAgICAgICAgICAgICAg IEF0dHJpYnV0ZSogYSA9IDA7CiAgICAgICAgICAgICAgICAgbV9zY3JpcHRUYWdTcmNBdHRyVmFs dWUgPSBTdHJpbmcoKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmgg Yi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5oCmluZGV4IDdlNWRlMTYuLjYzYjIzMTQgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmgKKysrIGIvV2ViQ29yZS9odG1s L0hUTUxUb2tlbml6ZXIuaApAQCAtNTUsNyArNTUsMTIgQEAgY2xhc3MgUHJlbG9hZFNjYW5uZXI7 CiAgKi8KIGNsYXNzIFRva2VuIHsKIHB1YmxpYzoKLSAgICBUb2tlbigpIDogYmVnaW5UYWcodHJ1 ZSksIGZsYXQoZmFsc2UpLCBicm9rZW5YTUxTdHlsZShmYWxzZSksIG1fc291cmNlSW5mbygwKSB7 IH0KKyAgICBUb2tlbigpCisgICAgICAgIDogYmVnaW5UYWcodHJ1ZSkKKyAgICAgICAgLCBzZWxm Q2xvc2luZ1RhZyhmYWxzZSkKKyAgICAgICAgLCBicm9rZW5YTUxTdHlsZShmYWxzZSkKKyAgICAg ICAgLCBtX3NvdXJjZUluZm8oMCkKKyAgICB7IH0KICAgICB+VG9rZW4oKSB7IH0KIAogICAgIHZv aWQgYWRkQXR0cmlidXRlKERvY3VtZW50KiwgQXRvbWljU3RyaW5nJiBhdHRyTmFtZSwgY29uc3Qg QXRvbWljU3RyaW5nJiB2LCBib29sIHZpZXdTb3VyY2VNb2RlKTsKQEAgLTY5LDcgKzc0LDcgQEAg cHVibGljOgogICAgICAgICB0ZXh0ID0gMDsKICAgICAgICAgdGFnTmFtZSA9IG51bGxBdG9tOwog ICAgICAgICBiZWdpblRhZyA9IHRydWU7Ci0gICAgICAgIGZsYXQgPSBmYWxzZTsKKyAgICAgICAg c2VsZkNsb3NpbmdUYWcgPSBmYWxzZTsKICAgICAgICAgYnJva2VuWE1MU3R5bGUgPSBmYWxzZTsK ICAgICAgICAgaWYgKG1fc291cmNlSW5mbykKICAgICAgICAgICAgIG1fc291cmNlSW5mby0+Y2xl YXIoKTsKQEAgLTgxLDcgKzg2LDcgQEAgcHVibGljOgogICAgIFJlZlB0cjxTdHJpbmdJbXBsPiB0 ZXh0OwogICAgIEF0b21pY1N0cmluZyB0YWdOYW1lOwogICAgIGJvb2wgYmVnaW5UYWc7Ci0gICAg Ym9vbCBmbGF0OworICAgIGJvb2wgc2VsZkNsb3NpbmdUYWc7CiAgICAgYm9vbCBicm9rZW5YTUxT dHlsZTsKICAgICBPd25QdHI8VmVjdG9yPFVDaGFyPiA+IG1fc291cmNlSW5mbzsKIH07Cg== 25076 2008-11-11 15:18:19 -0800 2008-11-11 15:52:27 -0800 Rename currToken to m_currentToken Rename-currToken-to-m_currentToken.patch text/plain 16547 eric MDk4YWFhYjFmN2UxZmI2ZTViM2Y0NjYxYjVhMDEyZjQwNDkzZjJiZQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu Y3BwCmluZGV4IDJlNjRjMjkuLmU0NjU1MTEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTIy Nyw3ICsyMjcsNyBAQCB2b2lkIEhUTUxUb2tlbml6ZXI6OnJlc2V0KCkKICAgICBtX3N0YXRlLnNl dEFsbG93WWllbGQoZmFsc2UpOwogICAgIG1fc3RhdGUuc2V0Rm9yY2VTeW5jaHJvbm91cyhmYWxz ZSk7CiAKLSAgICBjdXJyVG9rZW4ucmVzZXQoKTsKKyAgICBtX2N1cnJlbnRUb2tlbi5yZXNldCgp OwogICAgIG1fZG9jdHlwZVRva2VuLnJlc2V0KCk7CiAgICAgbV9kb2N0eXBlU2VhcmNoQ291bnQg PSAwOwogICAgIG1fZG9jdHlwZVNlY29uZGFyeVNlYXJjaENvdW50ID0gMDsKQEAgLTM0NiwyMCAr MzQ2LDIwIEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnBhcnNlU3BlY2lh bChTZWdtZW50ZWRTdHJpbmcmIHNyYywgU3RhdGUgc3RhCiAgICAgICAgICAgICAgICAgc3RhdGUg PSBwcm9jZXNzTGlzdGluZyhTZWdtZW50ZWRTdHJpbmcobV9zY3JpcHRDb2RlLCBtX3NjcmlwdENv ZGVTaXplKSwgc3RhdGUpOwogICAgICAgICAgICAgICAgIHByb2Nlc3NUb2tlbigpOwogICAgICAg ICAgICAgICAgIGlmIChzdGF0ZS5pblN0eWxlKCkpIHsgCi0gICAgICAgICAgICAgICAgICAgIGN1 cnJUb2tlbi50YWdOYW1lID0gc3R5bGVUYWcubG9jYWxOYW1lKCk7IAotICAgICAgICAgICAgICAg ICAgICBjdXJyVG9rZW4uYmVnaW5UYWcgPSBmYWxzZTsgCisgICAgICAgICAgICAgICAgICAgIG1f Y3VycmVudFRva2VuLnRhZ05hbWUgPSBzdHlsZVRhZy5sb2NhbE5hbWUoKTsKKyAgICAgICAgICAg ICAgICAgICAgbV9jdXJyZW50VG9rZW4uYmVnaW5UYWcgPSBmYWxzZTsKICAgICAgICAgICAgICAg ICB9IGVsc2UgaWYgKHN0YXRlLmluVGV4dEFyZWEoKSkgeyAKLSAgICAgICAgICAgICAgICAgICAg Y3VyclRva2VuLnRhZ05hbWUgPSB0ZXh0YXJlYVRhZy5sb2NhbE5hbWUoKTsgCi0gICAgICAgICAg ICAgICAgICAgIGN1cnJUb2tlbi5iZWdpblRhZyA9IGZhbHNlOyAKKyAgICAgICAgICAgICAgICAg ICAgbV9jdXJyZW50VG9rZW4udGFnTmFtZSA9IHRleHRhcmVhVGFnLmxvY2FsTmFtZSgpOworICAg ICAgICAgICAgICAgICAgICBtX2N1cnJlbnRUb2tlbi5iZWdpblRhZyA9IGZhbHNlOwogICAgICAg ICAgICAgICAgIH0gZWxzZSBpZiAoc3RhdGUuaW5UaXRsZSgpKSB7IAotICAgICAgICAgICAgICAg ICAgICBjdXJyVG9rZW4udGFnTmFtZSA9IHRpdGxlVGFnLmxvY2FsTmFtZSgpOyAKLSAgICAgICAg ICAgICAgICAgICAgY3VyclRva2VuLmJlZ2luVGFnID0gZmFsc2U7IAorICAgICAgICAgICAgICAg ICAgICBtX2N1cnJlbnRUb2tlbi50YWdOYW1lID0gdGl0bGVUYWcubG9jYWxOYW1lKCk7CisgICAg ICAgICAgICAgICAgICAgIG1fY3VycmVudFRva2VuLmJlZ2luVGFnID0gZmFsc2U7CiAgICAgICAg ICAgICAgICAgfSBlbHNlIGlmIChzdGF0ZS5pblhtcCgpKSB7Ci0gICAgICAgICAgICAgICAgICAg IGN1cnJUb2tlbi50YWdOYW1lID0geG1wVGFnLmxvY2FsTmFtZSgpOyAKLSAgICAgICAgICAgICAg ICAgICAgY3VyclRva2VuLmJlZ2luVGFnID0gZmFsc2U7IAorICAgICAgICAgICAgICAgICAgICBt X2N1cnJlbnRUb2tlbi50YWdOYW1lID0geG1wVGFnLmxvY2FsTmFtZSgpOworICAgICAgICAgICAg ICAgICAgICBtX2N1cnJlbnRUb2tlbi5iZWdpblRhZyA9IGZhbHNlOwogICAgICAgICAgICAgICAg IH0gZWxzZSBpZiAoc3RhdGUuaW5JRnJhbWUoKSkgewotICAgICAgICAgICAgICAgICAgICBjdXJy VG9rZW4udGFnTmFtZSA9IGlmcmFtZVRhZy5sb2NhbE5hbWUoKTsKLSAgICAgICAgICAgICAgICAg ICAgY3VyclRva2VuLmJlZ2luVGFnID0gZmFsc2U7CisgICAgICAgICAgICAgICAgICAgIG1fY3Vy cmVudFRva2VuLnRhZ05hbWUgPSBpZnJhbWVUYWcubG9jYWxOYW1lKCk7CisgICAgICAgICAgICAg ICAgICAgIG1fY3VycmVudFRva2VuLmJlZ2luVGFnID0gZmFsc2U7CiAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgICAgIHByb2Nlc3NUb2tlbigpOwogICAgICAgICAgICAgICAgIHN0YXRl LnNldEluU3R5bGUoZmFsc2UpOwpAQCAtNDU5LDggKzQ1OSw4IEBAIEhUTUxUb2tlbml6ZXI6OlN0 YXRlIEhUTUxUb2tlbml6ZXI6OnNjcmlwdEhhbmRsZXIoU3RhdGUgc3RhdGUpCiAgICAgc3RhdGUg PSBwcm9jZXNzTGlzdGluZyhTZWdtZW50ZWRTdHJpbmcobV9zY3JpcHRDb2RlLCBtX3NjcmlwdENv ZGVTaXplKSwgc3RhdGUpOwogICAgIFJlZlB0cjxOb2RlPiBub2RlID0gcHJvY2Vzc1Rva2VuKCk7 CiAgICAgU3RyaW5nIHNjcmlwdFN0cmluZyA9IG5vZGUgPyBub2RlLT50ZXh0Q29udGVudCgpIDog IiI7Ci0gICAgY3VyclRva2VuLnRhZ05hbWUgPSBzY3JpcHRUYWcubG9jYWxOYW1lKCk7Ci0gICAg Y3VyclRva2VuLmJlZ2luVGFnID0gZmFsc2U7CisgICAgbV9jdXJyZW50VG9rZW4udGFnTmFtZSA9 IHNjcmlwdFRhZy5sb2NhbE5hbWUoKTsKKyAgICBtX2N1cnJlbnRUb2tlbi5iZWdpblRhZyA9IGZh bHNlOwogICAgIHByb2Nlc3NUb2tlbigpOwogCiAgICAgc3RhdGUuc2V0SW5TY3JpcHQoZmFsc2Up OwpAQCAtNjMyLDEyICs2MzIsMTIgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXpl cjo6cGFyc2VDb21tZW50KFNlZ21lbnRlZFN0cmluZyYgc3JjLCBTdGF0ZSBzdGEKICAgICAgICAg ICAgICAgICAgICAgY2hlY2tTY3JpcHRCdWZmZXIoKTsKICAgICAgICAgICAgICAgICAgICAgbV9z Y3JpcHRDb2RlW21fc2NyaXB0Q29kZVNpemVdID0gMDsKICAgICAgICAgICAgICAgICAgICAgbV9z Y3JpcHRDb2RlW21fc2NyaXB0Q29kZVNpemUgKyAxXSA9IDA7Ci0gICAgICAgICAgICAgICAgICAg IGN1cnJUb2tlbi50YWdOYW1lID0gY29tbWVudEF0b207Ci0gICAgICAgICAgICAgICAgICAgIGN1 cnJUb2tlbi5iZWdpblRhZyA9IHRydWU7CisgICAgICAgICAgICAgICAgICAgIG1fY3VycmVudFRv a2VuLnRhZ05hbWUgPSBjb21tZW50QXRvbTsKKyAgICAgICAgICAgICAgICAgICAgbV9jdXJyZW50 VG9rZW4uYmVnaW5UYWcgPSB0cnVlOwogICAgICAgICAgICAgICAgICAgICBzdGF0ZSA9IHByb2Nl c3NMaXN0aW5nKFNlZ21lbnRlZFN0cmluZyhtX3NjcmlwdENvZGUsIG1fc2NyaXB0Q29kZVNpemUg LSBlbmRDaGFyc0NvdW50KSwgc3RhdGUpOwogICAgICAgICAgICAgICAgICAgICBwcm9jZXNzVG9r ZW4oKTsKLSAgICAgICAgICAgICAgICAgICAgY3VyclRva2VuLnRhZ05hbWUgPSBjb21tZW50QXRv bTsKLSAgICAgICAgICAgICAgICAgICAgY3VyclRva2VuLmJlZ2luVGFnID0gZmFsc2U7CisgICAg ICAgICAgICAgICAgICAgIG1fY3VycmVudFRva2VuLnRhZ05hbWUgPSBjb21tZW50QXRvbTsKKyAg ICAgICAgICAgICAgICAgICAgbV9jdXJyZW50VG9rZW4uYmVnaW5UYWcgPSBmYWxzZTsKICAgICAg ICAgICAgICAgICAgICAgcHJvY2Vzc1Rva2VuKCk7CiAgICAgICAgICAgICAgICAgICAgIG1fc2Ny aXB0Q29kZVNpemUgPSAwOwogICAgICAgICAgICAgICAgIH0KQEAgLTEyMjMsOCArMTIyMyw4IEBA IEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnBhcnNlVGFnKFNlZ21lbnRlZFN0 cmluZyYgc3JjLCBTdGF0ZSBzdGF0ZSkKICAgICAgICAgICAgICAgICAvLyBOb3cgdGhhdCB3ZSd2 ZSBzaGF2ZWQgb2ZmIGFueSBpbnZhbGlkIC8gdGhhdCBtaWdodCBoYXZlIGZvbGxvd2VkIHRoZSBu YW1lKSwgbWFrZSB0aGUgdGFnLgogICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBGaXJlRm94IGFu ZCBXaW5JRSB0dXJuICFmb28gbm9kZXMgaW50byBjb21tZW50cywgd2UgaWdub3JlIGNvbW1lbnRz LiAoZmFzdC9wYXJzZXIvdGFnLXdpdGgtZXhjbGFtYXRpb24tcG9pbnQuaHRtbCkKICAgICAgICAg ICAgICAgICBpZiAocHRyWzBdICE9ICchJyB8fCBpblZpZXdTb3VyY2VNb2RlKCkpIHsKLSAgICAg ICAgICAgICAgICAgICAgY3VyclRva2VuLnRhZ05hbWUgPSBBdG9taWNTdHJpbmcocHRyKTsKLSAg ICAgICAgICAgICAgICAgICAgY3VyclRva2VuLmJlZ2luVGFnID0gYmVnaW5UYWc7CisgICAgICAg ICAgICAgICAgICAgIG1fY3VycmVudFRva2VuLnRhZ05hbWUgPSBBdG9taWNTdHJpbmcocHRyKTsK KyAgICAgICAgICAgICAgICAgICAgbV9jdXJyZW50VG9rZW4uYmVnaW5UYWcgPSBiZWdpblRhZzsK ICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgbV9kZXN0ID0gbV9idWZmZXI7CiAg ICAgICAgICAgICAgICAgc3RhdGUuc2V0VGFnU3RhdGUoU2VhcmNoQXR0cmlidXRlKTsKQEAgLTEy NDYsNyArMTI0Niw3IEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnBhcnNl VGFnKFNlZ21lbnRlZFN0cmluZyYgc3JjLCBTdGF0ZSBzdGF0ZSkKICAgICAgICAgICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIGlmIChpblZpZXdT b3VyY2VNb2RlKCkpCi0gICAgICAgICAgICAgICAgICAgIGN1cnJUb2tlbi5hZGRWaWV3U291cmNl Q2hhcihjdXJjaGFyKTsKKyAgICAgICAgICAgICAgICAgICAgbV9jdXJyZW50VG9rZW4uYWRkVmll d1NvdXJjZUNoYXIoY3VyY2hhcik7CiAgICAgICAgICAgICAgICAgc3JjLmFkdmFuY2UobV9saW5l TnVtYmVyKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJyZWFrOwpAQCAtMTI2NCw3ICsx MjY0LDcgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6cGFyc2VUYWcoU2Vn bWVudGVkU3RyaW5nJiBzcmMsIFN0YXRlIHN0YXRlKQogICAgICAgICAgICAgICAgICAgICAqbV9k ZXN0KysgPSAwOwogICAgICAgICAgICAgICAgICAgICBzdGF0ZS5zZXRUYWdTdGF0ZShTZWFyY2hF cXVhbCk7CiAgICAgICAgICAgICAgICAgICAgIGlmIChpblZpZXdTb3VyY2VNb2RlKCkpCi0gICAg ICAgICAgICAgICAgICAgICAgICBjdXJyVG9rZW4uYWRkVmlld1NvdXJjZUNoYXIoJ2EnKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIG1fY3VycmVudFRva2VuLmFkZFZpZXdTb3VyY2VDaGFyKCdh Jyk7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgICAgICAKQEAgLTEyODMsNyArMTI4Myw3IEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhU TUxUb2tlbml6ZXI6OnBhcnNlVGFnKFNlZ21lbnRlZFN0cmluZyYgc3JjLCBTdGF0ZSBzdGF0ZSkK ICAgICAgICAgICAgICAgICAqbV9kZXN0KysgPSAwOwogICAgICAgICAgICAgICAgIHN0YXRlLnNl dFRhZ1N0YXRlKFNlYXJjaEVxdWFsKTsKICAgICAgICAgICAgICAgICBpZiAoaW5WaWV3U291cmNl TW9kZSgpKQotICAgICAgICAgICAgICAgICAgICBjdXJyVG9rZW4uYWRkVmlld1NvdXJjZUNoYXIo J2EnKTsKKyAgICAgICAgICAgICAgICAgICAgbV9jdXJyZW50VG9rZW4uYWRkVmlld1NvdXJjZUNo YXIoJ2EnKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CkBA IC0xMjk0LDkgKzEyOTQsOSBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpw YXJzZVRhZyhTZWdtZW50ZWRTdHJpbmcmIHNyYywgU3RhdGUgc3RhdGUpCiAgICAgICAgICAgICAg ICAgaWYgKGxhc3RJc1NsYXNoICYmIGN1cmNoYXIgPT0gJz4nKSB7CiAgICAgICAgICAgICAgICAg ICAgIC8vIFRoaXMgaXMgYSBxdWlyayAod2l0aCBhIGxvbmcgc2FkIGhpc3RvcnkpLiAgV2UgaGF2 ZSB0byBkbyB0aGlzCiAgICAgICAgICAgICAgICAgICAgIC8vIHNpbmNlIHdpZGdldHMgZG8gPHNj cmlwdCBzcmM9ImZvby5qcyIvPiBhbmQgZXhwZWN0IHRoZSB0YWcgdG8gY2xvc2UuCi0gICAgICAg ICAgICAgICAgICAgIGlmIChjdXJyVG9rZW4udGFnTmFtZSA9PSBzY3JpcHRUYWcpCi0gICAgICAg ICAgICAgICAgICAgICAgICBjdXJyVG9rZW4uc2VsZkNsb3NpbmdUYWcgPSB0cnVlOwotICAgICAg ICAgICAgICAgICAgICBjdXJyVG9rZW4uYnJva2VuWE1MU3R5bGUgPSB0cnVlOworICAgICAgICAg ICAgICAgICAgICBpZiAobV9jdXJyZW50VG9rZW4udGFnTmFtZSA9PSBzY3JpcHRUYWcpCisgICAg ICAgICAgICAgICAgICAgICAgICBtX2N1cnJlbnRUb2tlbi5zZWxmQ2xvc2luZ1RhZyA9IHRydWU7 CisgICAgICAgICAgICAgICAgICAgIG1fY3VycmVudFRva2VuLmJyb2tlblhNTFN0eWxlID0gdHJ1 ZTsKICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICAgICAvLyBJbiB0aGlzIG1vZGUg anVzdCBpZ25vcmUgYW55IHF1b3RlcyBvciBzbGFzaGVzIHdlIGVuY291bnRlciBhbmQgdHJlYXQg dGhlbSBsaWtlIHNwYWNlcy4KQEAgLTEzMDQsMTAgKzEzMDQsMTAgQEAgSFRNTFRva2VuaXplcjo6 U3RhdGUgSFRNTFRva2VuaXplcjo6cGFyc2VUYWcoU2VnbWVudGVkU3RyaW5nJiBzcmMsIFN0YXRl IHN0YXRlKQogICAgICAgICAgICAgICAgICAgICBpZiAoY3VyY2hhciA9PSAnPScpIHsKICAgICAg ICAgICAgICAgICAgICAgICAgIHN0YXRlLnNldFRhZ1N0YXRlKFNlYXJjaFZhbHVlKTsKICAgICAg ICAgICAgICAgICAgICAgICAgIGlmIChpblZpZXdTb3VyY2VNb2RlKCkpCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgY3VyclRva2VuLmFkZFZpZXdTb3VyY2VDaGFyKGN1cmNoYXIpOworICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG1fY3VycmVudFRva2VuLmFkZFZpZXdTb3VyY2VDaGFy KGN1cmNoYXIpOwogICAgICAgICAgICAgICAgICAgICAgICAgc3JjLmFkdmFuY2VQYXN0Tm9uTmV3 bGluZSgpOwogICAgICAgICAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgICAg ICAgICAgY3VyclRva2VuLmFkZEF0dHJpYnV0ZShtX2RvYywgbV9hdHRyTmFtZSwgZW1wdHlBdG9t LCBpblZpZXdTb3VyY2VNb2RlKCkpOworICAgICAgICAgICAgICAgICAgICAgICAgbV9jdXJyZW50 VG9rZW4uYWRkQXR0cmlidXRlKG1fZG9jLCBtX2F0dHJOYW1lLCBlbXB0eUF0b20sIGluVmlld1Nv dXJjZU1vZGUoKSk7CiAgICAgICAgICAgICAgICAgICAgICAgICBtX2Rlc3QgPSBtX2J1ZmZlcjsK ICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRlLnNldFRhZ1N0YXRlKFNlYXJjaEF0dHJpYnV0 ZSk7CiAgICAgICAgICAgICAgICAgICAgICAgICBsYXN0SXNTbGFzaCA9IGZhbHNlOwpAQCAtMTMx NSw3ICsxMzE1LDcgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6cGFyc2VU YWcoU2VnbWVudGVkU3RyaW5nJiBzcmMsIFN0YXRlIHN0YXRlKQogICAgICAgICAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgaWYgKGluVmlld1Nv dXJjZU1vZGUoKSkKLSAgICAgICAgICAgICAgICAgICAgY3VyclRva2VuLmFkZFZpZXdTb3VyY2VD aGFyKGN1cmNoYXIpOworICAgICAgICAgICAgICAgICAgICBtX2N1cnJlbnRUb2tlbi5hZGRWaWV3 U291cmNlQ2hhcihjdXJjaGFyKTsKICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAg ICAgbGFzdElzU2xhc2ggPSBjdXJjaGFyID09ICcvJzsKIApAQCAtMTMzMCw3ICsxMzMwLDcgQEAg SFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6cGFyc2VUYWcoU2VnbWVudGVkU3Ry aW5nJiBzcmMsIFN0YXRlIHN0YXRlKQogICAgICAgICAgICAgICAgICAgICAgICAgdHF1b3RlID0g Y3VyY2hhciA9PSAnXCInID8gRG91YmxlUXVvdGUgOiBTaW5nbGVRdW90ZTsKICAgICAgICAgICAg ICAgICAgICAgICAgIHN0YXRlLnNldFRhZ1N0YXRlKFF1b3RlZFZhbHVlKTsKICAgICAgICAgICAg ICAgICAgICAgICAgIGlmIChpblZpZXdTb3VyY2VNb2RlKCkpCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgY3VyclRva2VuLmFkZFZpZXdTb3VyY2VDaGFyKGN1cmNoYXIpOworICAgICAgICAg ICAgICAgICAgICAgICAgICAgIG1fY3VycmVudFRva2VuLmFkZFZpZXdTb3VyY2VDaGFyKGN1cmNo YXIpOwogICAgICAgICAgICAgICAgICAgICAgICAgc3JjLmFkdmFuY2VQYXN0Tm9uTmV3bGluZSgp OwogICAgICAgICAgICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICAgICAgICAgIHN0 YXRlLnNldFRhZ1N0YXRlKFZhbHVlKTsKQEAgLTEzMzgsNyArMTMzOCw3IEBAIEhUTUxUb2tlbml6 ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnBhcnNlVGFnKFNlZ21lbnRlZFN0cmluZyYgc3JjLCBT dGF0ZSBzdGF0ZSkKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgICAgIGlmIChpblZpZXdTb3VyY2VNb2RlKCkpCi0gICAgICAgICAgICAg ICAgICAgIGN1cnJUb2tlbi5hZGRWaWV3U291cmNlQ2hhcihjdXJjaGFyKTsKKyAgICAgICAgICAg ICAgICAgICAgbV9jdXJyZW50VG9rZW4uYWRkVmlld1NvdXJjZUNoYXIoY3VyY2hhcik7CiAgICAg ICAgICAgICAgICAgc3JjLmFkdmFuY2UobV9saW5lTnVtYmVyKTsKICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIGJyZWFrOwpAQCAtMTM2MSw5ICsxMzYxLDkgQEAgSFRNTFRva2VuaXplcjo6U3Rh dGUgSFRNTFRva2VuaXplcjo6cGFyc2VUYWcoU2VnbWVudGVkU3RyaW5nJiBzcmMsIFN0YXRlIHN0 YXRlKQogICAgICAgICAgICAgICAgICAgICAgICAgQXRvbWljU3RyaW5nIGF0dHJpYnV0ZVZhbHVl KG1fYnVmZmVyICsgMSwgbV9kZXN0IC0gbV9idWZmZXIgLSAxKTsKICAgICAgICAgICAgICAgICAg ICAgICAgIGlmICghYXR0cmlidXRlVmFsdWUuY29udGFpbnMoJy8nKSkKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBtX2F0dHJOYW1lID0gYXR0cmlidXRlVmFsdWU7IC8vIEp1c3QgbWFrZSB0 aGUgbmFtZS92YWx1ZSBtYXRjaC4gKEZJWE1FOiBJcyB0aGlzIHNvbWUgV2luSUUgcXVpcms/KQot ICAgICAgICAgICAgICAgICAgICAgICAgY3VyclRva2VuLmFkZEF0dHJpYnV0ZShtX2RvYywgbV9h dHRyTmFtZSwgYXR0cmlidXRlVmFsdWUsIGluVmlld1NvdXJjZU1vZGUoKSk7CisgICAgICAgICAg ICAgICAgICAgICAgICBtX2N1cnJlbnRUb2tlbi5hZGRBdHRyaWJ1dGUobV9kb2MsIG1fYXR0ck5h bWUsIGF0dHJpYnV0ZVZhbHVlLCBpblZpZXdTb3VyY2VNb2RlKCkpOwogICAgICAgICAgICAgICAg ICAgICAgICAgaWYgKGluVmlld1NvdXJjZU1vZGUoKSkKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjdXJyVG9rZW4uYWRkVmlld1NvdXJjZUNoYXIoJ3gnKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICBtX2N1cnJlbnRUb2tlbi5hZGRWaWV3U291cmNlQ2hhcigneCcpOwogICAgICAg ICAgICAgICAgICAgICAgICAgc3RhdGUuc2V0VGFnU3RhdGUoU2VhcmNoQXR0cmlidXRlKTsKICAg ICAgICAgICAgICAgICAgICAgICAgIG1fZGVzdCA9IG1fYnVmZmVyOwogICAgICAgICAgICAgICAg ICAgICAgICAgdHF1b3RlID0gTm9RdW90ZTsKQEAgLTEzODQsMTUgKzEzODQsMTUgQEAgSFRNTFRv a2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6cGFyc2VUYWcoU2VnbWVudGVkU3RyaW5nJiBz cmMsIFN0YXRlIHN0YXRlKQogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKG1fYXR0ck5hbWUu aXNFbXB0eSgpICYmICFhdHRyaWJ1dGVWYWx1ZS5jb250YWlucygnLycpKSB7CiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbV9hdHRyTmFtZSA9IGF0dHJpYnV0ZVZhbHVlOyAvLyBNYWtlIHRo ZSBuYW1lIG1hdGNoIHRoZSB2YWx1ZS4gKEZJWE1FOiBJcyB0aGlzIGEgV2luSUUgcXVpcms/KQog ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChpblZpZXdTb3VyY2VNb2RlKCkpCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGN1cnJUb2tlbi5hZGRWaWV3U291cmNlQ2hhcign eCcpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2N1cnJlbnRUb2tlbi5hZGRW aWV3U291cmNlQ2hhcigneCcpOwogICAgICAgICAgICAgICAgICAgICAgICAgfSBlbHNlIGlmIChp blZpZXdTb3VyY2VNb2RlKCkpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgY3VyclRva2Vu LmFkZFZpZXdTb3VyY2VDaGFyKCd2Jyk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBjdXJyVG9r ZW4uYWRkQXR0cmlidXRlKG1fZG9jLCBtX2F0dHJOYW1lLCBhdHRyaWJ1dGVWYWx1ZSwgaW5WaWV3 U291cmNlTW9kZSgpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2N1cnJlbnRUb2tl bi5hZGRWaWV3U291cmNlQ2hhcigndicpOworICAgICAgICAgICAgICAgICAgICAgICAgbV9jdXJy ZW50VG9rZW4uYWRkQXR0cmlidXRlKG1fZG9jLCBtX2F0dHJOYW1lLCBhdHRyaWJ1dGVWYWx1ZSwg aW5WaWV3U291cmNlTW9kZSgpKTsKICAgICAgICAgICAgICAgICAgICAgICAgIG1fZGVzdCA9IG1f YnVmZmVyOwogICAgICAgICAgICAgICAgICAgICAgICAgc3RhdGUuc2V0VGFnU3RhdGUoU2VhcmNo QXR0cmlidXRlKTsKICAgICAgICAgICAgICAgICAgICAgICAgIHRxdW90ZSA9IE5vUXVvdGU7CiAg ICAgICAgICAgICAgICAgICAgICAgICBpZiAoaW5WaWV3U291cmNlTW9kZSgpKQotICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGN1cnJUb2tlbi5hZGRWaWV3U291cmNlQ2hhcihjdXJjaGFyKTsK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2N1cnJlbnRUb2tlbi5hZGRWaWV3U291cmNl Q2hhcihjdXJjaGFyKTsKICAgICAgICAgICAgICAgICAgICAgICAgIHNyYy5hZHZhbmNlUGFzdE5v bk5ld2xpbmUoKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAg ICAgICAgICB9CkBAIC0xNDE3LDkgKzE0MTcsOSBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1M VG9rZW5pemVyOjpwYXJzZVRhZyhTZWdtZW50ZWRTdHJpbmcmIHNyYywgU3RhdGUgc3RhdGUpCiAg ICAgICAgICAgICAgICAgICAgIC8vICcvJyBkb2VzIG5vdCBkZWxpbWl0IGluIElFIQogICAgICAg ICAgICAgICAgICAgICBpZiAoaXNBU0NJSVNwYWNlKGN1cmNoYXIpIHx8IGN1cmNoYXIgPT0gJz4n KSB7CiAgICAgICAgICAgICAgICAgICAgICAgICBBdG9taWNTdHJpbmcgYXR0cmlidXRlVmFsdWUo bV9idWZmZXIgKyAxLCBtX2Rlc3QgLSBtX2J1ZmZlciAtIDEpOwotICAgICAgICAgICAgICAgICAg ICAgICAgY3VyclRva2VuLmFkZEF0dHJpYnV0ZShtX2RvYywgbV9hdHRyTmFtZSwgYXR0cmlidXRl VmFsdWUsIGluVmlld1NvdXJjZU1vZGUoKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBtX2N1 cnJlbnRUb2tlbi5hZGRBdHRyaWJ1dGUobV9kb2MsIG1fYXR0ck5hbWUsIGF0dHJpYnV0ZVZhbHVl LCBpblZpZXdTb3VyY2VNb2RlKCkpOwogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGluVmll d1NvdXJjZU1vZGUoKSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBjdXJyVG9rZW4uYWRk Vmlld1NvdXJjZUNoYXIoJ3YnKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2N1cnJl bnRUb2tlbi5hZGRWaWV3U291cmNlQ2hhcigndicpOwogICAgICAgICAgICAgICAgICAgICAgICAg bV9kZXN0ID0gbV9idWZmZXI7CiAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0ZS5zZXRUYWdT dGF0ZShTZWFyY2hBdHRyaWJ1dGUpOwogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CkBA IC0xNDM3LDkgKzE0MzcsOSBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpw YXJzZVRhZyhTZWdtZW50ZWRTdHJpbmcmIHNyYywgU3RhdGUgc3RhdGUpCiAgICAgICAgICAgICAg ICAgaWYgKGNoID09ICc+JyB8fCBjaCA9PSAnPCcpCiAgICAgICAgICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICAgICAgICAgIGlmIChjaCA9PSAnLycpCi0gICAgICAgICAgICAgICAgICAgIGN1 cnJUb2tlbi5zZWxmQ2xvc2luZ1RhZyA9IHRydWU7CisgICAgICAgICAgICAgICAgICAgIG1fY3Vy cmVudFRva2VuLnNlbGZDbG9zaW5nVGFnID0gdHJ1ZTsKICAgICAgICAgICAgICAgICBpZiAoaW5W aWV3U291cmNlTW9kZSgpKQotICAgICAgICAgICAgICAgICAgICBjdXJyVG9rZW4uYWRkVmlld1Nv dXJjZUNoYXIoY2gpOworICAgICAgICAgICAgICAgICAgICBtX2N1cnJlbnRUb2tlbi5hZGRWaWV3 U291cmNlQ2hhcihjaCk7CiAgICAgICAgICAgICAgICAgc3JjLmFkdmFuY2UobV9saW5lTnVtYmVy KTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChzcmMuaXNFbXB0eSgpKQpAQCAtMTQ1 MiwyNCArMTQ1MiwyNCBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpwYXJz ZVRhZyhTZWdtZW50ZWRTdHJpbmcmIHNyYywgU3RhdGUgc3RhdGUpCiAgICAgICAgICAgICBpZiAo KnNyYyAhPSAnPCcpCiAgICAgICAgICAgICAgICAgc3JjLmFkdmFuY2UobV9saW5lTnVtYmVyKTsK IAotICAgICAgICAgICAgaWYgKGN1cnJUb2tlbi50YWdOYW1lID09IG51bGxBdG9tKSB7IC8vc3Rv cCBpZiB0YWcgaXMgdW5rbm93bgorICAgICAgICAgICAgaWYgKG1fY3VycmVudFRva2VuLnRhZ05h bWUgPT0gbnVsbEF0b20pIHsgLy9zdG9wIGlmIHRhZyBpcyB1bmtub3duCiAgICAgICAgICAgICAg ICAgbV9jQnVmZmVyUG9zID0gY0J1ZmZlclBvczsKICAgICAgICAgICAgICAgICByZXR1cm4gc3Rh dGU7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIEF0b21pY1N0cmluZyB0YWdOYW1lID0g Y3VyclRva2VuLnRhZ05hbWU7CisgICAgICAgICAgICBBdG9taWNTdHJpbmcgdGFnTmFtZSA9IG1f Y3VycmVudFRva2VuLnRhZ05hbWU7CiAKICAgICAgICAgICAgIC8vIEhhbmRsZSA8c2NyaXB0IHNy Yz0iZm9vIi8+IGxpa2UgTW96aWxsYS9PcGVyYS4gV2UgaGF2ZSB0byBkbyB0aGlzIG5vdyBmb3Ig RGFzaGJvYXJkCiAgICAgICAgICAgICAvLyBjb21wYXRpYmlsaXR5LgotICAgICAgICAgICAgYm9v bCBpc1NlbGZDbG9zaW5nU2NyaXB0ID0gY3VyclRva2VuLnNlbGZDbG9zaW5nVGFnICYmIGN1cnJU b2tlbi5iZWdpblRhZyAmJiBjdXJyVG9rZW4udGFnTmFtZSA9PSBzY3JpcHRUYWc7Ci0gICAgICAg ICAgICBib29sIGJlZ2luVGFnID0gIWN1cnJUb2tlbi5zZWxmQ2xvc2luZ1RhZyAmJiBjdXJyVG9r ZW4uYmVnaW5UYWc7Ci0gICAgICAgICAgICBpZiAoY3VyclRva2VuLmJlZ2luVGFnICYmIGN1cnJU b2tlbi50YWdOYW1lID09IHNjcmlwdFRhZyAmJiAhaW5WaWV3U291cmNlTW9kZSgpICYmICFtX3Bh cnNlci0+c2tpcE1vZGUoKSkgeworICAgICAgICAgICAgYm9vbCBpc1NlbGZDbG9zaW5nU2NyaXB0 ID0gbV9jdXJyZW50VG9rZW4uc2VsZkNsb3NpbmdUYWcgJiYgbV9jdXJyZW50VG9rZW4uYmVnaW5U YWcgJiYgbV9jdXJyZW50VG9rZW4udGFnTmFtZSA9PSBzY3JpcHRUYWc7CisgICAgICAgICAgICBi b29sIGJlZ2luVGFnID0gIW1fY3VycmVudFRva2VuLnNlbGZDbG9zaW5nVGFnICYmIG1fY3VycmVu dFRva2VuLmJlZ2luVGFnOworICAgICAgICAgICAgaWYgKG1fY3VycmVudFRva2VuLmJlZ2luVGFn ICYmIG1fY3VycmVudFRva2VuLnRhZ05hbWUgPT0gc2NyaXB0VGFnICYmICFpblZpZXdTb3VyY2VN b2RlKCkgJiYgIW1fcGFyc2VyLT5za2lwTW9kZSgpKSB7CiAgICAgICAgICAgICAgICAgQXR0cmli dXRlKiBhID0gMDsKICAgICAgICAgICAgICAgICBtX3NjcmlwdFRhZ1NyY0F0dHJWYWx1ZSA9IFN0 cmluZygpOwogICAgICAgICAgICAgICAgIG1fc2NyaXB0VGFnQ2hhcnNldEF0dHJWYWx1ZSA9IFN0 cmluZygpOwotICAgICAgICAgICAgICAgIGlmIChjdXJyVG9rZW4uYXR0cnMgJiYgIW1fZnJhZ21l bnQpIHsKKyAgICAgICAgICAgICAgICBpZiAobV9jdXJyZW50VG9rZW4uYXR0cnMgJiYgIW1fZnJh Z21lbnQpIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKG1fZG9jLT5mcmFtZSgpICYmIG1fZG9j LT5mcmFtZSgpLT5zY3JpcHQoKS0+aXNFbmFibGVkKCkpIHsKLSAgICAgICAgICAgICAgICAgICAg ICAgIGlmICgoYSA9IGN1cnJUb2tlbi5hdHRycy0+Z2V0QXR0cmlidXRlSXRlbShzcmNBdHRyKSkp CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAoKGEgPSBtX2N1cnJlbnRUb2tlbi5hdHRycy0+ Z2V0QXR0cmlidXRlSXRlbShzcmNBdHRyKSkpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg bV9zY3JpcHRUYWdTcmNBdHRyVmFsdWUgPSBtX2RvYy0+Y29tcGxldGVVUkwocGFyc2VVUkwoYS0+ dmFsdWUoKSkpLnN0cmluZygpOwogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAg ICAgfQpAQCAtMTg3MiwxMSArMTg3MiwxMSBAQCBQYXNzUmVmUHRyPE5vZGU+IEhUTUxUb2tlbml6 ZXI6OnByb2Nlc3NUb2tlbigpCiAgICAgICAgIC8vIEZJWE1FOiBXaHkgaXNuJ3QgdGhpcyBtX2N1 cnJlbnRTY3JpcHRUYWdTdGFydExpbmVOdW1iZXI/ICBJIHN1c3BlY3QgdGhpcyBpcyB3cm9uZy4K ICAgICAgICAgc2NyaXB0Q29udHJvbGxlci0+c2V0RXZlbnRIYW5kbGVyTGluZW5vKG1fY3VycmVu dFRhZ1N0YXJ0TGluZU51bWJlciArIDEpOyAvLyBTY3JpcHQgbGluZSBudW1iZXJzIGFyZSAxIGJh c2VkLgogICAgIGlmIChtX2Rlc3QgPiBtX2J1ZmZlcikgewotICAgICAgICBjdXJyVG9rZW4udGV4 dCA9IFN0cmluZ0ltcGw6OmNyZWF0ZVN0cmlwcGluZ051bGxDaGFyYWN0ZXJzKG1fYnVmZmVyLCBt X2Rlc3QgLSBtX2J1ZmZlcik7Ci0gICAgICAgIGlmIChjdXJyVG9rZW4udGFnTmFtZSAhPSBjb21t ZW50QXRvbSkKLSAgICAgICAgICAgIGN1cnJUb2tlbi50YWdOYW1lID0gdGV4dEF0b207Ci0gICAg fSBlbHNlIGlmIChjdXJyVG9rZW4udGFnTmFtZSA9PSBudWxsQXRvbSkgewotICAgICAgICBjdXJy VG9rZW4ucmVzZXQoKTsKKyAgICAgICAgbV9jdXJyZW50VG9rZW4udGV4dCA9IFN0cmluZ0ltcGw6 OmNyZWF0ZVN0cmlwcGluZ051bGxDaGFyYWN0ZXJzKG1fYnVmZmVyLCBtX2Rlc3QgLSBtX2J1ZmZl cik7CisgICAgICAgIGlmIChtX2N1cnJlbnRUb2tlbi50YWdOYW1lICE9IGNvbW1lbnRBdG9tKQor ICAgICAgICAgICAgbV9jdXJyZW50VG9rZW4udGFnTmFtZSA9IHRleHRBdG9tOworICAgIH0gZWxz ZSBpZiAobV9jdXJyZW50VG9rZW4udGFnTmFtZSA9PSBudWxsQXRvbSkgeworICAgICAgICBtX2N1 cnJlbnRUb2tlbi5yZXNldCgpOwogICAgICAgICBpZiAoc2NyaXB0Q29udHJvbGxlcikKICAgICAg ICAgICAgIHNjcmlwdENvbnRyb2xsZXItPnNldEV2ZW50SGFuZGxlckxpbmVubyhtX2xpbmVOdW1i ZXIgKyAxKTsgLy8gU2NyaXB0IGxpbmUgbnVtYmVycyBhcmUgMSBiYXNlZC4KICAgICAgICAgcmV0 dXJuIDA7CkBAIC0xODg3LDE1ICsxODg3LDE1IEBAIFBhc3NSZWZQdHI8Tm9kZT4gSFRNTFRva2Vu aXplcjo6cHJvY2Vzc1Rva2VuKCkKICAgICBSZWZQdHI8Tm9kZT4gbjsKICAgICAKICAgICBpZiAo IW1fcGFyc2VyU3RvcHBlZCkgewotICAgICAgICBpZiAoTmFtZWRNYXBwZWRBdHRyTWFwKiBtYXAg PSBjdXJyVG9rZW4uYXR0cnMuZ2V0KCkpCisgICAgICAgIGlmIChOYW1lZE1hcHBlZEF0dHJNYXAq IG1hcCA9IG1fY3VycmVudFRva2VuLmF0dHJzLmdldCgpKQogICAgICAgICAgICAgbWFwLT5zaHJp bmtUb0xlbmd0aCgpOwogICAgICAgICBpZiAoaW5WaWV3U291cmNlTW9kZSgpKQotICAgICAgICAg ICAgc3RhdGljX2Nhc3Q8SFRNTFZpZXdTb3VyY2VEb2N1bWVudCo+KG1fZG9jKS0+YWRkVmlld1Nv dXJjZVRva2VuKCZjdXJyVG9rZW4pOworICAgICAgICAgICAgc3RhdGljX2Nhc3Q8SFRNTFZpZXdT b3VyY2VEb2N1bWVudCo+KG1fZG9jKS0+YWRkVmlld1NvdXJjZVRva2VuKCZtX2N1cnJlbnRUb2tl bik7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIC8vIHBhc3MgdGhlIHRva2VuIG92ZXIgdG8g dGhlIHBhcnNlciwgdGhlIHBhcnNlciBET0VTIE5PVCBkZWxldGUgdGhlIHRva2VuCi0gICAgICAg ICAgICBuID0gbV9wYXJzZXItPnBhcnNlVG9rZW4oJmN1cnJUb2tlbik7CisgICAgICAgICAgICBu ID0gbV9wYXJzZXItPnBhcnNlVG9rZW4oJm1fY3VycmVudFRva2VuKTsKICAgICB9Ci0gICAgY3Vy clRva2VuLnJlc2V0KCk7CisgICAgbV9jdXJyZW50VG9rZW4ucmVzZXQoKTsKICAgICBpZiAoc2Ny aXB0Q29udHJvbGxlcikKICAgICAgICAgc2NyaXB0Q29udHJvbGxlci0+c2V0RXZlbnRIYW5kbGVy TGluZW5vKDApOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5oIGIv V2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuaAppbmRleCA2M2IyMzE0Li44MjEwODhjIDEwMDY0 NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5oCisrKyBiL1dlYkNvcmUvaHRtbC9I VE1MVG9rZW5pemVyLmgKQEAgLTIxMSw3ICsyMTEsNyBAQCBwcml2YXRlOgogICAgIGludCBtX2J1 ZmZlclNpemU7CiAgICAgVUNoYXIqIG1fZGVzdDsKIAotICAgIFRva2VuIGN1cnJUb2tlbjsKKyAg ICBUb2tlbiBtX2N1cnJlbnRUb2tlbjsKIAogICAgIC8vIFRva2VuaXplciBmbGFncwogICAgIC8v Ly8vLy8vLy8vLy8vLy8vLwo=