<!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>[112608] 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/112608">112608</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2013-10-27 17:09:16 -0700 (Sun, 27 Oct 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>darwintrace: avoid unnecessary strcpy(3) in the default cause of __darwintrace_log_op, avoid cleanup on already normalized path</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 (112607 => 112608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/darwintrace.c        2013-10-27 23:58:09 UTC (rev 112607)
+++ trunk/base/src/darwintracelib1.0/darwintrace.c        2013-10-28 00:09:16 UTC (rev 112608)
</span><span class="lines">@@ -117,7 +117,6 @@
</span><span class="cx"> static inline char *__darwintrace_alloc_env(const char *varName, const char *varValue);
</span><span class="cx"> static inline char *const *__darwintrace_restore_env(char *const envp[]);
</span><span class="cx"> static inline void __darwintrace_setup();
</span><del>-static inline void __darwintrace_cleanup_path(char *path);
</del><span class="cx"> static char *__send(const char *buf, uint32_t len, int answer);
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="lines">@@ -625,86 +624,41 @@
</span><span class="cx">  */
</span><span class="cx"> static inline void __darwintrace_log_op(const char *op, const char *path, int fd) {
</span><span class="cx">         uint32_t size;
</span><del>-        char somepath[MAXPATHLEN];
</del><ins>+        char pathbuf[MAXPATHLEN];
</ins><span class="cx">         char logbuffer[BUFFER_SIZE];
</span><ins>+        const char *realpath;
</ins><span class="cx"> 
</span><span class="cx">         do {
</span><span class="cx"> #       ifdef __APPLE__ /* Only Darwin has volfs and F_GETPATH */
</span><span class="cx">                 if ((fd &gt; 0) &amp;&amp; (strncmp(path, &quot;/.vol/&quot;, 6) == 0)) {
</span><del>-                        if (fcntl(fd, F_GETPATH, somepath) != -1) {
</del><ins>+                        if (fcntl(fd, F_GETPATH, pathbuf) != -1) {
+                                realpath = pathbuf;
</ins><span class="cx">                                 break;
</span><span class="cx">                         }
</span><span class="cx">                 }
</span><span class="cx"> #       endif
</span><span class="cx"> 
</span><span class="cx">                 if (*path != '/') {
</span><del>-                        if (!getcwd(somepath, sizeof(somepath))) {
</del><ins>+                        if (!getcwd(pathbuf, sizeof(pathbuf))) {
</ins><span class="cx">                                 perror(&quot;darwintrace: getcwd&quot;);
</span><span class="cx">                                 abort();
</span><span class="cx">                         }
</span><span class="cx"> 
</span><del>-                        strlcat(somepath, &quot;/&quot;, sizeof(somepath));
-                        strlcat(somepath, path, sizeof(somepath));
</del><ins>+                        strlcat(pathbuf, &quot;/&quot;, sizeof(pathbuf));
+                        strlcat(pathbuf, path, sizeof(pathbuf));
+                        realpath = pathbuf;
</ins><span class="cx">                         break;
</span><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 /* otherwise, just copy the original path. */
</span><del>-                strlcpy(somepath, path, sizeof(somepath));
</del><ins>+                realpath = path;
</ins><span class="cx">         } while (0);
</span><span class="cx"> 
</span><del>-        /* clean the path. */
-        __darwintrace_cleanup_path(somepath);
-
-        size = snprintf(logbuffer, sizeof(logbuffer), &quot;%s\t%s&quot;, op, somepath);
</del><ins>+        size = snprintf(logbuffer, sizeof(logbuffer), &quot;%s\t%s&quot;, op, realpath);
</ins><span class="cx">         __send(logbuffer, size, 0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * remap resource fork access to the data fork.
- * do a partial realpath(3) to fix &quot;foo//bar&quot; to &quot;foo/bar&quot;
- */
-static inline void __darwintrace_cleanup_path(char *path) {
-        size_t pathlen;
-#   ifdef __APPLE__
-        size_t rsrclen;
-#   endif
-        char *dst, *src;
-        enum { SAWSLASH, NOTHING } state = NOTHING;
-
-        /* if this is a foo/..namedfork/rsrc, strip it off */
-        pathlen = strlen(path);
-        /* ..namedfork/rsrc is only on OS X */
-#   ifdef __APPLE__
-        rsrclen = strlen(_PATH_RSRCFORKSPEC);
-        if (pathlen &gt; rsrclen &amp;&amp; 0 == strcmp(path + pathlen - rsrclen, _PATH_RSRCFORKSPEC)) {
-                path[pathlen - rsrclen] = '\0';
-                pathlen -= rsrclen;
-        }
-#   endif
-
-        /* for each position in string, check if we're in a run of multiple
-         * slashes, and only emit the first one */
-        for (src = path, dst = path; *src; src++) {
-                if (state == SAWSLASH) {
-                        if (*src == '/') {
-                                /* consume it */
-                                continue;
-                        }
-                        state = NOTHING;
-                } else {
-                        if (*src == '/') {
-                                state = SAWSLASH;
-                        }
-                }
-                if (dst != src) {
-                        // if dst == src, avoid the copy operation
-                        *dst = *src;
-                }
-                dst++;
-        }
-}
-
-/**
</del><span class="cx">  * Check whether the port currently being installed declares a dependency on
</span><span class="cx">  * a given file. Communicates with MacPorts tracelib, which uses the registry
</span><span class="cx">  * database to answer this question. Returns 1, if a dependency was declared,
</span></span></pre>
</div>
</div>

</body>
</html>