<!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>[127033] trunk/base/src/darwintracelib1.0/darwintrace.c</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="https://trac.macports.org/changeset/127033">127033</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-10-19 12:07:42 -0700 (Sun, 19 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>trace mode: deal with volfs paths correctly, remove unnecessary normalization code at a place that can only be reached with normalized paths</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcdarwintracelib10darwintracec">trunk/base/src/darwintracelib1.0/darwintrace.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcdarwintracelib10darwintracec"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/darwintrace.c (127032 => 127033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/darwintrace.c 2014-10-19 18:40:20 UTC (rev 127032)
+++ trunk/base/src/darwintracelib1.0/darwintrace.c 2014-10-19 19:07:42 UTC (rev 127033)
</span><span class="lines">@@ -419,55 +419,9 @@
</span><span class="cx"> */
</span><span class="cx"> static inline void __darwintrace_log_op(const char *op, const char *path) {
</span><span class="cx"> uint32_t size;
</span><del>- char pathbuf[MAXPATHLEN];
</del><span class="cx"> char logbuffer[BUFFER_SIZE];
</span><del>- const char *realpath;
</del><span class="cx">
</span><del>- do {
-#if defined(__APPLE__) && defined(ATTR_CMN_FULLPATH) && 0
- if (false && strncmp(path, "/.vol/", 6) == 0) {
- // path in VOLFS, try to get inode -> name lookup from
- // getattrlist(2).
- struct attrlist attrlist;
- attrlist.bitmapcount = ATTR_BIT_MAP_COUNT;
- attrlist.reserved = 0;
- attrlist.commonattr = ATTR_CMN_FULLPATH;
- attrlist.volattr = 0;
- attrlist.dirattr = 0;
- attrlist.fileattr = 0;
- attrlist.forkattr = 0;
-
- char attrbuf[sizeof(uint32_t) + sizeof(attrreference_t) + (PATH_MAX)];
- /* attrlength attrref_t for the name UTF-8 name up to PATH_MAX chars */
- if (-1 == (getattrlist(path, &attrlist, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW))) {
- perror("darwintrace: getattrlist");
- // ignore and just print the /.vol/ path
- } else {
- attrreference_t *nameAttrRef = (attrreference_t *) (attrbuf + sizeof(uint32_t));
- strlcpy(pathbuf, ((char *) nameAttrRef) + nameAttrRef->attr_dataoffset, sizeof(pathbuf));
- realpath = pathbuf;
- break;
- }
- }
-#endif
-
- if (*path != '/') {
- if (!getcwd(pathbuf, sizeof(pathbuf))) {
- perror("darwintrace: getcwd");
- abort();
- }
-
- strlcat(pathbuf, "/", sizeof(pathbuf));
- strlcat(pathbuf, path, sizeof(pathbuf));
- realpath = pathbuf;
- break;
- }
-
- /* otherwise, just copy the original path. */
- realpath = path;
- } while (0);
-
- size = snprintf(logbuffer, sizeof(logbuffer), "%s\t%s", op, realpath);
</del><ins>+ size = snprintf(logbuffer, sizeof(logbuffer), "%s\t%s", op, path);
</ins><span class="cx"> __send(logbuffer, size, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -814,6 +768,58 @@
</span><span class="cx"> token += idx + 1;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# ifdef ATTR_CMN_FULLPATH
+ if (numComponents >= 3 && strncmp(".vol", pathComponents[0].start, pathComponents[0].len) == 0) {
+ // path in VOLFS, try to get inode -> name lookup from getattrlist(2).
+
+ // Add the slashes and the terminating \0
+ for (size_t i = 0; i < numComponents; ++i) {
+ if (i == numComponents - 1) {
+ pathComponents[i].start[pathComponents[i].len] = '\0';
+ } else {
+ pathComponents[i].start[pathComponents[i].len] = '/';
+ }
+ }
+
+ struct attrlist attrlist;
+ attrlist.bitmapcount = ATTR_BIT_MAP_COUNT;
+ attrlist.reserved = 0;
+ attrlist.commonattr = ATTR_CMN_FULLPATH;
+ attrlist.volattr = 0;
+ attrlist.dirattr = 0;
+ attrlist.fileattr = 0;
+ attrlist.forkattr = 0;
+
+ char attrbuf[sizeof(uint32_t) + sizeof(attrreference_t) + (PATH_MAX + 1)];
+ /* attrlength attrref_t for the name UTF-8 name up to PATH_MAX chars */
+
+ if (-1 == (getattrlist(normPath, &attrlist, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW))) {
+ perror("darwintrace: getattrlist");
+ // ignore and just return the /.vol/ path
+ } else {
+ attrreference_t *nameAttrRef = (attrreference_t *) (attrbuf + sizeof(uint32_t));
+ strlcpy(normPath, ((char *) nameAttrRef) + nameAttrRef->attr_dataoffset, sizeof(normPath));
+
+ numComponents = 0;
+ char *writableToken = normPath + 1;
+ while ((idx = strcspn(writableToken, "/")) > 0) {
+ // found a token, tokenize and store it
+ pathComponents[numComponents].start = writableToken;
+ pathComponents[numComponents].len = idx;
+ numComponents++;
+
+ bool final = writableToken[idx] == '\0';
+ writableToken[idx] = '\0';
+ if (final) {
+ break;
+ }
+ // advance token
+ writableToken += idx + 1;
+ }
+ }
+ }
+# endif
+
</ins><span class="cx"> bool pathIsSymlink;
</span><span class="cx"> size_t loopCount = 0;
</span><span class="cx"> do {
</span></span></pre>
</div>
</div>
</body>
</html>