<!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>[928] branches/PR-8817822/darwintrace/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="http://trac.macosforge.org/projects/darwinbuild/changeset/928">928</a></dd>
<dt>Author</dt> <dd>wsiegrist@apple.com</dd>
<dt>Date</dt> <dd>2011-02-08 11:58:24 -0800 (Tue, 08 Feb 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Return sooner from redirection is redirect is not set</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesPR8817822darwintracedarwintracec">branches/PR-8817822/darwintrace/darwintrace.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesPR8817822darwintracedarwintracec"></a>
<div class="modfile"><h4>Modified: branches/PR-8817822/darwintrace/darwintrace.c (927 => 928)</h4>
<pre class="diff"><span>
<span class="info">--- branches/PR-8817822/darwintrace/darwintrace.c 2011-02-08 19:38:26 UTC (rev 927)
+++ branches/PR-8817822/darwintrace/darwintrace.c 2011-02-08 19:58:24 UTC (rev 928)
</span><span class="lines">@@ -101,17 +101,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* apply redirection heuristic to path */
</span><del>-static inline char* darwintrace_redirect_path(const char* path) {
</del><ins>+static inline char* darwintrace_redirect_path(const char* path) {
+ if (!darwintrace_redirect) return (char*)path;
+
</ins><span class="cx"> char *redirpath;
</span><span class="cx"> redirpath = (char *)path;
</span><del>- if (darwintrace_redirect
- && path[0] == '/'
</del><ins>+ if (path[0] == '/'
</ins><span class="cx"> && !darwintrace_except(path)
</span><span class="cx"> && strncmp(darwintrace_buildroot, path, strlen(darwintrace_buildroot))!=0
</span><span class="cx"> && strncmp(darwintrace_redirect, path, strlen(darwintrace_redirect))!=0 ) {
</span><span class="cx"> asprintf(&redirpath, "%s%s%s", darwintrace_redirect, (*path == '/' ? "" : "/"), path);
</span><span class="cx"> dprintf("darwintrace: redirect %s -> %s\n", path, redirpath);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return redirpath;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -228,7 +230,7 @@
</span><span class="cx"> mode = va_arg(args, int);
</span><span class="cx"> va_end(args);
</span><span class="cx"> result = open(redirpath, flags, mode);
</span><del>- if (result >= 0 && (flags & (O_CREAT | O_WRONLY /*O_RDWR*/)) == 0 ) {
</del><ins>+ if (result >= 0 && (flags & (O_CREAT | O_WRONLY)) == 0 ) {
</ins><span class="cx"> darwintrace_setup();
</span><span class="cx"> if (darwintrace_fd >= 0) {
</span><span class="cx"> char realpath[MAXPATHLEN];
</span></span></pre>
</div>
</div>
</body>
</html>