<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[23552] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23552">23552</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2008-03-12 15:13:32 -0700 (Wed, 12 Mar 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/5795967> 64-bit launchd executables</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#trunklaunchdsrcliblaunchc">trunk/launchd/src/liblaunch.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 (23551 => 23552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2008-03-12 17:14:11 UTC (rev 23551)
+++ trunk/launchd/src/launchd_core_logic.c 2008-03-12 22:13:32 UTC (rev 23552)
</span><span class="lines">@@ -1209,6 +1209,7 @@
</span><span class="cx"> job_new(jobmgr_t jm, const char *label, const char *prog, const char *const *argv)
</span><span class="cx"> {
</span><span class="cx"> const char *const *argv_tmp = argv;
</span><ins>+ char tmp_path[PATH_MAX];
</ins><span class="cx"> char auto_label[1000];
</span><span class="cx"> const char *bn = NULL;
</span><span class="cx"> char *co;
</span><span class="lines">@@ -1229,7 +1230,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (unlikely(label == AUTO_PICK_LEGACY_LABEL)) {
</span><del>- bn = prog ? prog : basename((char *)argv[0]); /* prog for auto labels is kp.kp_kproc.p_comm */
</del><ins>+ if (prog) {
+ bn = prog;
+ } else {
+ strlcpy(tmp_path, argv[0], sizeof(tmp_path));
+ bn = basename(tmp_path); /* prog for auto labels is kp.kp_kproc.p_comm */
+ }
</ins><span class="cx"> snprintf(auto_label, sizeof(auto_label), "%s.%s", sizeof(void *) == 8 ? "0xdeadbeeffeedface" : "0xbabecafe", bn);
</span><span class="cx"> label = auto_label;
</span><span class="cx"> /* This is so we can do gross things later. See NOTE_EXEC for anonymous jobs */
</span></span></pre></div>
<a id="trunklaunchdsrcliblaunchc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/liblaunch.c (23551 => 23552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/liblaunch.c 2008-03-12 17:14:11 UTC (rev 23551)
+++ trunk/launchd/src/liblaunch.c 2008-03-12 22:13:32 UTC (rev 23552)
</span><span class="lines">@@ -40,6 +40,22 @@
</span><span class="cx"> #include <pwd.h>
</span><span class="cx"> #include <assert.h>
</span><span class="cx">
</span><ins>+#ifdef __LP64__
+/* workaround: 5723161 */
+#ifndef __DARWIN_ALIGN32
+#define __DARWIN_ALIGN32(x) (((size_t)(x) + 3) & ~3)
+#endif
+#undef CMSG_DATA
+#define CMSG_DATA(cmsg) \
+ ((uint8_t *)(cmsg) + __DARWIN_ALIGN32(sizeof(struct cmsghdr)))
+#undef CMSG_SPACE
+#define CMSG_SPACE(l) \
+ (__DARWIN_ALIGN32(sizeof(struct cmsghdr)) + __DARWIN_ALIGN32(l))
+#undef CMSG_LEN
+#define CMSG_LEN(l) \
+ (__DARWIN_ALIGN32(sizeof(struct cmsghdr)) + (l))
+#endif
+
</ins><span class="cx"> #include "libbootstrap_public.h"
</span><span class="cx"> #include "libvproc_public.h"
</span><span class="cx"> #include "libvproc_private.h"
</span><span class="lines">@@ -119,11 +135,11 @@
</span><span class="cx"> uint64_t opaque_size;
</span><span class="cx"> };
</span><span class="cx"> };
</span><del>- int fd;
- mach_port_t mp;
- int err;
- long long number;
- uint32_t boolean; /* We'd use 'bool' but this struct needs to be used under Rosetta, and sizeof(bool) is different between PowerPC and Intel */
</del><ins>+ int64_t fd;
+ uint64_t mp;
+ uint64_t err;
+ int64_t number;
+ uint64_t boolean; /* We'd use 'bool' but this struct needs to be used under Rosetta, and sizeof(bool) is different between PowerPC and Intel */
</ins><span class="cx"> double float_num;
</span><span class="cx"> };
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>