Changeset 23552

Timestamp:

03/12/08 15:13:32 (9 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5795967> 64-bit launchd executables

Location:

trunk/launchd/src

Files:

• launchd_core_logic.c (modified) (2 diffs)
• liblaunch.c (modified) (2 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -1210 +1210 @@
 {
         const char *const *argv_tmp = argv;
+        char tmp_path[PATH_MAX];
         char auto_label[1000];
         const char *bn = NULL;
@@ -1230 +1231 @@
 
         if (unlikely(label == AUTO_PICK_LEGACY_LABEL)) {
-                bn = prog ? prog : basename((char *)argv[0]); /* prog for auto labels is kp.kp_kproc.p_comm */
+                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 */
+                }
                 snprintf(auto_label, sizeof(auto_label), "%s.%s", sizeof(void *) == 8 ? "0xdeadbeeffeedface" : "0xbabecafe", bn);
                 label = auto_label;

trunk/launchd/src/liblaunch.c

@@ -40 +40 @@
 #include <pwd.h>
 #include <assert.h>
+
+#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
 
 #include "libbootstrap_public.h"
@@ -120 +136 @@
                         };
                 };
-                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 */
+                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 */
                 double float_num;
         };