<!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>[117751] trunk/base/src</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/117751">117751</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-03-10 14:55:33 -0700 (Mon, 10 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>darwintrace: use modern interposing, avoid DYLD_FORCE_FLAT_NAMESPACE that's no longer necessary with interposing, #29228, patch by gauravb7090</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcdarwintracelib10accessc">trunk/base/src/darwintracelib1.0/access.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10closec">trunk/base/src/darwintracelib1.0/close.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10darwintraceh">trunk/base/src/darwintracelib1.0/darwintrace.h</a></li>
<li><a href="#trunkbasesrcdarwintracelib10dup2c">trunk/base/src/darwintracelib1.0/dup2.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10mkdirc">trunk/base/src/darwintracelib1.0/mkdir.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10openc">trunk/base/src/darwintracelib1.0/open.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10procc">trunk/base/src/darwintracelib1.0/proc.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10readdirc">trunk/base/src/darwintracelib1.0/readdir.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10readlinkc">trunk/base/src/darwintracelib1.0/readlink.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10renamec">trunk/base/src/darwintracelib1.0/rename.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10rmdirc">trunk/base/src/darwintracelib1.0/rmdir.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10statc">trunk/base/src/darwintracelib1.0/stat.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10unlinkc">trunk/base/src/darwintracelib1.0/unlink.c</a></li>
<li><a href="#trunkbasesrcport10porttracetcl">trunk/base/src/port1.0/porttrace.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcdarwintracelib10accessc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/access.c (117750 => 117751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/access.c 2014-03-10 21:28:23 UTC (rev 117750)
+++ trunk/base/src/darwintracelib1.0/access.c 2014-03-10 21:55:33 UTC (rev 117751)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> #include <sys/syscall.h>
</span><span class="cx"> #include <unistd.h>
</span><span class="cx">
</span><del>-int access(const char *path, int amode) {
</del><ins>+int _dt_access(const char *path, int amode) {
</ins><span class="cx"> #define access(x, y) syscall(SYS_access, (x), (y))
</span><span class="cx"> __darwintrace_setup();
</span><span class="cx">
</span><span class="lines">@@ -59,3 +59,5 @@
</span><span class="cx"> return result;
</span><span class="cx"> #undef access
</span><span class="cx"> }
</span><ins>+
+DARWINTRACE_INTERPOSE(_dt_access, access);
</ins></span></pre></div>
<a id="trunkbasesrcdarwintracelib10closec"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/close.c (117750 => 117751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/close.c 2014-03-10 21:28:23 UTC (rev 117750)
+++ trunk/base/src/darwintracelib1.0/close.c 2014-03-10 21:55:33 UTC (rev 117751)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> * need to. This possibility is the \c __darwintrace_close_sock variable, which
</span><span class="cx"> * will be set to the FD to be closed when closing should be allowed.
</span><span class="cx"> */
</span><del>-int close(int fd) {
</del><ins>+int _dt_close(int fd) {
</ins><span class="cx"> #define close(x) syscall(SYS_close, (x))
</span><span class="cx"> __darwintrace_setup();
</span><span class="cx">
</span><span class="lines">@@ -66,3 +66,5 @@
</span><span class="cx"> return close(fd);
</span><span class="cx"> #undef close
</span><span class="cx"> }
</span><ins>+
+DARWINTRACE_INTERPOSE(_dt_close, close);
</ins></span></pre></div>
<a id="trunkbasesrcdarwintracelib10darwintraceh"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/darwintrace.h (117750 => 117751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/darwintrace.h 2014-03-10 21:28:23 UTC (rev 117750)
+++ trunk/base/src/darwintracelib1.0/darwintrace.h 2014-03-10 21:55:33 UTC (rev 117751)
</span><span class="lines">@@ -44,6 +44,22 @@
</span><span class="cx"> #include <stdio.h>
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * DARWINTRACE_INTERPOSE: provides a way to override standard library functions
+ * with your own implementations.
+ */
+#ifndef DARWINTRACE_INTERPOSE
+#define DARWINTRACE_INTERPOSE(_replacement, _replacee) \
+__attribute__((used)) static struct { \
+ const void *replacement; \
+ const void *replacee; \
+} _interpose_##_replacee \
+__attribute__((section ("__DATA,__interpose"))) = { \
+ (const void *) (unsigned long) &_replacement, \
+ (const void *) (unsigned long) &_replacee \
+}
+#endif
+
+/**
</ins><span class="cx"> * DARWINTRACE_DEBUG: verbose output of operations to debug darwintrace
</span><span class="cx"> */
</span><span class="cx"> #ifndef DARWINTRACE_DEBUG
</span></span></pre></div>
<a id="trunkbasesrcdarwintracelib10dup2c"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/dup2.c (117750 => 117751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/dup2.c 2014-03-10 21:28:23 UTC (rev 117750)
+++ trunk/base/src/darwintracelib1.0/dup2.c 2014-03-10 21:55:33 UTC (rev 117751)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> * attempts to overwrite it using \c dup(2). Shells tend to do that a lot when
</span><span class="cx"> * FDs are numbered in ascending order.
</span><span class="cx"> */
</span><del>-int dup2(int filedes, int filedes2) {
</del><ins>+int _dt_dup2(int filedes, int filedes2) {
</ins><span class="cx"> #define dup2(x, y) syscall(SYS_dup2, (x), (y))
</span><span class="cx"> __darwintrace_setup();
</span><span class="cx">
</span><span class="lines">@@ -75,3 +75,5 @@
</span><span class="cx"> return dup2(filedes, filedes2);
</span><span class="cx"> #undef dup2
</span><span class="cx"> }
</span><ins>+
+DARWINTRACE_INTERPOSE(_dt_dup2, dup2);
</ins></span></pre></div>
<a id="trunkbasesrcdarwintracelib10mkdirc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/mkdir.c (117750 => 117751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/mkdir.c 2014-03-10 21:28:23 UTC (rev 117750)
+++ trunk/base/src/darwintracelib1.0/mkdir.c 2014-03-10 21:55:33 UTC (rev 117751)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> * the sandbox. Will silently do nothing and return success for directories
</span><span class="cx"> * outside the sandbox that already exist.
</span><span class="cx"> */
</span><del>-int mkdir(const char *path, mode_t mode) {
</del><ins>+int _dt_mkdir(const char *path, mode_t mode) {
</ins><span class="cx"> #define mkdir(x,y) syscall(SYS_mkdir, (x), (y))
</span><span class="cx"> #define lstat(x,y) syscall(LSTATSYSNUM, (x), (y))
</span><span class="cx"> __darwintrace_setup();
</span><span class="lines">@@ -78,3 +78,5 @@
</span><span class="cx"> #undef lstat
</span><span class="cx"> #undef mkdir
</span><span class="cx"> }
</span><ins>+
+DARWINTRACE_INTERPOSE(_dt_mkdir, mkdir);
</ins></span></pre></div>
<a id="trunkbasesrcdarwintracelib10openc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/open.c (117750 => 117751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/open.c 2014-03-10 21:28:23 UTC (rev 117750)
+++ trunk/base/src/darwintracelib1.0/open.c 2014-03-10 21:55:33 UTC (rev 117751)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> * Indicates the file does not exist on sandbox violation, or permission denied
</span><span class="cx"> * when attempting to create a file, i.e., when \c O_CREAT is set.
</span><span class="cx"> */
</span><del>-int open(const char *path, int flags, ...) {
</del><ins>+int _dt_open(const char *path, int flags, ...) {
</ins><span class="cx"> #define open(x,y,z) syscall(SYS_open, (x), (y), (z))
</span><span class="cx"> __darwintrace_setup();
</span><span class="cx"> int result = 0;
</span><span class="lines">@@ -70,3 +70,5 @@
</span><span class="cx"> return result;
</span><span class="cx"> #undef open
</span><span class="cx"> }
</span><ins>+
+DARWINTRACE_INTERPOSE(_dt_open, open);
</ins></span></pre></div>
<a id="trunkbasesrcdarwintracelib10procc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/proc.c (117750 => 117751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/proc.c 2014-03-10 21:28:23 UTC (rev 117750)
+++ trunk/base/src/darwintracelib1.0/proc.c 2014-03-10 21:55:33 UTC (rev 117751)
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> * exist, if it's outside the sandbox. Also checks for potential interpreters
</span><span class="cx"> * using \c check_interpreter.
</span><span class="cx"> */
</span><del>-int execve(const char *path, char *const argv[], char *const envp[]) {
</del><ins>+int _dt_execve(const char *path, char *const argv[], char *const envp[]) {
</ins><span class="cx"> #define execve(x,y,z) syscall(SYS_execve, (x), (y), (z))
</span><span class="cx"> __darwintrace_setup();
</span><span class="cx">
</span><span class="lines">@@ -289,6 +289,8 @@
</span><span class="cx"> #undef execve
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+DARWINTRACE_INTERPOSE(_dt_execve, execve);
+
</ins><span class="cx"> #if defined(HAVE_SPAWN_H) && defined(HAVE_POSIX_SPAWN)
</span><span class="cx"> // Let's save some typing work...
</span><span class="cx"> typedef int (*posix_spawn_t)(
</span><span class="lines">@@ -303,11 +305,10 @@
</span><span class="cx"> * exist, if it's outside the sandbox. Also checks for potential interpreters
</span><span class="cx"> * using \c check_interpreter.
</span><span class="cx"> */
</span><del>-int posix_spawn(pid_t *restrict pid, const char *restrict path, const posix_spawn_file_actions_t *file_actions,
</del><ins>+int _dt_posix_spawn(pid_t *restrict pid, const char *restrict path, const posix_spawn_file_actions_t *file_actions,
</ins><span class="cx"> const posix_spawnattr_t *restrict attrp, char *const argv[restrict], char *const envp[restrict]) {
</span><span class="cx"> __darwintrace_setup();
</span><span class="cx">
</span><del>- static posix_spawn_t prev_posix_spawn = NULL;
</del><span class="cx"> int result = 0;
</span><span class="cx">
</span><span class="cx"> if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_ALLOWDIR | DT_FOLLOWSYMS)) {
</span><span class="lines">@@ -339,13 +340,9 @@
</span><span class="cx"> * We cannot override posix_spawn and call __posix_spawn from it
</span><span class="cx"> * either, because that will fail with an invalid argument. Thus,
</span><span class="cx"> * we need to call the original posix_spawn from here. */
</span><del>- // retrieve the original posix_spawn function
- if (prev_posix_spawn == NULL) {
- prev_posix_spawn = (posix_spawn_t) dlsym(RTLD_NEXT, "posix_spawn");
- }
</del><span class="cx"> // call the original posix_spawn function, but restore environment
</span><span class="cx"> char **newenv = restore_env(envp);
</span><del>- result = prev_posix_spawn(pid, path, file_actions, attrp, argv, newenv);
</del><ins>+ result = posix_spawn(pid, path, file_actions, attrp, argv, newenv);
</ins><span class="cx"> free(newenv);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -354,4 +351,6 @@
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><ins>+
+DARWINTRACE_INTERPOSE(_dt_posix_spawn, posix_spawn);
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkbasesrcdarwintracelib10readdirc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/readdir.c (117750 => 117751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/readdir.c 2014-03-10 21:28:23 UTC (rev 117750)
+++ trunk/base/src/darwintracelib1.0/readdir.c 2014-03-10 21:55:33 UTC (rev 117751)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> char d_name[__DARWIN_MAXPATHLEN]; /* entry name (up to MAXPATHLEN bytes) */
</span><span class="cx"> };
</span><span class="cx">
</span><del>-size_t __getdirentries64(int fd, void *buf, size_t bufsize, __darwin_off_t *basep) {
</del><ins>+size_t _dt_getdirentries64(int fd, void *buf, size_t bufsize, __darwin_off_t *basep) {
</ins><span class="cx"> #define __getdirentries64(w,x,y,z) syscall(SYS_getdirentries64, (w), (x), (y), (z))
</span><span class="cx"> __darwintrace_setup();
</span><span class="cx">
</span><span class="lines">@@ -105,6 +105,10 @@
</span><span class="cx"> #undef __getdirentries64
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// __getdirentries64(2) is private API. There's no header for it.
+size_t __getdirentries64(int fd, void *buf, size_t bufsize, __darwin_off_t *basep);
+DARWINTRACE_INTERPOSE(_dt_getdirentries64, __getdirentries64);
+
</ins><span class="cx"> #endif /* defined(__DARWIN_64_BIT_INO_T) */
</span><span class="cx">
</span><span class="cx"> #pragma pack(4)
</span><span class="lines">@@ -117,7 +121,7 @@
</span><span class="cx"> };
</span><span class="cx"> #pragma pack()
</span><span class="cx">
</span><del>-int getdirentries(int fd, char *buf, int nbytes, long *basep) {
</del><ins>+int _dt_getdirentries(int fd, char *buf, int nbytes, long *basep) {
</ins><span class="cx"> #define getdirentries(w,x,y,z) syscall(SYS_getdirentries, (w), (x), (y), (z))
</span><span class="cx"> __darwintrace_setup();
</span><span class="cx">
</span><span class="lines">@@ -154,3 +158,6 @@
</span><span class="cx"> return sz;
</span><span class="cx"> #undef getdirentries
</span><span class="cx"> }
</span><ins>+
+int getdirentries(int fd, char *buf, int nbytes, long *basep);
+DARWINTRACE_INTERPOSE(_dt_getdirentries, getdirentries);
</ins></span></pre></div>
<a id="trunkbasesrcdarwintracelib10readlinkc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/readlink.c (117750 => 117751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/readlink.c 2014-03-10 21:28:23 UTC (rev 117750)
+++ trunk/base/src/darwintracelib1.0/readlink.c 2014-03-10 21:55:33 UTC (rev 117751)
</span><span class="lines">@@ -46,9 +46,9 @@
</span><span class="cx"> * Deny \c readlink(2) if the file is not within the sandbox bounds.
</span><span class="cx"> */
</span><span class="cx"> #ifdef READLINK_IS_NOT_P1003_1A
</span><del>-int readlink(const char *path, char *buf, int bufsiz) {
</del><ins>+int _dt_readlink(const char *path, char *buf, int bufsiz) {
</ins><span class="cx"> #else
</span><del>-ssize_t readlink(const char *path, char *buf, size_t bufsiz) {
</del><ins>+ssize_t _dt_readlink(const char *path, char *buf, size_t bufsiz) {
</ins><span class="cx"> #endif
</span><span class="cx"> #define readlink(x,y,z) syscall(SYS_readlink, (x), (y), (z))
</span><span class="cx"> __darwintrace_setup();
</span><span class="lines">@@ -69,3 +69,5 @@
</span><span class="cx"> return result;
</span><span class="cx"> #undef readlink
</span><span class="cx"> }
</span><ins>+
+DARWINTRACE_INTERPOSE(_dt_readlink, readlink);
</ins></span></pre></div>
<a id="trunkbasesrcdarwintracelib10renamec"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/rename.c (117750 => 117751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/rename.c 2014-03-10 21:28:23 UTC (rev 117750)
+++ trunk/base/src/darwintracelib1.0/rename.c 2014-03-10 21:55:33 UTC (rev 117751)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> * Wrapper around \c rename(2) to prevent moving a file outside, or out of the
</span><span class="cx"> * sandbox.
</span><span class="cx"> */
</span><del>-int rename(const char *from, const char *to) {
</del><ins>+int _dt_rename(const char *from, const char *to) {
</ins><span class="cx"> #define rename(x,y) syscall(SYS_rename, (x), (y))
</span><span class="cx"> __darwintrace_setup();
</span><span class="cx">
</span><span class="lines">@@ -67,3 +67,5 @@
</span><span class="cx"> return result;
</span><span class="cx"> #undef rename
</span><span class="cx"> }
</span><ins>+
+DARWINTRACE_INTERPOSE(_dt_rename, rename);
</ins></span></pre></div>
<a id="trunkbasesrcdarwintracelib10rmdirc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/rmdir.c (117750 => 117751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/rmdir.c 2014-03-10 21:28:23 UTC (rev 117750)
+++ trunk/base/src/darwintracelib1.0/rmdir.c 2014-03-10 21:55:33 UTC (rev 117751)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> * Wrapper around \c rmdir(2) to deny deleting directories outside of the
</span><span class="cx"> * sandbox.
</span><span class="cx"> */
</span><del>-int rmdir(const char *path) {
</del><ins>+int _dt_rmdir(const char *path) {
</ins><span class="cx"> #define rmdir(x) syscall(SYS_rmdir, (x))
</span><span class="cx"> __darwintrace_setup();
</span><span class="cx">
</span><span class="lines">@@ -64,3 +64,5 @@
</span><span class="cx"> return result;
</span><span class="cx"> #undef rmdir
</span><span class="cx"> }
</span><ins>+
+DARWINTRACE_INTERPOSE(_dt_rmdir, rmdir);
</ins></span></pre></div>
<a id="trunkbasesrcdarwintracelib10statc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/stat.c (117750 => 117751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/stat.c 2014-03-10 21:28:23 UTC (rev 117750)
+++ trunk/base/src/darwintracelib1.0/stat.c 2014-03-10 21:55:33 UTC (rev 117751)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> * Wrapper around \c stat(2) to hide information about files outside the
</span><span class="cx"> * sandbox.
</span><span class="cx"> */
</span><del>-int stat(const char *path, void *sb) {
</del><ins>+int _dt_stat(const char *path, void *sb) {
</ins><span class="cx"> #define stat(path, sb) syscall(SYS_stat, path, sb)
</span><span class="cx"> __darwintrace_setup();
</span><span class="cx">
</span><span class="lines">@@ -66,9 +66,14 @@
</span><span class="cx"> #undef stat
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// We don't include sys/stat.h because it would rewrite all stat function
+// calls, but we need the declaration of stat here.
+int stat(const char *path, void *sb);
+DARWINTRACE_INTERPOSE(_dt_stat, stat);
+
</ins><span class="cx"> // Don't provide stat64 on systems that have no stat64 syscall
</span><span class="cx"> #ifdef SYS_stat64
</span><del>-int stat64(const char *path, void *sb) {
</del><ins>+int _dt_stat64(const char *path, void *sb) {
</ins><span class="cx"> #define stat64(path, sb) syscall(SYS_stat64, path, sb)
</span><span class="cx"> __darwintrace_setup();
</span><span class="cx">
</span><span class="lines">@@ -86,13 +91,15 @@
</span><span class="cx"> return result;
</span><span class="cx"> #undef stat64
</span><span class="cx"> }
</span><ins>+int stat64(const char *path, void *sb);
+DARWINTRACE_INTERPOSE(_dt_stat64, stat64);
</ins><span class="cx">
</span><del>-int stat$INODE64(const char *path, void *sb) {
- return stat64(path, sb);
-}
</del><ins>+int stat$INODE64(const char *path, void *sb);
+DARWINTRACE_INTERPOSE(_dt_stat64, stat$INODE64);
+
</ins><span class="cx"> #endif /* defined(SYS_stat64) */
</span><span class="cx">
</span><del>-int lstat(const char *path, void *sb) {
</del><ins>+int _dt_lstat(const char *path, void *sb) {
</ins><span class="cx"> #define lstat(path, sb) syscall(SYS_lstat, path, sb)
</span><span class="cx"> __darwintrace_setup();
</span><span class="cx">
</span><span class="lines">@@ -112,9 +119,12 @@
</span><span class="cx"> #undef lstat
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+int lstat(const char *path, void *sb);
+DARWINTRACE_INTERPOSE(_dt_lstat, lstat);
+
</ins><span class="cx"> // Don't provide lstat64 on systems that have no lstat64 syscall
</span><span class="cx"> #ifdef SYS_lstat64
</span><del>-int lstat64(const char *path, void *sb) {
</del><ins>+int _dt_lstat64(const char *path, void *sb) {
</ins><span class="cx"> #define lstat64(path, sb) syscall(SYS_lstat64, path, sb)
</span><span class="cx"> __darwintrace_setup();
</span><span class="cx">
</span><span class="lines">@@ -134,7 +144,10 @@
</span><span class="cx"> #undef lstat64
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int lstat$INODE64(const char *path, void *sb) {
- return lstat64(path, sb);
-}
</del><ins>+int lstat64(const char *path, void *sb);
+DARWINTRACE_INTERPOSE(_dt_lstat64, lstat64);
+
+int lstat$INODE64(const char *path, void *sb);
+DARWINTRACE_INTERPOSE(_dt_lstat64, lstat$INODE64);
+
</ins><span class="cx"> #endif /* defined(SYS_lstat64) */
</span></span></pre></div>
<a id="trunkbasesrcdarwintracelib10unlinkc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/unlink.c (117750 => 117751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/unlink.c 2014-03-10 21:28:23 UTC (rev 117750)
+++ trunk/base/src/darwintracelib1.0/unlink.c 2014-03-10 21:55:33 UTC (rev 117751)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> * Wrapper around \c unlink(2) that will deny attempts to delete files outside
</span><span class="cx"> * of the sandbox and simulate non-existence of the file instead.
</span><span class="cx"> */
</span><del>-int unlink(const char *path) {
</del><ins>+int _dt_unlink(const char *path) {
</ins><span class="cx"> #define unlink(x) syscall(SYS_unlink, (x))
</span><span class="cx"> __darwintrace_setup();
</span><span class="cx">
</span><span class="lines">@@ -64,3 +64,5 @@
</span><span class="cx"> return result;
</span><span class="cx"> #undef unlink
</span><span class="cx"> }
</span><ins>+
+DARWINTRACE_INTERPOSE(_dt_unlink, unlink);
</ins></span></pre></div>
<a id="trunkbasesrcport10porttracetcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/porttrace.tcl (117750 => 117751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/porttrace.tcl 2014-03-10 21:28:23 UTC (rev 117750)
+++ trunk/base/src/port1.0/porttrace.tcl 2014-03-10 21:55:33 UTC (rev 117751)
</span><span class="lines">@@ -66,7 +66,6 @@
</span><span class="cx"> } else {
</span><span class="cx"> set env(DYLD_INSERT_LIBRARIES) ${tracelib_path}
</span><span class="cx"> }
</span><del>- set env(DYLD_FORCE_FLAT_NAMESPACE) 1
</del><span class="cx"> set env(DARWINTRACE_LOG) "$trace_fifo"
</span><span class="cx"> # The sandbox is limited to:
</span><span class="cx"> # workpath
</span><span class="lines">@@ -170,7 +169,7 @@
</span><span class="cx"> global os.platform
</span><span class="cx"> if {${os.platform} == "darwin"} {
</span><span class="cx"> global env trace_fifo macosx_version
</span><del>- foreach var {DYLD_INSERT_LIBRARIES DYLD_FORCE_FLAT_NAMESPACE DARWINTRACE_LOG DARWINTRACE_SANDBOX_BOUNDS} {
</del><ins>+ foreach var {DYLD_INSERT_LIBRARIES DARWINTRACE_LOG} {
</ins><span class="cx"> array unset env $var
</span><span class="cx"> if {$macosx_version eq "10.5"} {
</span><span class="cx"> unsetenv $var
</span></span></pre>
</div>
</div>
</body>
</html>