<!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>[23725] branches/PR-6248586</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/launchd/changeset/23725">23725</a></dd>
<dt>Author</dt> <dd>kvv@apple.com</dd>
<dt>Date</dt> <dd>2008-10-16 10:32:18 -0700 (Thu, 16 Oct 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>adapt to moved header files and other build fixes</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesPR6248586launchdsrcIPCc">branches/PR-6248586/launchd/src/IPC.c</a></li>
<li><a href="#branchesPR6248586launchdsrclaunchctlc">branches/PR-6248586/launchd/src/launchctl.c</a></li>
<li><a href="#branchesPR6248586launchdsrclaunchdc">branches/PR-6248586/launchd/src/launchd.c</a></li>
<li><a href="#branchesPR6248586launchdsrclaunchdh">branches/PR-6248586/launchd/src/launchd.h</a></li>
<li><a href="#branchesPR6248586launchdsrclaunchd_core_logicc">branches/PR-6248586/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#branchesPR6248586launchdsrclaunchd_runtimec">branches/PR-6248586/launchd/src/launchd_runtime.c</a></li>
<li><a href="#branchesPR6248586launchdsrclaunchd_unix_ipcc">branches/PR-6248586/launchd/src/launchd_unix_ipc.c</a></li>
<li><a href="#branchesPR6248586launchdsrclaunchd_unix_ipch">branches/PR-6248586/launchd/src/launchd_unix_ipc.h</a></li>
<li><a href="#branchesPR6248586launchdsrcprotocol_job_replydefs">branches/PR-6248586/launchd/src/protocol_job_reply.defs</a></li>
<li><a href="#branchesPR6248586launchdxcodeprojprojectpbxproj">branches/PR-6248586/launchd.xcodeproj/project.pbxproj</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesPR6248586launchdsrcIPCc"></a>
<div class="modfile"><h4>Modified: branches/PR-6248586/launchd/src/IPC.c (23724 => 23725)</h4>
<pre class="diff"><span>
<span class="info">--- branches/PR-6248586/launchd/src/IPC.c        2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd/src/IPC.c        2008-10-16 17:32:18 UTC (rev 23725)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include &lt;CoreFoundation/CoreFoundation.h&gt;
</span><span class="cx"> #include &lt;syslog.h&gt;
</span><span class="cx"> 
</span><del>-#include &quot;libbootstrap_public.h&quot;
</del><ins>+#include &quot;bootstrap.h&quot;
</ins><span class="cx"> 
</span><span class="cx"> #include &quot;IPC.h&quot;
</span><span class="cx"> #include &quot;StartupItems.h&quot;
</span></span></pre></div>
<a id="branchesPR6248586launchdsrclaunchctlc"></a>
<div class="modfile"><h4>Modified: branches/PR-6248586/launchd/src/launchctl.c (23724 => 23725)</h4>
<pre class="diff"><span>
<span class="info">--- branches/PR-6248586/launchd/src/launchctl.c        2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd/src/launchctl.c        2008-10-16 17:32:18 UTC (rev 23725)
</span><span class="lines">@@ -20,12 +20,12 @@
</span><span class="cx"> 
</span><span class="cx"> static const char *const __rcs_file_version__ = &quot;$Revision$&quot;;
</span><span class="cx"> 
</span><del>-#include &quot;liblaunch_public.h&quot;
-#include &quot;liblaunch_private.h&quot;
-#include &quot;libbootstrap_public.h&quot;
-#include &quot;libvproc_public.h&quot;
-#include &quot;libvproc_private.h&quot;
-#include &quot;libvproc_internal.h&quot;
</del><ins>+#include &quot;launch.h&quot;
+#include &quot;launch_priv.h&quot;
+#include &quot;bootstrap.h&quot;
+#include &quot;vproc.h&quot;
+#include &quot;vproc_priv.h&quot;
+#include &quot;vproc_internal.h&quot;
</ins><span class="cx"> 
</span><span class="cx"> #include &lt;CoreFoundation/CoreFoundation.h&gt;
</span><span class="cx"> #include &lt;CoreFoundation/CFPriv.h&gt;
</span></span></pre></div>
<a id="branchesPR6248586launchdsrclaunchdc"></a>
<div class="modfile"><h4>Modified: branches/PR-6248586/launchd/src/launchd.c (23724 => 23725)</h4>
<pre class="diff"><span>
<span class="info">--- branches/PR-6248586/launchd/src/launchd.c        2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd/src/launchd.c        2008-10-16 17:32:18 UTC (rev 23725)
</span><span class="lines">@@ -68,10 +68,10 @@
</span><span class="cx"> #include &lt;spawn.h&gt;
</span><span class="cx"> #include &lt;sched.h&gt;
</span><span class="cx"> 
</span><del>-#include &quot;libbootstrap_public.h&quot;
-#include &quot;libvproc_public.h&quot;
-#include &quot;libvproc_internal.h&quot;
-#include &quot;liblaunch_public.h&quot;
</del><ins>+#include &quot;bootstrap.h&quot;
+#include &quot;vproc.h&quot;
+#include &quot;vproc_internal.h&quot;
+#include &quot;launch.h&quot;
</ins><span class="cx"> 
</span><span class="cx"> #include &quot;launchd_runtime.h&quot;
</span><span class="cx"> #include &quot;launchd_core_logic.h&quot;
</span></span></pre></div>
<a id="branchesPR6248586launchdsrclaunchdh"></a>
<div class="modfile"><h4>Modified: branches/PR-6248586/launchd/src/launchd.h (23724 => 23725)</h4>
<pre class="diff"><span>
<span class="info">--- branches/PR-6248586/launchd/src/launchd.h        2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd/src/launchd.h        2008-10-16 17:32:18 UTC (rev 23725)
</span><span class="lines">@@ -22,8 +22,8 @@
</span><span class="cx"> 
</span><span class="cx"> #include &lt;mach/mach.h&gt;
</span><span class="cx"> #include &lt;mach/port.h&gt;
</span><del>-#include &quot;liblaunch_public.h&quot;
-#include &quot;libbootstrap_public.h&quot;
</del><ins>+#include &quot;launch.h&quot;
+#include &quot;bootstrap.h&quot;
</ins><span class="cx"> #include &quot;launchd_runtime.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #define SHUTDOWN_LOG_DIR &quot;/var/log/shutdown&quot;
</span></span></pre></div>
<a id="branchesPR6248586launchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: branches/PR-6248586/launchd/src/launchd_core_logic.c (23724 => 23725)</h4>
<pre class="diff"><span>
<span class="info">--- branches/PR-6248586/launchd/src/launchd_core_logic.c        2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd/src/launchd_core_logic.c        2008-10-16 17:32:18 UTC (rev 23725)
</span><span class="lines">@@ -2829,6 +2829,9 @@
</span><span class="cx">                 job_log_error(j, LOG_ERR, &quot;posix_spawnp(\&quot;%s\&quot;, ...)&quot;, argv[0]);
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+#if HAVE_SANDBOX
+out_bad:
+#endif
</ins><span class="cx">         _exit(EXIT_FAILURE);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchesPR6248586launchdsrclaunchd_runtimec"></a>
<div class="modfile"><h4>Modified: branches/PR-6248586/launchd/src/launchd_runtime.c (23724 => 23725)</h4>
<pre class="diff"><span>
<span class="info">--- branches/PR-6248586/launchd/src/launchd_runtime.c        2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd/src/launchd_runtime.c        2008-10-16 17:32:18 UTC (rev 23725)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> #include &quot;launch.h&quot;
</span><span class="cx"> #include &quot;launchd.h&quot;
</span><span class="cx"> #include &quot;launchd_core_logic.h&quot;
</span><del>-#include &quot;libvproc_internal.h&quot;
</del><ins>+#include &quot;vproc_internal.h&quot;
</ins><span class="cx"> #include &quot;protocol_job_reply.h&quot;
</span><span class="cx"> 
</span><span class="cx"> static mach_port_t ipc_port_set;
</span></span></pre></div>
<a id="branchesPR6248586launchdsrclaunchd_unix_ipcc"></a>
<div class="modfile"><h4>Modified: branches/PR-6248586/launchd/src/launchd_unix_ipc.c (23724 => 23725)</h4>
<pre class="diff"><span>
<span class="info">--- branches/PR-6248586/launchd/src/launchd_unix_ipc.c        2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd/src/launchd_unix_ipc.c        2008-10-16 17:32:18 UTC (rev 23725)
</span><span class="lines">@@ -47,8 +47,8 @@
</span><span class="cx"> #include &lt;paths.h&gt;
</span><span class="cx"> #include &lt;string.h&gt;
</span><span class="cx"> 
</span><del>-#include &quot;liblaunch_public.h&quot;
-#include &quot;liblaunch_private.h&quot;
</del><ins>+#include &quot;launch.h&quot;
+#include &quot;launch_priv.h&quot;
</ins><span class="cx"> #include &quot;launchd.h&quot;
</span><span class="cx"> #include &quot;launchd_runtime.h&quot;
</span><span class="cx"> #include &quot;launchd_core_logic.h&quot;
</span></span></pre></div>
<a id="branchesPR6248586launchdsrclaunchd_unix_ipch"></a>
<div class="modfile"><h4>Modified: branches/PR-6248586/launchd/src/launchd_unix_ipc.h (23724 => 23725)</h4>
<pre class="diff"><span>
<span class="info">--- branches/PR-6248586/launchd/src/launchd_unix_ipc.h        2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd/src/launchd_unix_ipc.h        2008-10-16 17:32:18 UTC (rev 23725)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;launchd_runtime.h&quot;
</span><span class="cx"> #include &quot;launchd_core_logic.h&quot;
</span><del>-#include &quot;liblaunch_private.h&quot;
</del><ins>+#include &quot;launch_priv.h&quot;
</ins><span class="cx"> 
</span><span class="cx"> struct conncb {
</span><span class="cx">         kq_callback kqconn_callback;
</span></span></pre></div>
<a id="branchesPR6248586launchdsrcprotocol_job_replydefs"></a>
<div class="modfile"><h4>Modified: branches/PR-6248586/launchd/src/protocol_job_reply.defs (23724 => 23725)</h4>
<pre class="diff"><span>
<span class="info">--- branches/PR-6248586/launchd/src/protocol_job_reply.defs        2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd/src/protocol_job_reply.defs        2008-10-16 17:32:18 UTC (rev 23725)
</span><span class="lines">@@ -23,9 +23,9 @@
</span><span class="cx"> #include &lt;mach/std_types.defs&gt;
</span><span class="cx"> #include &lt;mach/mach_types.defs&gt;
</span><span class="cx"> #include &quot;launchd_mig_types.defs&quot;
</span><del>-import &quot;libbootstrap_public.h&quot;;
-import &quot;libvproc_public.h&quot;;
-import &quot;libvproc_internal.h&quot;;
</del><ins>+import &quot;bootstrap.h&quot;;
+import &quot;vproc.h&quot;;
+import &quot;vproc_internal.h&quot;;
</ins><span class="cx"> 
</span><span class="cx"> skip; /* create_server */
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchesPR6248586launchdxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/PR-6248586/launchd.xcodeproj/project.pbxproj (23724 => 23725)</h4>
<pre class="diff"><span>
<span class="info">--- branches/PR-6248586/launchd.xcodeproj/project.pbxproj        2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd.xcodeproj/project.pbxproj        2008-10-16 17:32:18 UTC (rev 23725)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> /* End PBXAggregateTarget section */
</span><span class="cx"> 
</span><span class="cx"> /* Begin PBXBuildFile section */
</span><ins>+                721FBEBC0EA7AE2F0057462B /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 721FBEBB0EA7AE2F0057462B /* Security.framework */; };
</ins><span class="cx">                 FC3627BA0E9343220054F1A3 /* StartupItems.c in Sources */ = {isa = PBXBuildFile; fileRef = FC59A0FD0E8C8ADF00D41150 /* StartupItems.c */; };
</span><span class="cx">                 FC3627BB0E93432A0054F1A3 /* SystemStarter.c in Sources */ = {isa = PBXBuildFile; fileRef = FC59A1000E8C8ADF00D41150 /* SystemStarter.c */; };
</span><span class="cx">                 FC3627D40E93439B0054F1A3 /* StartupItemContext.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = FC59A0FE0E8C8ADF00D41150 /* StartupItemContext.8 */; };
</span><span class="lines">@@ -240,6 +241,7 @@
</span><span class="cx"> 
</span><span class="cx"> /* Begin PBXFileReference section */
</span><span class="cx">                 721FBEA50EA7ABC40057462B /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = launchd/src/config.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><ins>+                721FBEBB0EA7AE2F0057462B /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = &quot;&lt;absolute&gt;&quot;; };
</ins><span class="cx">                 FC3627DF0E9344BF0054F1A3 /* protocol_vproc.defs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.mig; name = protocol_vproc.defs; path = launchd/src/protocol_vproc.defs; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 FC3628070E9345E10054F1A3 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = &quot;&lt;absolute&gt;&quot;; };
</span><span class="cx">                 FC36283E0E93463C0054F1A3 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = &quot;&lt;absolute&gt;&quot;; };
</span><span class="lines">@@ -343,6 +345,7 @@
</span><span class="cx">                         isa = PBXFrameworksBuildPhase;
</span><span class="cx">                         buildActionMask = 2147483647;
</span><span class="cx">                         files = (
</span><ins>+                                721FBEBC0EA7AE2F0057462B /* Security.framework in Frameworks */,
</ins><span class="cx">                         );
</span><span class="cx">                         runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx">                 };
</span><span class="lines">@@ -359,6 +362,7 @@
</span><span class="cx">                 FC36280C0E9345F60054F1A3 /* Frameworks */ = {
</span><span class="cx">                         isa = PBXGroup;
</span><span class="cx">                         children = (
</span><ins>+                                721FBEBB0EA7AE2F0057462B /* Security.framework */,
</ins><span class="cx">                                 FC36292C0E934AA40054F1A3 /* libbsm.dylib */,
</span><span class="cx">                                 FCD713730E95DE49001B0111 /* libedit.dylib */,
</span><span class="cx">                                 FC3628070E9345E10054F1A3 /* CoreFoundation.framework */,
</span><span class="lines">@@ -876,6 +880,7 @@
</span><span class="cx">                         isa = XCBuildConfiguration;
</span><span class="cx">                         buildSettings = {
</span><span class="cx">                                 COPY_PHASE_STRIP = YES;
</span><ins>+                                DEAD_CODE_STRIPPING = YES;
</ins><span class="cx">                                 GCC_MODEL_TUNING = &quot;&quot;;
</span><span class="cx">                                 GCC_SYMBOLS_PRIVATE_EXTERN = YES;
</span><span class="cx">                                 GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
</span><span class="lines">@@ -917,6 +922,7 @@
</span><span class="cx">                                 ARCHS = &quot;$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)&quot;;
</span><span class="cx">                                 ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = &quot;ppc i386&quot;;
</span><span class="cx">                                 COPY_PHASE_STRIP = YES;
</span><ins>+                                DEAD_CODE_STRIPPING = NO;
</ins><span class="cx">                                 DEBUG_INFORMATION_FORMAT = &quot;dwarf-with-dsym&quot;;
</span><span class="cx">                                 GCC_ENABLE_FIX_AND_CONTINUE = NO;
</span><span class="cx">                                 INSTALL_PATH = /sbin;
</span><span class="lines">@@ -997,6 +1003,7 @@
</span><span class="cx">                                 ARCHS = &quot;$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)&quot;;
</span><span class="cx">                                 ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = &quot;ppc i386&quot;;
</span><span class="cx">                                 COPY_PHASE_STRIP = YES;
</span><ins>+                                DEAD_CODE_STRIPPING = NO;
</ins><span class="cx">                                 DEBUG_INFORMATION_FORMAT = &quot;dwarf-with-dsym&quot;;
</span><span class="cx">                                 GCC_ENABLE_FIX_AND_CONTINUE = NO;
</span><span class="cx">                                 INSTALL_PATH = /bin;
</span></span></pre>
</div>
</div>

</body>
</html>