<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213399] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213399">213399</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2017-03-03 17:10:55 -0800 (Fri, 03 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for relative pathnames to JSC config files
https://bugs.webkit.org/show_bug.cgi?id=169154
Reviewed by Saam Barati.
If the config file is a relative path, prepend the current working directory.
After canonicalizing the config file path, we extract its directory path and
use that for the directory for a relative log pathname.
* runtime/ConfigFile.cpp:
(JSC::ConfigFile::ConfigFile):
(JSC::ConfigFile::parse):
(JSC::ConfigFile::canonicalizePaths):
* runtime/ConfigFile.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeConfigFilecpp">trunk/Source/JavaScriptCore/runtime/ConfigFile.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeConfigFileh">trunk/Source/JavaScriptCore/runtime/ConfigFile.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (213398 => 213399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-03-04 01:03:49 UTC (rev 213398)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-03-04 01:10:55 UTC (rev 213399)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2017-03-03 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><ins>+ Add support for relative pathnames to JSC config files
+ https://bugs.webkit.org/show_bug.cgi?id=169154
+
+ Reviewed by Saam Barati.
+
+ If the config file is a relative path, prepend the current working directory.
+ After canonicalizing the config file path, we extract its directory path and
+ use that for the directory for a relative log pathname.
+
+ * runtime/ConfigFile.cpp:
+ (JSC::ConfigFile::ConfigFile):
+ (JSC::ConfigFile::parse):
+ (JSC::ConfigFile::canonicalizePaths):
+ * runtime/ConfigFile.h:
+
+2017-03-03 Michael Saboff <msaboff@apple.com>
+
</ins><span class="cx"> Add load / store exclusive instruction group to ARM64 disassembler
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=169152
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeConfigFilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ConfigFile.cpp (213398 => 213399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ConfigFile.cpp 2017-03-04 01:03:49 UTC (rev 213398)
+++ trunk/Source/JavaScriptCore/runtime/ConfigFile.cpp 2017-03-04 01:10:55 UTC (rev 213399)
</span><span class="lines">@@ -38,11 +38,6 @@
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> static const size_t s_processNameMax = 128;
</span><del>-#if PLATFORM(WIN)
-static const size_t s_maxPathLength = 260; // Windows value for "MAX_PATH"
-#else
-static const size_t s_maxPathLength = PATH_MAX;
-#endif
</del><span class="cx"> char ConfigFile::s_processName[s_processNameMax + 1] = { 0 };
</span><span class="cx"> char ConfigFile::s_parentProcessName[s_processNameMax + 1] = { 0 };
</span><span class="cx">
</span><span class="lines">@@ -211,8 +206,15 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ConfigFile::ConfigFile(const char* filename)
</span><del>- : m_filename(filename)
</del><span class="cx"> {
</span><ins>+ if (!filename)
+ m_filename[0] = '\0';
+ else {
+ strncpy(m_filename, filename, s_maxPathLength);
+ m_filename[s_maxPathLength] = '\0';
+ }
+
+ m_configDirectory[0] = '\0';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ConfigFile::setProcessName(const char* processName)
</span><span class="lines">@@ -230,6 +232,8 @@
</span><span class="cx"> enum StatementNesting { TopLevelStatment, NestedStatement, NestedStatementFailedCriteria };
</span><span class="cx"> enum ParseResult { ParseOK, ParseError, NestedStatementDone };
</span><span class="cx">
</span><ins>+ canonicalizePaths();
+
</ins><span class="cx"> ConfigFileScanner scanner(m_filename);
</span><span class="cx">
</span><span class="cx"> if (!scanner.start())
</span><span class="lines">@@ -242,8 +246,12 @@
</span><span class="cx"> auto parseLogFile = [&](StatementNesting statementNesting) {
</span><span class="cx"> char* filename = nullptr;
</span><span class="cx"> if (scanner.tryConsume('=') && (filename = scanner.tryConsumeString())) {
</span><del>- if (statementNesting != NestedStatementFailedCriteria)
- strncpy(logPathname, filename, s_maxPathLength);
</del><ins>+ if (statementNesting != NestedStatementFailedCriteria) {
+ if (filename[0] != '/')
+ snprintf(logPathname, s_maxPathLength + 1, "%s/%s", m_configDirectory, filename);
+ else
+ strncpy(logPathname, filename, s_maxPathLength);
+ }
</ins><span class="cx">
</span><span class="cx"> return ParseOK;
</span><span class="cx"> }
</span><span class="lines">@@ -410,4 +418,40 @@
</span><span class="cx"> WTF::dataLogF("Error in JSC Config file on or near line %u, parsing '%s'\n", scanner.lineNumber(), scanner.currentBuffer());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ConfigFile::canonicalizePaths()
+{
+ if (!m_filename[0])
+ return;
+
+#if OS(UNIX) || OS(DARWIN)
+ if (m_filename[0] != '/') {
+ // Relative path
+ char filenameBuffer[s_maxPathLength + 1];
+
+ if (getcwd(filenameBuffer, sizeof(filenameBuffer))) {
+ size_t pathnameLength = strlen(filenameBuffer);
+ bool shouldAddPathSeparator = filenameBuffer[pathnameLength - 1] != '/';
+ if (sizeof(filenameBuffer) - 1 >= pathnameLength + shouldAddPathSeparator) {
+ if (shouldAddPathSeparator)
+ strncat(filenameBuffer, "/", 1);
+ strncat(filenameBuffer, m_filename, sizeof(filenameBuffer) - strlen(filenameBuffer) - 1);
+ strncpy(m_filename, filenameBuffer, s_maxPathLength);
+ m_filename[s_maxPathLength] = '\0';
+ }
+ }
+ }
+
+ char* lastPathSeperator = strrchr(m_filename, '/');
+
+ if (lastPathSeperator) {
+ unsigned dirnameLength = lastPathSeperator - &m_filename[0];
+ strncpy(m_configDirectory, m_filename, dirnameLength);
+ m_configDirectory[dirnameLength] = '\0';
+ } else {
+ m_configDirectory[0] = '/';
+ m_configDirectory[1] = '\0';
+ }
+#endif
+}
+
</ins><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeConfigFileh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ConfigFile.h (213398 => 213399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ConfigFile.h 2017-03-04 01:03:49 UTC (rev 213398)
+++ trunk/Source/JavaScriptCore/runtime/ConfigFile.h 2017-03-04 01:10:55 UTC (rev 213399)
</span><span class="lines">@@ -25,6 +25,8 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><ins>+#include <limits.h>
+
</ins><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> class ConfigFile {
</span><span class="lines">@@ -36,10 +38,19 @@
</span><span class="cx"> JS_EXPORT_PRIVATE void parse();
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ void canonicalizePaths();
+
+#if PLATFORM(WIN)
+ static const size_t s_maxPathLength = 260; // Windows value for "MAX_PATH"
+#else
+ static const size_t s_maxPathLength = PATH_MAX;
+#endif
+
</ins><span class="cx"> static char s_processName[];
</span><span class="cx"> static char s_parentProcessName[];
</span><span class="cx">
</span><del>- const char* m_filename;
</del><ins>+ char m_filename[s_maxPathLength + 1];
+ char m_configDirectory[s_maxPathLength + 1];
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre>
</div>
</div>
</body>
</html>