38047 2010-04-23 09:26:20 -0700 svn-apply: suppress misleading "error: pathspec ..." message when adding binary file 2010-05-08 19:39:14 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 cjerdonek cjerdonek cjerdonek dbates eric oldest_to_newest 216439 0 cjerdonek 2010-04-23 09:26:20 -0700 See here for an example of the misleading "error: pathspec" message: https://bugs.webkit.org/show_bug.cgi?id=37044#c12 To solve this, console output should be suppressed in this method of svn-apply: sub scmKnowsOfFile($) { my ($path) = @_; if (isSVN()) { ... } elsif (isGit()) { `git ls-files --error-unmatch -- $path`; <-- Suppress console output. my $exitCode = $? >> 8; return $exitCode == 0; } } 222883 1 55475 cjerdonek 2010-05-08 08:12:28 -0700 Created attachment 55475 Proposed patch 222884 2 55476 cjerdonek 2010-05-08 08:18:46 -0700 Created attachment 55476 Proposed patch Corrected ChangeLog. 222885 3 55477 cjerdonek 2010-05-08 08:21:46 -0700 Created attachment 55477 Proposed patch 3 Fixed a code comment: STDOUT -> STDERR. 222954 4 55477 dbates 2010-05-08 18:19:06 -0700 Comment on attachment 55477 Proposed patch 3 We should add a comment to reference the Perldocs about this. > +sub callSilently($@) { > + my ($func, @args) = @_; > + > + open(OLDERR, ">&STDERR"); > + close(STDERR); > + my @returnValue = &$func(@args); > + open(STDERR, ">&OLDERR"); > + close(OLDERR); # FIXME: Is this necessary? > + > + return @returnValue; > +} > + We should probably change this to use exitStatus. We can do this in another patch, but then we should add a FIXME comment. > +sub gitKnowsOfFile($) > +{ > + my $path = shift; > + > + `git ls-files --error-unmatch -- $path`; > + my $exitCode = $? >> 8; > + return $exitCode == 0; > +} r=me. 222957 5 cjerdonek 2010-05-08 19:39:14 -0700 Committed: http://trac.webkit.org/changeset/59043 55475 2010-05-08 08:12:28 -0700 2010-05-08 08:18:46 -0700 Proposed patch _patch-38047-1.diff text/plain 3376 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlYmY4ZjhhLi40OTk1NGIzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDUt MDcgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGVycm9yIHBhdGhzcGVjIGlz IG5vdyBzdXBwcmVzc2VkLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zODA0NworCisgICAgICAgICogU2NyaXB0cy9WQ1NVdGlscy5wbToKKyAgICAg ICAgKiBTY3JpcHRzL3N2bi1hcHBseToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHBlcmwvVkNT VXRpbHNfdW5pdHRlc3QvcnVuUGF0Y2hDb21tYW5kLnBsOgorCiAyMDEwLTA1LTA3ICBEYXJpbiBG aXNoZXIgIDxkYXJpbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRml4IGJ1aWxkIGJ1c3RhZ2U6 IHRvRWxlbWVudDxUPiBzaG91bGQgYmUgdG88VD4uCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL1ZDU1V0aWxzLnBtIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQppbmRl eCA3NzdmZTdmLi5lZGRmMTVjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0 aWxzLnBtCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0KQEAgLTQzLDYgKzQz LDcgQEAgQkVHSU4gewogICAgICRWRVJTSU9OICAgICA9IDEuMDA7CiAgICAgQElTQSAgICAgICAg ID0gcXcoRXhwb3J0ZXIpOwogICAgIEBFWFBPUlQgICAgICA9IHF3KAorICAgICAgICAmY2FsbFNp bGVudGx5CiAgICAgICAgICZjYW5vbmljYWxpemVQYXRoCiAgICAgICAgICZjaGFuZ2VMb2dFbWFp bEFkZHJlc3MKICAgICAgICAgJmNoYW5nZUxvZ05hbWUKQEAgLTk3LDYgKzk4LDIwIEBAIHN1YiBl eGl0U3RhdHVzKCQpCiAgICAgcmV0dXJuIFdFWElUU1RBVFVTKCRyZXR1cm52YWx1ZSk7CiB9CiAK KyMgQ2FsbCBhIGZ1bmN0aW9uIHdoaWxlIHN1cHByZXNzaW5nIFNUREVSUiwgYW5kIHJldHVybiB0 aGUgcmV0dXJuIHZhbHVlcworIyBhcyBhbiBhcnJheS4KK3N1YiBjYWxsU2lsZW50bHkoJEApIHsK KyAgICBteSAoJGZ1bmMsIEBhcmdzKSA9IEBfOworCisgICAgb3BlbihPTERFUlIsICI+JlNUREVS UiIpOworICAgIGNsb3NlKFNUREVSUik7CisgICAgbXkgQHJldHVyblZhbHVlID0gJiRmdW5jKEBh cmdzKTsKKyAgICBvcGVuKFNUREVSUiwgIj4mT0xERVJSIik7CisgICAgY2xvc2UoT0xERVJSKTsg IyBGSVhNRTogSXMgdGhpcyBuZWNlc3Nhcnk/CisKKyAgICByZXR1cm4gQHJldHVyblZhbHVlOwor fQorCiAjIE5vdGUsIHRoaXMgbWV0aG9kIHdpbGwgbm90IGVycm9yIGlmIHRoZSBmaWxlIGNvcnJl c3BvbmRpbmcgdG8gdGhlIHBhdGggZG9lcyBub3QgZXhpc3QuCiBzdWIgc2NtVG9nZ2xlRXhlY3V0 YWJsZUJpdAogewpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9zdm4tYXBwbHkgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseQppbmRleCBiNDljY2VjLi42MzU4YzYxIDEwMDc1 NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseQorKysgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3N2bi1hcHBseQpAQCAtMzk5LDYgKzM5OSwyMiBAQCBzdWIgc2NtV2lsbERlbGV0ZUZp bGUoJCkKICAgICByZXR1cm4gMDsKIH0KIAorIyBSZXR1cm4gd2hldGhlciB0aGUgZmlsZSBhdCB0 aGUgZ2l2ZW4gcGF0aCBpcyBrbm93biB0byBHaXQuCisjCisjIFRoaXMgbWV0aG9kIG91dHB1dHMg YSBtZXNzYWdlIGxpa2UgdGhlIGZvbGxvd2luZyB0byBTVERPVVQgd2hlbgorIyByZXR1cm5pbmcg ZmFsc2U6CisjCisjICJlcnJvcjogcGF0aHNwZWMgJ3Rlc3QucG5nJyBkaWQgbm90IG1hdGNoIGFu eSBmaWxlKHMpIGtub3duIHRvIGdpdC4KKyMgIERpZCB5b3UgZm9yZ2V0IHRvICdnaXQgYWRkJz8i CitzdWIgZ2l0S25vd3NPZkZpbGUoJCkKK3sKKyAgICBteSAkcGF0aCA9IHNoaWZ0OworCisgICAg YGdpdCBscy1maWxlcyAtLWVycm9yLXVubWF0Y2ggLS0gJHBhdGhgOworICAgIG15ICRleGl0Q29k ZSA9ICQ/ID4+IDg7CisgICAgcmV0dXJuICRleGl0Q29kZSA9PSAwOworfQorCiBzdWIgc2NtS25v d3NPZkZpbGUoJCkKIHsKICAgICBteSAoJHBhdGgpID0gQF87CkBAIC00MTEsOSArNDI3LDggQEAg c3ViIHNjbUtub3dzT2ZGaWxlKCQpCiAgICAgICAgICMgVGhpcyBkb2VzIG5vdCBoYW5kbGUgZXJy b3JzIHdlbGwuCiAgICAgICAgIHJldHVybiAxOwogICAgIH0gZWxzaWYgKGlzR2l0KCkpIHsKLSAg ICAgICAgYGdpdCBscy1maWxlcyAtLWVycm9yLXVubWF0Y2ggLS0gJHBhdGhgOwotICAgICAgICBt eSAkZXhpdENvZGUgPSAkPyA+PiA4OwotICAgICAgICByZXR1cm4gJGV4aXRDb2RlID09IDA7Cisg ICAgICAgIG15IEByZXN1bHQgPSBjYWxsU2lsZW50bHkoXCZnaXRLbm93c09mRmlsZSwgJHBhdGgp OworICAgICAgICByZXR1cm4gJHJlc3VsdFswXTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9ydW5QYXRjaENv bW1hbmQucGwgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRl c3QvcnVuUGF0Y2hDb21tYW5kLnBsCmluZGV4IDgxMTFkZWYuLjVhY2M1MTcgMTAwNjQ0Ci0tLSBh L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9ydW5QYXRj aENvbW1hbmQucGwKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxz X3VuaXR0ZXN0L3J1blBhdGNoQ29tbWFuZC5wbApAQCAtMzMsMTkgKzMzLDYgQEAKIHVzZSBUZXN0 OjpTaW1wbGUgdGVzdHMgPT4gNDsKIHVzZSBWQ1NVdGlsczsKIAotIyBDYWxsIGEgZnVuY3Rpb24g d2hpbGUgc3VwcHJlc3NpbmcgU1RERVJSLgotc3ViIGNhbGxTaWxlbnRseSgkQCkgewotICAgIG15 ICgkZnVuYywgQGFyZ3MpID0gQF87Ci0KLSAgICBvcGVuKE9MREVSUiwgIj4mU1RERVJSIik7Ci0g ICAgY2xvc2UoU1RERVJSKTsKLSAgICBteSBAcmV0dXJuVmFsdWUgPSAmJGZ1bmMoQGFyZ3MpOwot ICAgIG9wZW4oU1RERVJSLCAiPiZPTERFUlIiKTsKLSAgICBjbG9zZShPTERFUlIpOyAjIEZJWE1F OiBJcyB0aGlzIG5lY2Vzc2FyeT8KLQotICAgIHJldHVybiBAcmV0dXJuVmFsdWU7Ci19Ci0KICMg TmV3IHRlc3QKICR0aXRsZSA9ICJydW5QYXRjaENvbW1hbmQ6IFVuc3VjY2Vzc2Z1bCBwYXRjaCwg Zm9yY2luZy4iOwogCg== 55476 2010-05-08 08:18:46 -0700 2010-05-08 08:21:46 -0700 Proposed patch _patch-38047-1.diff text/plain 4143 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlYmY4ZjhhLi43MDA3MjI4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTAtMDUt MDcgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyByZXZpc2lvbiBzdXBwcmVz c2VzIHRoZSBtaXNsZWFkaW5nICJlcnJvcjogcGF0aHNwZWMuLi4iIG1lc3NhZ2VzCisgICAgICAg IHdoZW4gdXNpbmcgc3ZuLWFwcGx5IHRvIGFkZCBhIGJpbmFyeSBmaWxlIGZyb20gYSBHaXQgZGlm Zi4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzgw NDcKKworICAgICAgICBXaGVuIGFkZGluZyBhIG5ldyBiaW5hcnkgZmlsZSBmcm9tIGEgR2l0IGRp ZmYsIHN2bi1hcHBseSBwcmludHMKKyAgICAgICAgYSBtaXNsZWFkaW5nIGVycm9yIG9mIHRoZSBm b3JtIC0tICJlcnJvcjogcGF0aHNwZWMgJzxmaWxlbmFtZT4nIGRpZAorICAgICAgICBub3QgbWF0 Y2ggYW55IGZpbGUocykga25vd24gdG8gZ2l0LiAgRGlkIHlvdSBmb3JnZXQgdG8gJ2dpdCBhZGQn PyIKKyAgICAgICAgVGhpcyBwYXRjaCBzdXBwcmVzc2VzIHRoZXNlIG1lc3NhZ2VzIHNpbmNlIHRo ZXkgYXJlIG5vcm1hbC4KKworICAgICAgICAqIFNjcmlwdHMvVkNTVXRpbHMucG06CisgICAgICAg ICAgQWRkZWQgdGhlIGNhbGxTaWxlbnRseSgpIHN1YnJvdXRpbmUgZnJvbSBydW5QYXRjaENvbW1h bmQucGwsIHdoaWNoCisgICAgICAgICAgZXhlY3V0ZXMgYSBQZXJsIGZ1bmN0aW9uIHdoaWxlIHN1 cHByZXNzaW5nIFNUREVSUi4KKyAgICAgICAgKiBTY3JpcHRzL3N2bi1hcHBseToKKyAgICAgICAg ICBSZWZhY3RvcmVkIHRoZSBHaXQgcG9ydGlvbiBvZiBzY21Lbm93c09mRmlsZSgpIGludG8gYQor ICAgICAgICAgIGdpdEtub3dzT2ZGaWxlKCksIGFuZCBjYWxsZWQgdGhpcyBuZXcgc3Vicm91dGlu ZSB1c2luZyBjYWxsU2lsZW50bHkoKS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHBlcmwvVkNT VXRpbHNfdW5pdHRlc3QvcnVuUGF0Y2hDb21tYW5kLnBsOgorICAgICAgICAgIFJlbW92ZWQgY2Fs bFNpbGVudGx5KCkgc2luY2UgaXQgd2FzIG1vdmVkIHRvIFZDU1V0aWxzLnBtIGluIHRoaXMgcGF0 Y2guCisKIDIwMTAtMDUtMDcgIERhcmluIEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBGaXggYnVpbGQgYnVzdGFnZTogdG9FbGVtZW50PFQ+IHNob3VsZCBiZSB0bzxUPi4K ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0gYi9XZWJLaXRUb29s cy9TY3JpcHRzL1ZDU1V0aWxzLnBtCmluZGV4IDc3N2ZlN2YuLmVkZGYxNWMgMTAwNjQ0Ci0tLSBh L1dlYktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0KKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy9WQ1NVdGlscy5wbQpAQCAtNDMsNiArNDMsNyBAQCBCRUdJTiB7CiAgICAgJFZFUlNJT04gICAg ID0gMS4wMDsKICAgICBASVNBICAgICAgICAgPSBxdyhFeHBvcnRlcik7CiAgICAgQEVYUE9SVCAg ICAgID0gcXcoCisgICAgICAgICZjYWxsU2lsZW50bHkKICAgICAgICAgJmNhbm9uaWNhbGl6ZVBh dGgKICAgICAgICAgJmNoYW5nZUxvZ0VtYWlsQWRkcmVzcwogICAgICAgICAmY2hhbmdlTG9nTmFt ZQpAQCAtOTcsNiArOTgsMjAgQEAgc3ViIGV4aXRTdGF0dXMoJCkKICAgICByZXR1cm4gV0VYSVRT VEFUVVMoJHJldHVybnZhbHVlKTsKIH0KIAorIyBDYWxsIGEgZnVuY3Rpb24gd2hpbGUgc3VwcHJl c3NpbmcgU1RERVJSLCBhbmQgcmV0dXJuIHRoZSByZXR1cm4gdmFsdWVzCisjIGFzIGFuIGFycmF5 Lgorc3ViIGNhbGxTaWxlbnRseSgkQCkgeworICAgIG15ICgkZnVuYywgQGFyZ3MpID0gQF87CisK KyAgICBvcGVuKE9MREVSUiwgIj4mU1RERVJSIik7CisgICAgY2xvc2UoU1RERVJSKTsKKyAgICBt eSBAcmV0dXJuVmFsdWUgPSAmJGZ1bmMoQGFyZ3MpOworICAgIG9wZW4oU1RERVJSLCAiPiZPTERF UlIiKTsKKyAgICBjbG9zZShPTERFUlIpOyAjIEZJWE1FOiBJcyB0aGlzIG5lY2Vzc2FyeT8KKwor ICAgIHJldHVybiBAcmV0dXJuVmFsdWU7Cit9CisKICMgTm90ZSwgdGhpcyBtZXRob2Qgd2lsbCBu b3QgZXJyb3IgaWYgdGhlIGZpbGUgY29ycmVzcG9uZGluZyB0byB0aGUgcGF0aCBkb2VzIG5vdCBl eGlzdC4KIHN1YiBzY21Ub2dnbGVFeGVjdXRhYmxlQml0CiB7CmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9TY3JpcHRzL3N2bi1hcHBseSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5Cmlu ZGV4IGI0OWNjZWMuLjYzNThjNjEgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvc3Zu LWFwcGx5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5CkBAIC0zOTksNiArMzk5 LDIyIEBAIHN1YiBzY21XaWxsRGVsZXRlRmlsZSgkKQogICAgIHJldHVybiAwOwogfQogCisjIFJl dHVybiB3aGV0aGVyIHRoZSBmaWxlIGF0IHRoZSBnaXZlbiBwYXRoIGlzIGtub3duIHRvIEdpdC4K KyMKKyMgVGhpcyBtZXRob2Qgb3V0cHV0cyBhIG1lc3NhZ2UgbGlrZSB0aGUgZm9sbG93aW5nIHRv IFNURE9VVCB3aGVuCisjIHJldHVybmluZyBmYWxzZToKKyMKKyMgImVycm9yOiBwYXRoc3BlYyAn dGVzdC5wbmcnIGRpZCBub3QgbWF0Y2ggYW55IGZpbGUocykga25vd24gdG8gZ2l0LgorIyAgRGlk IHlvdSBmb3JnZXQgdG8gJ2dpdCBhZGQnPyIKK3N1YiBnaXRLbm93c09mRmlsZSgkKQoreworICAg IG15ICRwYXRoID0gc2hpZnQ7CisKKyAgICBgZ2l0IGxzLWZpbGVzIC0tZXJyb3ItdW5tYXRjaCAt LSAkcGF0aGA7CisgICAgbXkgJGV4aXRDb2RlID0gJD8gPj4gODsKKyAgICByZXR1cm4gJGV4aXRD b2RlID09IDA7Cit9CisKIHN1YiBzY21Lbm93c09mRmlsZSgkKQogewogICAgIG15ICgkcGF0aCkg PSBAXzsKQEAgLTQxMSw5ICs0MjcsOCBAQCBzdWIgc2NtS25vd3NPZkZpbGUoJCkKICAgICAgICAg IyBUaGlzIGRvZXMgbm90IGhhbmRsZSBlcnJvcnMgd2VsbC4KICAgICAgICAgcmV0dXJuIDE7CiAg ICAgfSBlbHNpZiAoaXNHaXQoKSkgewotICAgICAgICBgZ2l0IGxzLWZpbGVzIC0tZXJyb3ItdW5t YXRjaCAtLSAkcGF0aGA7Ci0gICAgICAgIG15ICRleGl0Q29kZSA9ICQ/ID4+IDg7Ci0gICAgICAg IHJldHVybiAkZXhpdENvZGUgPT0gMDsKKyAgICAgICAgbXkgQHJlc3VsdCA9IGNhbGxTaWxlbnRs eShcJmdpdEtub3dzT2ZGaWxlLCAkcGF0aCk7CisgICAgICAgIHJldHVybiAkcmVzdWx0WzBdOwog ICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZD U1V0aWxzX3VuaXR0ZXN0L3J1blBhdGNoQ29tbWFuZC5wbCBiL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9ydW5QYXRjaENvbW1hbmQucGwKaW5kZXggODEx MWRlZi4uNWFjYzUxNyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRwZXJs L1ZDU1V0aWxzX3VuaXR0ZXN0L3J1blBhdGNoQ29tbWFuZC5wbAorKysgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcnVuUGF0Y2hDb21tYW5kLnBsCkBA IC0zMywxOSArMzMsNiBAQAogdXNlIFRlc3Q6OlNpbXBsZSB0ZXN0cyA9PiA0OwogdXNlIFZDU1V0 aWxzOwogCi0jIENhbGwgYSBmdW5jdGlvbiB3aGlsZSBzdXBwcmVzc2luZyBTVERFUlIuCi1zdWIg Y2FsbFNpbGVudGx5KCRAKSB7Ci0gICAgbXkgKCRmdW5jLCBAYXJncykgPSBAXzsKLQotICAgIG9w ZW4oT0xERVJSLCAiPiZTVERFUlIiKTsKLSAgICBjbG9zZShTVERFUlIpOwotICAgIG15IEByZXR1 cm5WYWx1ZSA9ICYkZnVuYyhAYXJncyk7Ci0gICAgb3BlbihTVERFUlIsICI+Jk9MREVSUiIpOwot ICAgIGNsb3NlKE9MREVSUik7ICMgRklYTUU6IElzIHRoaXMgbmVjZXNzYXJ5PwotCi0gICAgcmV0 dXJuIEByZXR1cm5WYWx1ZTsKLX0KLQogIyBOZXcgdGVzdAogJHRpdGxlID0gInJ1blBhdGNoQ29t bWFuZDogVW5zdWNjZXNzZnVsIHBhdGNoLCBmb3JjaW5nLiI7CiAK 55477 2010-05-08 08:21:46 -0700 2010-05-08 18:19:05 -0700 Proposed patch 3 _patch-38047-1.diff text/plain 4143 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlYmY4ZjhhLi43MDA3MjI4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTAtMDUt MDcgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyByZXZpc2lvbiBzdXBwcmVz c2VzIHRoZSBtaXNsZWFkaW5nICJlcnJvcjogcGF0aHNwZWMuLi4iIG1lc3NhZ2VzCisgICAgICAg IHdoZW4gdXNpbmcgc3ZuLWFwcGx5IHRvIGFkZCBhIGJpbmFyeSBmaWxlIGZyb20gYSBHaXQgZGlm Zi4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzgw NDcKKworICAgICAgICBXaGVuIGFkZGluZyBhIG5ldyBiaW5hcnkgZmlsZSBmcm9tIGEgR2l0IGRp ZmYsIHN2bi1hcHBseSBwcmludHMKKyAgICAgICAgYSBtaXNsZWFkaW5nIGVycm9yIG9mIHRoZSBm b3JtIC0tICJlcnJvcjogcGF0aHNwZWMgJzxmaWxlbmFtZT4nIGRpZAorICAgICAgICBub3QgbWF0 Y2ggYW55IGZpbGUocykga25vd24gdG8gZ2l0LiAgRGlkIHlvdSBmb3JnZXQgdG8gJ2dpdCBhZGQn PyIKKyAgICAgICAgVGhpcyBwYXRjaCBzdXBwcmVzc2VzIHRoZXNlIG1lc3NhZ2VzIHNpbmNlIHRo ZXkgYXJlIG5vcm1hbC4KKworICAgICAgICAqIFNjcmlwdHMvVkNTVXRpbHMucG06CisgICAgICAg ICAgQWRkZWQgdGhlIGNhbGxTaWxlbnRseSgpIHN1YnJvdXRpbmUgZnJvbSBydW5QYXRjaENvbW1h bmQucGwsIHdoaWNoCisgICAgICAgICAgZXhlY3V0ZXMgYSBQZXJsIGZ1bmN0aW9uIHdoaWxlIHN1 cHByZXNzaW5nIFNUREVSUi4KKyAgICAgICAgKiBTY3JpcHRzL3N2bi1hcHBseToKKyAgICAgICAg ICBSZWZhY3RvcmVkIHRoZSBHaXQgcG9ydGlvbiBvZiBzY21Lbm93c09mRmlsZSgpIGludG8gYQor ICAgICAgICAgIGdpdEtub3dzT2ZGaWxlKCksIGFuZCBjYWxsZWQgdGhpcyBuZXcgc3Vicm91dGlu ZSB1c2luZyBjYWxsU2lsZW50bHkoKS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHBlcmwvVkNT VXRpbHNfdW5pdHRlc3QvcnVuUGF0Y2hDb21tYW5kLnBsOgorICAgICAgICAgIFJlbW92ZWQgY2Fs bFNpbGVudGx5KCkgc2luY2UgaXQgd2FzIG1vdmVkIHRvIFZDU1V0aWxzLnBtIGluIHRoaXMgcGF0 Y2guCisKIDIwMTAtMDUtMDcgIERhcmluIEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBGaXggYnVpbGQgYnVzdGFnZTogdG9FbGVtZW50PFQ+IHNob3VsZCBiZSB0bzxUPi4K ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0gYi9XZWJLaXRUb29s cy9TY3JpcHRzL1ZDU1V0aWxzLnBtCmluZGV4IDc3N2ZlN2YuLmVkZGYxNWMgMTAwNjQ0Ci0tLSBh L1dlYktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0KKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy9WQ1NVdGlscy5wbQpAQCAtNDMsNiArNDMsNyBAQCBCRUdJTiB7CiAgICAgJFZFUlNJT04gICAg ID0gMS4wMDsKICAgICBASVNBICAgICAgICAgPSBxdyhFeHBvcnRlcik7CiAgICAgQEVYUE9SVCAg ICAgID0gcXcoCisgICAgICAgICZjYWxsU2lsZW50bHkKICAgICAgICAgJmNhbm9uaWNhbGl6ZVBh dGgKICAgICAgICAgJmNoYW5nZUxvZ0VtYWlsQWRkcmVzcwogICAgICAgICAmY2hhbmdlTG9nTmFt ZQpAQCAtOTcsNiArOTgsMjAgQEAgc3ViIGV4aXRTdGF0dXMoJCkKICAgICByZXR1cm4gV0VYSVRT VEFUVVMoJHJldHVybnZhbHVlKTsKIH0KIAorIyBDYWxsIGEgZnVuY3Rpb24gd2hpbGUgc3VwcHJl c3NpbmcgU1RERVJSLCBhbmQgcmV0dXJuIHRoZSByZXR1cm4gdmFsdWVzCisjIGFzIGFuIGFycmF5 Lgorc3ViIGNhbGxTaWxlbnRseSgkQCkgeworICAgIG15ICgkZnVuYywgQGFyZ3MpID0gQF87CisK KyAgICBvcGVuKE9MREVSUiwgIj4mU1RERVJSIik7CisgICAgY2xvc2UoU1RERVJSKTsKKyAgICBt eSBAcmV0dXJuVmFsdWUgPSAmJGZ1bmMoQGFyZ3MpOworICAgIG9wZW4oU1RERVJSLCAiPiZPTERF UlIiKTsKKyAgICBjbG9zZShPTERFUlIpOyAjIEZJWE1FOiBJcyB0aGlzIG5lY2Vzc2FyeT8KKwor ICAgIHJldHVybiBAcmV0dXJuVmFsdWU7Cit9CisKICMgTm90ZSwgdGhpcyBtZXRob2Qgd2lsbCBu b3QgZXJyb3IgaWYgdGhlIGZpbGUgY29ycmVzcG9uZGluZyB0byB0aGUgcGF0aCBkb2VzIG5vdCBl eGlzdC4KIHN1YiBzY21Ub2dnbGVFeGVjdXRhYmxlQml0CiB7CmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9TY3JpcHRzL3N2bi1hcHBseSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5Cmlu ZGV4IGI0OWNjZWMuLjViMGYzMWYgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvc3Zu LWFwcGx5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5CkBAIC0zOTksNiArMzk5 LDIyIEBAIHN1YiBzY21XaWxsRGVsZXRlRmlsZSgkKQogICAgIHJldHVybiAwOwogfQogCisjIFJl dHVybiB3aGV0aGVyIHRoZSBmaWxlIGF0IHRoZSBnaXZlbiBwYXRoIGlzIGtub3duIHRvIEdpdC4K KyMKKyMgVGhpcyBtZXRob2Qgb3V0cHV0cyBhIG1lc3NhZ2UgbGlrZSB0aGUgZm9sbG93aW5nIHRv IFNUREVSUiB3aGVuCisjIHJldHVybmluZyBmYWxzZToKKyMKKyMgImVycm9yOiBwYXRoc3BlYyAn dGVzdC5wbmcnIGRpZCBub3QgbWF0Y2ggYW55IGZpbGUocykga25vd24gdG8gZ2l0LgorIyAgRGlk IHlvdSBmb3JnZXQgdG8gJ2dpdCBhZGQnPyIKK3N1YiBnaXRLbm93c09mRmlsZSgkKQoreworICAg IG15ICRwYXRoID0gc2hpZnQ7CisKKyAgICBgZ2l0IGxzLWZpbGVzIC0tZXJyb3ItdW5tYXRjaCAt LSAkcGF0aGA7CisgICAgbXkgJGV4aXRDb2RlID0gJD8gPj4gODsKKyAgICByZXR1cm4gJGV4aXRD b2RlID09IDA7Cit9CisKIHN1YiBzY21Lbm93c09mRmlsZSgkKQogewogICAgIG15ICgkcGF0aCkg PSBAXzsKQEAgLTQxMSw5ICs0MjcsOCBAQCBzdWIgc2NtS25vd3NPZkZpbGUoJCkKICAgICAgICAg IyBUaGlzIGRvZXMgbm90IGhhbmRsZSBlcnJvcnMgd2VsbC4KICAgICAgICAgcmV0dXJuIDE7CiAg ICAgfSBlbHNpZiAoaXNHaXQoKSkgewotICAgICAgICBgZ2l0IGxzLWZpbGVzIC0tZXJyb3ItdW5t YXRjaCAtLSAkcGF0aGA7Ci0gICAgICAgIG15ICRleGl0Q29kZSA9ICQ/ID4+IDg7Ci0gICAgICAg IHJldHVybiAkZXhpdENvZGUgPT0gMDsKKyAgICAgICAgbXkgQHJlc3VsdCA9IGNhbGxTaWxlbnRs eShcJmdpdEtub3dzT2ZGaWxlLCAkcGF0aCk7CisgICAgICAgIHJldHVybiAkcmVzdWx0WzBdOwog ICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZD U1V0aWxzX3VuaXR0ZXN0L3J1blBhdGNoQ29tbWFuZC5wbCBiL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9ydW5QYXRjaENvbW1hbmQucGwKaW5kZXggODEx MWRlZi4uNWFjYzUxNyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRwZXJs L1ZDU1V0aWxzX3VuaXR0ZXN0L3J1blBhdGNoQ29tbWFuZC5wbAorKysgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcnVuUGF0Y2hDb21tYW5kLnBsCkBA IC0zMywxOSArMzMsNiBAQAogdXNlIFRlc3Q6OlNpbXBsZSB0ZXN0cyA9PiA0OwogdXNlIFZDU1V0 aWxzOwogCi0jIENhbGwgYSBmdW5jdGlvbiB3aGlsZSBzdXBwcmVzc2luZyBTVERFUlIuCi1zdWIg Y2FsbFNpbGVudGx5KCRAKSB7Ci0gICAgbXkgKCRmdW5jLCBAYXJncykgPSBAXzsKLQotICAgIG9w ZW4oT0xERVJSLCAiPiZTVERFUlIiKTsKLSAgICBjbG9zZShTVERFUlIpOwotICAgIG15IEByZXR1 cm5WYWx1ZSA9ICYkZnVuYyhAYXJncyk7Ci0gICAgb3BlbihTVERFUlIsICI+Jk9MREVSUiIpOwot ICAgIGNsb3NlKE9MREVSUik7ICMgRklYTUU6IElzIHRoaXMgbmVjZXNzYXJ5PwotCi0gICAgcmV0 dXJuIEByZXR1cm5WYWx1ZTsKLX0KLQogIyBOZXcgdGVzdAogJHRpdGxlID0gInJ1blBhdGNoQ29t bWFuZDogVW5zdWNjZXNzZnVsIHBhdGNoLCBmb3JjaW5nLiI7CiAK