<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[23035] trunk/launchd/src/launchd_core_logic.c</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23035">23035</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-02-07 08:34:09 -0800 (Wed, 07 Feb 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/4968241> spurious logging from the libraries used by the various importers</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23034 => 23035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-02-06 22:10:42 UTC (rev 23034)
+++ trunk/launchd/src/launchd_core_logic.c 2007-02-07 16:34:09 UTC (rev 23035)
</span><span class="lines">@@ -1803,7 +1803,7 @@
</span><span class="cx">
</span><span class="cx"> job_assumes(j, socketpair(AF_UNIX, SOCK_STREAM, 0, execspair) != -1);
</span><span class="cx">
</span><del>- if (job_assumes(j, pipe(oepair) != -1)) {
</del><ins>+ if (!j->legacy_mach_job && job_assumes(j, pipe(oepair) != -1)) {
</ins><span class="cx"> j->log_redirect_fd = _fd(oepair[0]);
</span><span class="cx"> job_assumes(j, fcntl(j->log_redirect_fd, F_SETFL, O_NONBLOCK) != -1);
</span><span class="cx"> job_assumes(j, kevent_mod(j->log_redirect_fd, EVFILT_READ, EV_ADD, 0, 0, j) != -1);
</span><span class="lines">@@ -1822,9 +1822,11 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case 0:
</span><del>- job_assumes(j, dup2(oepair[1], STDOUT_FILENO) != -1);
- job_assumes(j, dup2(oepair[1], STDERR_FILENO) != -1);
- job_assumes(j, close(oepair[1]) != -1);
</del><ins>+ if (!j->legacy_mach_job) {
+ job_assumes(j, dup2(oepair[1], STDOUT_FILENO) != -1);
+ job_assumes(j, dup2(oepair[1], STDERR_FILENO) != -1);
+ job_assumes(j, close(oepair[1]) != -1);
+ }
</ins><span class="cx"> job_assumes(j, close(execspair[0]) == 0);
</span><span class="cx"> /* wait for our parent to say they've attached a kevent to us */
</span><span class="cx"> read(_fd(execspair[1]), &c, sizeof(c));
</span><span class="lines">@@ -1845,7 +1847,9 @@
</span><span class="cx"> job_start_child(j);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- job_assumes(j, close(oepair[1]) != -1);
</del><ins>+ if (!j->legacy_mach_job) {
+ job_assumes(j, close(oepair[1]) != -1);
+ }
</ins><span class="cx"> j->p = c;
</span><span class="cx"> j->forkfd = _fd(execspair[0]);
</span><span class="cx"> job_assumes(j, close(execspair[1]) == 0);
</span></span></pre>
</div>
</div>
</body>
</html>