<!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>[23385] 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/23385">23385</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-09-13 17:45:13 -0700 (Thu, 13 Sep 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>More sanity checks.</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 (23384 => 23385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-09-14 00:33:43 UTC (rev 23384)
+++ trunk/launchd/src/launchd_core_logic.c 2007-09-14 00:45:13 UTC (rev 23385)
</span><span class="lines">@@ -404,7 +404,6 @@
</span><span class="cx"> static job_t job_new(jobmgr_t jm, const char *label, const char *prog, const char *const *argv);
</span><span class="cx"> static job_t job_new_via_mach_init(job_t j, const char *cmd, uid_t uid, bool ond);
</span><span class="cx"> static const char *job_prog(job_t j);
</span><del>-static pid_t job_get_pid(job_t j);
</del><span class="cx"> static jobmgr_t job_get_bs(job_t j);
</span><span class="cx"> static void job_kill(job_t j);
</span><span class="cx"> static void job_uncork_fork(job_t j);
</span><span class="lines">@@ -4475,12 +4474,6 @@
</span><span class="cx"> return j->anonymous;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-pid_t
-job_get_pid(job_t j)
-{
- return j->p;
-}
-
</del><span class="cx"> void
</span><span class="cx"> job_force_sampletool(job_t j)
</span><span class="cx"> {
</span><span class="lines">@@ -6220,7 +6213,7 @@
</span><span class="cx"> return VPROC_ERR_TRY_PER_USER;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (indataCnt == 0) {
</del><ins>+ if (!job_assumes(j, indataCnt != 0)) {
</ins><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6229,12 +6222,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> jr = jobmgr_import2(j->mgr, input_obj);
</span><del>-
- if (jr == NULL) switch (errno) {
- case EEXIST:
- return BOOTSTRAP_NAME_IN_USE;
- default:
- return BOOTSTRAP_NO_MEMORY;
</del><ins>+
+ if (!job_assumes(j, jr != NULL)) {
+ switch (errno) {
+ case EEXIST:
+ return BOOTSTRAP_NAME_IN_USE;
+ default:
+ return BOOTSTRAP_NO_MEMORY;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> job_reparent_hack(jr, NULL);
</span><span class="lines">@@ -6254,6 +6249,8 @@
</span><span class="cx"> return BOOTSTRAP_NO_MEMORY;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ job_assumes(jr, jr->p);
+
</ins><span class="cx"> if (!job_setup_machport(jr)) {
</span><span class="cx"> job_remove(jr);
</span><span class="cx"> return BOOTSTRAP_NO_MEMORY;
</span><span class="lines">@@ -6261,7 +6258,7 @@
</span><span class="cx">
</span><span class="cx"> job_log(j, LOG_INFO, "Spawned");
</span><span class="cx">
</span><del>- *child_pid = job_get_pid(jr);
</del><ins>+ *child_pid = jr->p;
</ins><span class="cx"> *obsvr_port = jr->j_port;
</span><span class="cx">
</span><span class="cx"> mig_deallocate(indata, indataCnt);
</span></span></pre>
</div>
</div>
</body>
</html>