169154 2017-03-03 16:11:02 -0800 Add support for relative pathnames to JSC config files 2017-03-05 12:11:15 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 msaboff msaboff clopez commit-queue darin keith_miller mark.lam mcatanzaro saam oldest_to_newest 1283287 0 msaboff 2017-03-03 16:11:02 -0800 There are two relative path support issues. 1) To allow for log file names relative to where the config file is located. 2) To determine the absolute path of the config file when a relative name is used. This is needed so that issue #1 can be addressed. 1283292 1 msaboff 2017-03-03 16:22:00 -0800 <rdar://problem/30844619> 1283293 2 303355 msaboff 2017-03-03 16:22:37 -0800 Created attachment 303355 Patch 1283296 3 303355 saam 2017-03-03 16:37:36 -0800 Comment on attachment 303355 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=303355&action=review r=me > Source/JavaScriptCore/runtime/ConfigFile.cpp:434 > + if (sizeof(filenameBuffer) - 1 > pathnameLength + shouldAddPathSeparator) { Why not >=? 1283299 4 msaboff 2017-03-03 16:45:27 -0800 (In reply to comment #3) > > Source/JavaScriptCore/runtime/ConfigFile.cpp:434 > > + if (sizeof(filenameBuffer) - 1 > pathnameLength + shouldAddPathSeparator) { > > Why not >=? I think you're right, >= is fine. I made that change. 1283320 5 msaboff 2017-03-03 17:09:50 -0800 Committed r213399: <http://trac.webkit.org/changeset/213399> 1283375 6 clopez 2017-03-03 21:01:57 -0800 Committed r213416: <http://trac.webkit.org/changeset/213416> 1283441 7 darin 2017-03-04 10:16:52 -0800 I don’t think we need an #if around include of <unistd.h>. Do we compile on any platform that does not have a header by that name? 1283461 8 mcatanzaro 2017-03-04 12:58:12 -0800 Surely Windows does not have unistd.h? Is that wrong? 1283612 9 darin 2017-03-05 12:11:15 -0800 (In reply to comment #8) > Surely Windows does not have unistd.h? Is that wrong? I had though we had some sort of compatibility version of <unistd.h> for Windows, but looking at the rest of our code it seems that we don’t. (I see an unguarded include of that header in WebProcess.cpp, but I think that’s in code we don’t compile for Windows. I think there used to be a compatibility version of the header inside ANGLE, but not any more and we wouldn’t have wanted to rely on it anyway. Instead we include <unistd.h> in a few different places, each time with a different #if. So I guess this makes it no worse.) 303355 2017-03-03 16:22:37 -0800 2017-03-03 16:37:36 -0800 Patch 169154.patch text/plain 5344 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjEzMzkzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBA CisyMDE3LTAzLTAzICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIEFkZCBzdXBwb3J0IGZvciByZWxhdGl2ZSBwYXRobmFtZXMgdG8gSlNDIGNvbmZpZyBmaWxl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY5MTU0 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgdGhl IGNvbmZpZyBmaWxlIGlzIGEgcmVsYXRpdmUgcGF0aCwgcHJlcGVuZCB0aGUgY3VycmVudCB3b3Jr aW5nIGRpcmVjdG9yeS4KKyAgICAgICAgQWZ0ZXIgY2Fub25pY2FsaXppbmcgdGhlIGNvbmZpZyBm aWxlIHBhdGgsIHdlIGV4dHJhY3QgaXRzIGRpcmVjdG9yeSBwYXRoIGFuZAorICAgICAgICB1c2Ug dGhhdCBmb3IgdGhlIGRpcmVjdG9yeSBmb3IgYSByZWxhdGl2ZSBsb2cgcGF0aG5hbWUuCisKKyAg ICAgICAgKiBydW50aW1lL0NvbmZpZ0ZpbGUuY3BwOgorICAgICAgICAoSlNDOjpDb25maWdGaWxl OjpDb25maWdGaWxlKToKKyAgICAgICAgKEpTQzo6Q29uZmlnRmlsZTo6cGFyc2UpOgorICAgICAg ICAoSlNDOjpDb25maWdGaWxlOjpjYW5vbmljYWxpemVQYXRocyk6CisgICAgICAgICogcnVudGlt ZS9Db25maWdGaWxlLmg6CisKIDIwMTctMDMtMDMgIEtlaXRoIE1pbGxlciAgPGtlaXRoX21pbGxl ckBhcHBsZS5jb20+CiAKICAgICAgICAgV0FTTSBzaG91bGQgc3VwcG9ydCBmYXN0ZXIgbG9hZHMu CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db25maWdGaWxlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db25maWdGaWxlLmNwcAko cmV2aXNpb24gMjEzMzkzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29uZmln RmlsZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM4LDExICszOCw2IEBACiBuYW1lc3BhY2UgSlND IHsKIAogc3RhdGljIGNvbnN0IHNpemVfdCBzX3Byb2Nlc3NOYW1lTWF4ID0gMTI4OwotI2lmIFBM QVRGT1JNKFdJTikKLXN0YXRpYyBjb25zdCBzaXplX3Qgc19tYXhQYXRoTGVuZ3RoID0gMjYwOyAv LyBXaW5kb3dzIHZhbHVlIGZvciAiTUFYX1BBVEgiCi0jZWxzZQotc3RhdGljIGNvbnN0IHNpemVf dCBzX21heFBhdGhMZW5ndGggPSBQQVRIX01BWDsKLSNlbmRpZgogY2hhciBDb25maWdGaWxlOjpz X3Byb2Nlc3NOYW1lW3NfcHJvY2Vzc05hbWVNYXggKyAxXSA9IHsgMCB9OwogY2hhciBDb25maWdG aWxlOjpzX3BhcmVudFByb2Nlc3NOYW1lW3NfcHJvY2Vzc05hbWVNYXggKyAxXSA9IHsgMCB9Owog CkBAIC0yMTEsOCArMjA2LDE1IEBAIHByaXZhdGU6CiB9OwogCiBDb25maWdGaWxlOjpDb25maWdG aWxlKGNvbnN0IGNoYXIqIGZpbGVuYW1lKQotICAgIDogbV9maWxlbmFtZShmaWxlbmFtZSkKIHsK KyAgICBpZiAoIWZpbGVuYW1lKQorICAgICAgICBtX2ZpbGVuYW1lWzBdID0gJ1wwJzsKKyAgICBl bHNlIHsKKyAgICAgICAgc3RybmNweShtX2ZpbGVuYW1lLCBmaWxlbmFtZSwgc19tYXhQYXRoTGVu Z3RoKTsKKyAgICAgICAgbV9maWxlbmFtZVtzX21heFBhdGhMZW5ndGhdID0gJ1wwJzsKKyAgICB9 CisKKyAgICBtX2NvbmZpZ0RpcmVjdG9yeVswXSA9ICdcMCc7CiB9CiAKIHZvaWQgQ29uZmlnRmls ZTo6c2V0UHJvY2Vzc05hbWUoY29uc3QgY2hhciogcHJvY2Vzc05hbWUpCkBAIC0yMzAsNiArMjMy LDggQEAgdm9pZCBDb25maWdGaWxlOjpwYXJzZSgpCiAgICAgZW51bSBTdGF0ZW1lbnROZXN0aW5n IHsgVG9wTGV2ZWxTdGF0bWVudCwgTmVzdGVkU3RhdGVtZW50LCBOZXN0ZWRTdGF0ZW1lbnRGYWls ZWRDcml0ZXJpYSB9OwogICAgIGVudW0gUGFyc2VSZXN1bHQgeyBQYXJzZU9LLCBQYXJzZUVycm9y LCBOZXN0ZWRTdGF0ZW1lbnREb25lIH07CiAKKyAgICBjYW5vbmljYWxpemVQYXRocygpOworCiAg ICAgQ29uZmlnRmlsZVNjYW5uZXIgc2Nhbm5lcihtX2ZpbGVuYW1lKTsKIAogICAgIGlmICghc2Nh bm5lci5zdGFydCgpKQpAQCAtMjQyLDggKzI0NiwxMiBAQCB2b2lkIENvbmZpZ0ZpbGU6OnBhcnNl KCkKICAgICBhdXRvIHBhcnNlTG9nRmlsZSA9IFsmXShTdGF0ZW1lbnROZXN0aW5nIHN0YXRlbWVu dE5lc3RpbmcpIHsKICAgICAgICAgY2hhciogZmlsZW5hbWUgPSBudWxscHRyOwogICAgICAgICBp ZiAoc2Nhbm5lci50cnlDb25zdW1lKCc9JykgJiYgKGZpbGVuYW1lID0gc2Nhbm5lci50cnlDb25z dW1lU3RyaW5nKCkpKSB7Ci0gICAgICAgICAgICBpZiAoc3RhdGVtZW50TmVzdGluZyAhPSBOZXN0 ZWRTdGF0ZW1lbnRGYWlsZWRDcml0ZXJpYSkKLSAgICAgICAgICAgICAgICBzdHJuY3B5KGxvZ1Bh dGhuYW1lLCBmaWxlbmFtZSwgc19tYXhQYXRoTGVuZ3RoKTsKKyAgICAgICAgICAgIGlmIChzdGF0 ZW1lbnROZXN0aW5nICE9IE5lc3RlZFN0YXRlbWVudEZhaWxlZENyaXRlcmlhKSB7CisgICAgICAg ICAgICAgICAgaWYgKGZpbGVuYW1lWzBdICE9ICcvJykKKyAgICAgICAgICAgICAgICAgICAgc25w cmludGYobG9nUGF0aG5hbWUsIHNfbWF4UGF0aExlbmd0aCArIDEsICIlcy8lcyIsIG1fY29uZmln RGlyZWN0b3J5LCBmaWxlbmFtZSk7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAg ICAgICAgICBzdHJuY3B5KGxvZ1BhdGhuYW1lLCBmaWxlbmFtZSwgc19tYXhQYXRoTGVuZ3RoKTsK KyAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgcmV0dXJuIFBhcnNlT0s7CiAgICAgICAgIH0K QEAgLTQxMCw0ICs0MTgsNDAgQEAgdm9pZCBDb25maWdGaWxlOjpwYXJzZSgpCiAgICAgICAgIFdU Rjo6ZGF0YUxvZ0YoIkVycm9yIGluIEpTQyBDb25maWcgZmlsZSBvbiBvciBuZWFyIGxpbmUgJXUs IHBhcnNpbmcgJyVzJ1xuIiwgc2Nhbm5lci5saW5lTnVtYmVyKCksIHNjYW5uZXIuY3VycmVudEJ1 ZmZlcigpKTsKIH0KIAordm9pZCBDb25maWdGaWxlOjpjYW5vbmljYWxpemVQYXRocygpCit7Cisg ICAgaWYgKCFtX2ZpbGVuYW1lWzBdKQorICAgICAgICByZXR1cm47CisKKyNpZiBPUyhVTklYKSB8 fCBPUyhEQVJXSU4pCisgICAgaWYgKG1fZmlsZW5hbWVbMF0gIT0gJy8nKSB7CisgICAgICAgIC8v IFJlbGF0aXZlIHBhdGgKKyAgICAgICAgY2hhciBmaWxlbmFtZUJ1ZmZlcltzX21heFBhdGhMZW5n dGggKyAxXTsKKworICAgICAgICBpZiAoZ2V0Y3dkKGZpbGVuYW1lQnVmZmVyLCBzaXplb2YoZmls ZW5hbWVCdWZmZXIpKSkgeworICAgICAgICAgICAgc2l6ZV90IHBhdGhuYW1lTGVuZ3RoID0gc3Ry bGVuKGZpbGVuYW1lQnVmZmVyKTsKKyAgICAgICAgICAgIGJvb2wgc2hvdWxkQWRkUGF0aFNlcGFy YXRvciA9IGZpbGVuYW1lQnVmZmVyW3BhdGhuYW1lTGVuZ3RoIC0gMV0gIT0gJy8nOworICAgICAg ICAgICAgaWYgKHNpemVvZihmaWxlbmFtZUJ1ZmZlcikgLSAxICA+IHBhdGhuYW1lTGVuZ3RoICsg c2hvdWxkQWRkUGF0aFNlcGFyYXRvcikgeworICAgICAgICAgICAgICAgIGlmIChzaG91bGRBZGRQ YXRoU2VwYXJhdG9yKQorICAgICAgICAgICAgICAgICAgICBzdHJuY2F0KGZpbGVuYW1lQnVmZmVy LCAiLyIsIDEpOworICAgICAgICAgICAgICAgIHN0cm5jYXQoZmlsZW5hbWVCdWZmZXIsIG1fZmls ZW5hbWUsIHNpemVvZihmaWxlbmFtZUJ1ZmZlcikgLSBzdHJsZW4oZmlsZW5hbWVCdWZmZXIpIC0g MSk7CisgICAgICAgICAgICAgICAgc3RybmNweShtX2ZpbGVuYW1lLCBmaWxlbmFtZUJ1ZmZlciwg c19tYXhQYXRoTGVuZ3RoKTsKKyAgICAgICAgICAgICAgICBtX2ZpbGVuYW1lW3NfbWF4UGF0aExl bmd0aF0gPSAnXDAnOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorCisgICAgY2hh ciogbGFzdFBhdGhTZXBlcmF0b3IgPSBzdHJyY2hyKG1fZmlsZW5hbWUsICcvJyk7CisKKyAgICBp ZiAobGFzdFBhdGhTZXBlcmF0b3IpIHsKKyAgICAgICAgdW5zaWduZWQgZGlybmFtZUxlbmd0aCA9 IGxhc3RQYXRoU2VwZXJhdG9yIC0gJm1fZmlsZW5hbWVbMF07CisgICAgICAgIHN0cm5jcHkobV9j b25maWdEaXJlY3RvcnksIG1fZmlsZW5hbWUsIGRpcm5hbWVMZW5ndGgpOworICAgICAgICBtX2Nv bmZpZ0RpcmVjdG9yeVtkaXJuYW1lTGVuZ3RoXSA9ICdcMCc7CisgICAgfSBlbHNlIHsKKyAgICAg ICAgbV9jb25maWdEaXJlY3RvcnlbMF0gPSAnLyc7CisgICAgICAgIG1fY29uZmlnRGlyZWN0b3J5 WzFdID0gJ1wwJzsKKyAgICB9CisjZW5kaWYKK30KKwogfSAvLyBuYW1lc3BhY2UgSlNDCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db25maWdGaWxlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29uZmlnRmlsZS5oCShyZXZpc2lvbiAy MTMzOTMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db25maWdGaWxlLmgJKHdv cmtpbmcgY29weSkKQEAgLTI1LDYgKzI1LDggQEAKIAogI3ByYWdtYSBvbmNlCiAKKyNpbmNsdWRl IDxsaW1pdHMuaD4KKwogbmFtZXNwYWNlIEpTQyB7CiAKIGNsYXNzIENvbmZpZ0ZpbGUgewpAQCAt MzYsMTAgKzM4LDE5IEBAIHB1YmxpYzoKICAgICBKU19FWFBPUlRfUFJJVkFURSB2b2lkIHBhcnNl KCk7CiAKIHByaXZhdGU6CisgICAgdm9pZCBjYW5vbmljYWxpemVQYXRocygpOworCisjaWYgUExB VEZPUk0oV0lOKQorICAgIHN0YXRpYyBjb25zdCBzaXplX3Qgc19tYXhQYXRoTGVuZ3RoID0gMjYw OyAvLyBXaW5kb3dzIHZhbHVlIGZvciAiTUFYX1BBVEgiCisjZWxzZQorICAgIHN0YXRpYyBjb25z dCBzaXplX3Qgc19tYXhQYXRoTGVuZ3RoID0gUEFUSF9NQVg7CisjZW5kaWYKKwogICAgIHN0YXRp YyBjaGFyIHNfcHJvY2Vzc05hbWVbXTsKICAgICBzdGF0aWMgY2hhciBzX3BhcmVudFByb2Nlc3NO YW1lW107CiAKLSAgICBjb25zdCBjaGFyKiBtX2ZpbGVuYW1lOworICAgIGNoYXIgbV9maWxlbmFt ZVtzX21heFBhdGhMZW5ndGggKyAxXTsKKyAgICBjaGFyIG1fY29uZmlnRGlyZWN0b3J5W3NfbWF4 UGF0aExlbmd0aCArIDFdOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgSlNDCg==