Changeset 23452

Timestamp:

11/30/07 13:00:42 (12 months ago)

Author:

zarzycki@…

Message:

Random changes.

Location:

trunk/launchd/src

Files:

• launchctl.c (modified) (1 diff)
• launchd_unix_ipc.c (modified) (1 diff)
• liblaunch_private.h (modified) (2 diffs)

trunk/launchd/src/launchctl.c

@@ -80 +80 @@
 
 
-#define LAUNCH_SECDIR "/tmp/launch-XXXXXX"
+#define LAUNCH_SECDIR _PATH_TMP "launch-XXXXXX"
 
 #define MACHINIT_JOBKEY_ONDEMAND        "OnDemand"

trunk/launchd/src/launchd_unix_ipc.c

@@ -124 +124 @@
                 }
         } else {
-                snprintf(ourdir, sizeof(ourdir), "/tmp/launchd-%u.XXXXXX", getpid());
+                snprintf(ourdir, sizeof(ourdir), _PATH_TMP "launchd-%u.XXXXXX", getpid());
                 if (mkdtemp(ourdir) == NULL) {
                         runtime_syslog(LOG_ERR, "Could not create critical directory \"%s\": %m", ourdir);

trunk/launchd/src/liblaunch_private.h

@@ -25 +25 @@
 #include <launch.h>
 #include <unistd.h>
+#include <paths.h>
 #include <quarantine.h>
 
@@ -41 +42 @@
 
 #define LAUNCHD_SOCKET_ENV              "LAUNCHD_SOCKET"
-#define LAUNCHD_SOCK_PREFIX             "/var/tmp/launchd"
+#define LAUNCHD_SOCK_PREFIX             _PATH_VARTMP "launchd"
 #define LAUNCHD_TRUSTED_FD_ENV          "__LAUNCHD_FD"
 #define LAUNCHD_ASYNC_MSG_KEY           "_AsyncMessage"