Revision: 23452 http://trac.macosforge.org/projects/launchd/changeset/23452 Author: zarzycki@apple.com Date: 2007-11-30 13:00:42 -0800 (Fri, 30 Nov 2007) Log Message: ----------- Random changes. Modified Paths: -------------- trunk/launchd/src/launchctl.c trunk/launchd/src/launchd_unix_ipc.c trunk/launchd/src/liblaunch_private.h Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-11-30 20:47:06 UTC (rev 23451) +++ trunk/launchd/src/launchctl.c 2007-11-30 21:00:42 UTC (rev 23452) @@ -79,7 +79,7 @@ extern char **environ; -#define LAUNCH_SECDIR "/tmp/launch-XXXXXX" +#define LAUNCH_SECDIR _PATH_TMP "launch-XXXXXX" #define MACHINIT_JOBKEY_ONDEMAND "OnDemand" #define MACHINIT_JOBKEY_SERVICENAME "ServiceName" Modified: trunk/launchd/src/launchd_unix_ipc.c =================================================================== --- trunk/launchd/src/launchd_unix_ipc.c 2007-11-30 20:47:06 UTC (rev 23451) +++ trunk/launchd/src/launchd_unix_ipc.c 2007-11-30 21:00:42 UTC (rev 23452) @@ -123,7 +123,7 @@ } } } 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); goto out_bad; Modified: trunk/launchd/src/liblaunch_private.h =================================================================== --- trunk/launchd/src/liblaunch_private.h 2007-11-30 20:47:06 UTC (rev 23451) +++ trunk/launchd/src/liblaunch_private.h 2007-11-30 21:00:42 UTC (rev 23452) @@ -24,6 +24,7 @@ #include <sys/types.h> #include <launch.h> #include <unistd.h> +#include <paths.h> #include <quarantine.h> #pragma GCC visibility push(default) @@ -40,7 +41,7 @@ #define LAUNCH_KEY_GETRUSAGECHILDREN "GetResourceUsageChildren" #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" #define LAUNCH_KEY_BATCHCONTROL "BatchControl"