diff options
author | Jeremy Huddleston <jeremyhu@apple.com> | 2012-04-18 09:20:37 -0700 |
---|---|---|
committer | Jeremy Huddleston <jeremyhu@apple.com> | 2012-04-18 09:32:31 -0700 |
commit | 2d9bdc819adbe45ec3ffdc72429fd92b7f613601 (patch) | |
tree | f063770c1b806fb8a61b0e87f7d8c89cf58e04d6 /launchd/user_startx | |
parent | 49cfa8b7253096d24b2ef6a8d0ba32c4bae9ac23 (diff) |
launchd: Don't provide the LaunchAgent on Tiger
Tiger's launchd doesn't support all the features we need from it.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'launchd/user_startx')
-rw-r--r-- | launchd/user_startx/launchd_startx.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/launchd/user_startx/launchd_startx.c b/launchd/user_startx/launchd_startx.c index f83cd61..67419a4 100644 --- a/launchd/user_startx/launchd_startx.c +++ b/launchd/user_startx/launchd_startx.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 Apple Inc. +/* Copyright (c) 2011-2012 Apple Inc. * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation files @@ -37,15 +37,7 @@ #include <sys/wait.h> #include <string.h> #include <stdlib.h> - -/* Using MIN_REQUIRED instead of MAX_ALLOWED logic due to posix_spawn not - * being marked with availability macros until 10.7 - */ -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 #include <spawn.h> -#else -#include <errno.h> -#endif #include "console_redirect.h" @@ -64,20 +56,7 @@ int main(int argc, char **argv, char **envp) { xi_asl_capture_fd(aslc, NULL, ASL_LEVEL_INFO, STDOUT_FILENO); xi_asl_capture_fd(aslc, NULL, ASL_LEVEL_NOTICE, STDERR_FILENO); -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 assert(posix_spawnp(&child, argv[1], NULL, NULL, &argv[1], envp) == 0); -#else - switch(child = fork()) { - case -1: - perror("fork"); - return errno; - case 0: - return execvp(argv[1], &argv[1]); - default: - break; - } -#endif - wait4(child, &pstat, 0, (struct rusage *)0); return pstat; |