<!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>[23340] 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/23340">23340</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-08-16 15:07:50 -0700 (Thu, 16 Aug 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/5415523> Server9A525(Install): Server doesn't bring Server Assistant after installation completed.</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 (23339 => 23340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-08-14 21:14:14 UTC (rev 23339)
+++ trunk/launchd/src/launchd_core_logic.c 2007-08-16 22:07:50 UTC (rev 23340)
</span><span class="lines">@@ -3035,6 +3035,7 @@
</span><span class="cx"> semaphoreitem_watch(job_t j, struct semaphoreitem *si)
</span><span class="cx"> {
</span><span class="cx"> char parentdir_path[PATH_MAX], *which_path = si->what;
</span><ins>+ int saved_errno = 0;
</ins><span class="cx"> int fflags = 0;
</span><span class="cx">
</span><span class="cx"> strlcpy(parentdir_path, dirname(si->what), sizeof(parentdir_path));
</span><span class="lines">@@ -3054,6 +3055,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* See 5321044 for why we do the do-while loop and 5415523 for why ENOENT is checked */
</ins><span class="cx"> do {
</span><span class="cx"> if (si->fd == -1) {
</span><span class="cx"> if ((si->fd = _fd(open(which_path, O_EVTONLY|O_NOCTTY))) == -1) {
</span><span class="lines">@@ -3069,6 +3071,7 @@
</span><span class="cx"> job_log(j, LOG_DEBUG, "Watching Vnode: %d", si->fd);
</span><span class="cx">
</span><span class="cx"> if (kevent_mod(si->fd, EVFILT_VNODE, EV_ADD, fflags, 0, j) == -1) {
</span><ins>+ saved_errno = errno;
</ins><span class="cx"> /*
</span><span class="cx"> * The FD can be revoked between the open() and kevent().
</span><span class="cx"> * This is similar to the inability for kevents to be
</span><span class="lines">@@ -3078,7 +3081,7 @@
</span><span class="cx"> job_assumes(j, runtime_close(si->fd) == 0);
</span><span class="cx"> si->fd = -1;
</span><span class="cx"> }
</span><del>- } while (si->fd == -1);
</del><ins>+ } while ((si->fd == -1) && (saved_errno == ENOENT));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span></span></pre>
</div>
</div>
</body>
</html>