<!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>[23303] 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/23303">23303</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-07-11 11:10:33 -0700 (Wed, 11 Jul 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Misc fixes.</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 (23302 => 23303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-07-10 21:42:01 UTC (rev 23302)
+++ trunk/launchd/src/launchd_core_logic.c 2007-07-11 18:10:33 UTC (rev 23303)
</span><span class="lines">@@ -167,6 +167,7 @@
</span><span class="cx"> static void socketgroup_ignore(job_t j, struct socketgroup *sg);
</span><span class="cx"> static void socketgroup_callback(job_t j);
</span><span class="cx"> static void socketgroup_setup(launch_data_t obj, const char *key, void *context);
</span><ins>+static void socketgroup_kevent_mod(job_t j, struct socketgroup *sg, bool do_add);
</ins><span class="cx">
</span><span class="cx"> struct calendarinterval {
</span><span class="cx"> LIST_ENTRY(calendarinterval) global_sle;
</span><span class="lines">@@ -180,6 +181,7 @@
</span><span class="cx">
</span><span class="cx"> static bool calendarinterval_new(job_t j, struct tm *w);
</span><span class="cx"> static bool calendarinterval_new_from_obj(job_t j, launch_data_t obj);
</span><ins>+static void calendarinterval_new_from_obj_dict_walk(launch_data_t obj, const char *key, void *context);
</ins><span class="cx"> static void calendarinterval_delete(job_t j, struct calendarinterval *ci);
</span><span class="cx"> static void calendarinterval_setalarm(job_t j, struct calendarinterval *ci);
</span><span class="cx"> static void calendarinterval_callback(void);
</span><span class="lines">@@ -402,6 +404,7 @@
</span><span class="cx"> static void job_logv(job_t j, int pri, int err, const char *msg, va_list ap) __attribute__((format(printf, 4, 0)));
</span><span class="cx"> static void job_log_error(job_t j, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4)));
</span><span class="cx"> static void job_log_bug(job_t j, const char *rcs_rev, const char *path, unsigned int line, const char *test);
</span><ins>+static void job_log_stdouterr2(job_t j, const char *msg, ...);
</ins><span class="cx"> static void job_set_exeception_port(job_t j, mach_port_t port);
</span><span class="cx"> static kern_return_t job_handle_mpm_wait(job_t j, mach_port_t srp, int *waitstatus);
</span><span class="cx">
</span><span class="lines">@@ -429,16 +432,22 @@
</span><span class="cx"> static bool cronemu_hour(struct tm *wtm, int hour, int min);
</span><span class="cx"> static bool cronemu_min(struct tm *wtm, int min);
</span><span class="cx">
</span><del>-static unsigned int total_children;
</del><ins>+/* miscellaneous file local functions */
</ins><span class="cx"> static void ensure_root_bkgd_setup(void);
</span><span class="cx"> static int dir_has_files(job_t j, const char *path);
</span><span class="cx"> static char **mach_cmd2argv(const char *string);
</span><span class="cx"> static size_t our_strhash(const char *s) __attribute__((pure));
</span><ins>+static void extract_rcsid_substr(const char *i, char *o, size_t osz);
+static void do_first_per_user_launchd_hack(void);
+
+/* file local globals */
+static unsigned int total_children;
</ins><span class="cx"> static mach_port_t the_exception_server;
</span><span class="cx"> static bool did_first_per_user_launchd_BootCache_hack;
</span><ins>+static jobmgr_t background_jobmgr;
</ins><span class="cx">
</span><ins>+/* process wide globals */
</ins><span class="cx"> jobmgr_t root_jobmgr;
</span><del>-static jobmgr_t background_jobmgr;
</del><span class="cx">
</span><span class="cx"> void
</span><span class="cx"> job_ignore(job_t j)
</span><span class="lines">@@ -2002,7 +2011,7 @@
</span><span class="cx"> return j;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void
</del><ins>+void
</ins><span class="cx"> job_log_stdouterr2(job_t j, const char *msg, ...)
</span><span class="cx"> {
</span><span class="cx"> struct runtime_syslog_attr attr = { j->label, j->label, j->mgr->name, LOG_NOTICE, getuid(), j->p, j->p };
</span><span class="lines">@@ -2352,7 +2361,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void
</del><ins>+void
</ins><span class="cx"> do_first_per_user_launchd_hack(void)
</span><span class="cx"> {
</span><span class="cx"> char *bcct_tool[] = { "/usr/sbin/BootCacheControl", "tag", NULL };
</span><span class="lines">@@ -2812,7 +2821,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void
</del><ins>+void
</ins><span class="cx"> extract_rcsid_substr(const char *i, char *o, size_t osz)
</span><span class="cx"> {
</span><span class="cx"> char *rcs_rev_tmp = strchr(i, ' ');
</span><span class="lines">@@ -2993,11 +3002,11 @@
</span><span class="cx"> char parentdir_path[PATH_MAX], *which_path = si->what;
</span><span class="cx"> int fflags = 0;
</span><span class="cx">
</span><ins>+ strlcpy(parentdir_path, dirname(si->what), sizeof(parentdir_path));
+
</ins><span class="cx"> switch (si->why) {
</span><span class="cx"> case PATH_EXISTS:
</span><span class="cx"> fflags = NOTE_DELETE|NOTE_RENAME|NOTE_REVOKE|NOTE_EXTEND|NOTE_WRITE;
</span><del>- strlcpy(parentdir_path, dirname(si->what), sizeof(parentdir_path));
- which_path = parentdir_path;
</del><span class="cx"> break;
</span><span class="cx"> case PATH_MISSING:
</span><span class="cx"> fflags = NOTE_DELETE|NOTE_RENAME;
</span><span class="lines">@@ -3011,7 +3020,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (si->fd == -1) {
</span><del>- si->fd = _fd(open(which_path, O_EVTONLY|O_NOCTTY));
</del><ins>+ if ((si->fd = _fd(open(which_path, O_EVTONLY|O_NOCTTY))) == -1) {
+ which_path = parentdir_path;
+ si->fd = _fd(open(which_path, O_EVTONLY|O_NOCTTY));
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (si->fd == -1) {
</span><span class="lines">@@ -3086,7 +3098,7 @@
</span><span class="cx"> job_dispatch(j, false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void
</del><ins>+void
</ins><span class="cx"> calendarinterval_new_from_obj_dict_walk(launch_data_t obj, const char *key, void *context)
</span><span class="cx"> {
</span><span class="cx"> struct tm *tmptm = context;
</span><span class="lines">@@ -3245,7 +3257,7 @@
</span><span class="cx"> free(sg);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void
</del><ins>+void
</ins><span class="cx"> socketgroup_kevent_mod(job_t j, struct socketgroup *sg, bool do_add)
</span><span class="cx"> {
</span><span class="cx"> struct kevent kev[sg->fd_cnt];
</span></span></pre>
</div>
</div>
</body>
</html>