<!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>[23308] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23308">23308</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-07-12 13:43:08 -0700 (Thu, 12 Jul 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/5326137> launchd dynamic enable/disable of services based on machine</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchctlc">trunk/launchd/src/launchctl.c</a></li>
<li><a href="#trunklaunchdsrcliblaunch_publich">trunk/launchd/src/liblaunch_public.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchctlc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchctl.c (23307 => 23308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchctl.c 2007-07-12 20:05:47 UTC (rev 23307)
+++ trunk/launchd/src/launchctl.c 2007-07-12 20:43:08 UTC (rev 23308)
</span><span class="lines">@@ -20,6 +20,13 @@
</span><span class="cx">
</span><span class="cx"> static const char *const __rcs_file_version__ = "$Revision$";
</span><span class="cx">
</span><ins>+#include "liblaunch_public.h"
+#include "liblaunch_private.h"
+#include "libbootstrap_public.h"
+#include "libvproc_public.h"
+#include "libvproc_private.h"
+#include "libvproc_internal.h"
+
</ins><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><span class="cx"> #include <CoreFoundation/CFPriv.h>
</span><span class="cx"> #include <Security/Security.h>
</span><span class="lines">@@ -65,12 +72,6 @@
</span><span class="cx"> #include <sysexits.h>
</span><span class="cx"> #include <util.h>
</span><span class="cx">
</span><del>-#include "libbootstrap_public.h"
-#include "libvproc_public.h"
-#include "libvproc_private.h"
-#include "libvproc_internal.h"
-#include "liblaunch_public.h"
-#include "liblaunch_private.h"
</del><span class="cx">
</span><span class="cx"> #define LAUNCH_SECDIR "/tmp/launch-XXXXXX"
</span><span class="cx">
</span><span class="lines">@@ -143,6 +144,7 @@
</span><span class="cx"> static void do_single_user_mode(bool);
</span><span class="cx"> static bool do_single_user_mode2(void);
</span><span class="cx"> static void read_launchd_conf(void);
</span><ins>+static bool job_disabled_logic(launch_data_t obj);
</ins><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="cx"> BOOTCACHE_START = 1,
</span><span class="lines">@@ -612,7 +614,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((tmpd = launch_data_dict_lookup(thejob, LAUNCH_JOBKEY_DISABLED))) {
</span><del>- job_disabled = launch_data_get_bool(tmpd);
</del><ins>+ job_disabled = job_disabled_logic(tmpd);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (lus->forceload) {
</span><span class="lines">@@ -641,7 +643,62 @@
</span><span class="cx"> launch_data_free(thejob);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool
+sysctl_hw_streq(int mib_slot, const char *str)
+{
+ char buf[1000];
+ size_t bufsz = sizeof(buf);
+ int mib[] = { CTL_HW, mib_slot };
+
+ if (sysctl(mib, 2, buf, &bufsz, NULL, 0) != -1) {
+ if (strcmp(buf, str) == 0) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+static void
+job_disabled_dict_logic(launch_data_t obj, const char *key, void *context)
+{
+ bool *r = context;
+
+ if (launch_data_get_type(obj) != LAUNCH_DATA_STRING) {
+ return;
+ }
+
+ if (strcasecmp(key, LAUNCH_JOBKEY_DISABLED_MACHINETYPE) == 0) {
+ if (sysctl_hw_streq(HW_MACHINE, launch_data_get_string(obj))) {
+ *r = true;
+ }
+ } else if (strcasecmp(key, LAUNCH_JOBKEY_DISABLED_MODELNAME) == 0) {
+ if (sysctl_hw_streq(HW_MODEL, launch_data_get_string(obj))) {
+ *r = true;
+ }
+ }
+}
+
</ins><span class="cx"> bool
</span><ins>+job_disabled_logic(launch_data_t obj)
+{
+ bool r = false;
+
+ switch (launch_data_get_type(obj)) {
+ case LAUNCH_DATA_DICTIONARY:
+ launch_data_dict_iterate(obj, job_disabled_dict_logic, &r);
+ break;
+ case LAUNCH_DATA_BOOL:
+ r = launch_data_get_bool(obj);
+ break;
+ default:
+ break;
+ }
+
+ return r;
+}
+
+bool
</ins><span class="cx"> path_goodness_check(const char *path, bool forceload)
</span><span class="cx"> {
</span><span class="cx"> struct stat sb;
</span></span></pre></div>
<a id="trunklaunchdsrcliblaunch_publich"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/liblaunch_public.h (23307 => 23308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/liblaunch_public.h 2007-07-12 20:05:47 UTC (rev 23307)
+++ trunk/launchd/src/liblaunch_public.h 2007-07-12 20:43:08 UTC (rev 23308)
</span><span class="lines">@@ -126,6 +126,9 @@
</span><span class="cx"> #define LAUNCH_JOBKEY_RESOURCELIMIT_RSS "ResidentSetSize"
</span><span class="cx"> #define LAUNCH_JOBKEY_RESOURCELIMIT_STACK "Stack"
</span><span class="cx">
</span><ins>+#define LAUNCH_JOBKEY_DISABLED_MACHINETYPE "MachineType"
+#define LAUNCH_JOBKEY_DISABLED_MODELNAME "ModelName"
+
</ins><span class="cx"> #define LAUNCH_JOBSOCKETKEY_TYPE "SockType"
</span><span class="cx"> #define LAUNCH_JOBSOCKETKEY_PASSIVE "SockPassive"
</span><span class="cx"> #define LAUNCH_JOBSOCKETKEY_BONJOUR "Bonjour"
</span></span></pre>
</div>
</div>
</body>
</html>