[launchd-changes] [22971] trunk/launchd/src/launchd_core_logic.c

[source_changes at macosforge.org]

Revision: 22971
          http://trac.macosforge.org/projects/launchd/changeset/22971
Author:   zarzycki at apple.com
Date:     2006-12-06 11:22:57 -0800 (Wed, 06 Dec 2006)

Log Message:
-----------
<rdar://problem/4559755> switch to posix_spawn()

Modified Paths:
--------------
    trunk/launchd/src/launchd_core_logic.c

Modified: trunk/launchd/src/launchd_core_logic.c
===================================================================
--- trunk/launchd/src/launchd_core_logic.c	2006-12-04 22:59:12 UTC (rev 22970)
+++ trunk/launchd/src/launchd_core_logic.c	2006-12-06 19:22:57 UTC (rev 22971)
@@ -35,7 +35,6 @@
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/event.h>
-#include <sys/ptrace.h>
 #include <sys/stat.h>
 #include <sys/ucred.h>
 #include <sys/fcntl.h>
@@ -70,6 +69,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <glob.h>
+#include <spawn.h>
 
 #include "liblaunch_public.h"
 #include "liblaunch_private.h"
@@ -87,6 +87,8 @@
 #define LAUNCHD_MIN_JOB_RUN_TIME 10
 #define LAUNCHD_ADVISABLE_IDLE_TIMEOUT 30
 
+extern char **environ;
+
 mach_port_t inherited_bootstrap_port;
 
 struct machservice {
@@ -1683,11 +1685,6 @@
 			socketgroup_callback(j, kev);
 			break;
 		}
-		if (j->wait4debugger) {
-			/* Allow somebody else to attach */
-			job_assumes(j, kill(j->p, SIGSTOP) != -1);
-			job_assumes(j, ptrace(PT_DETACH, j->p, NULL, 0) != -1);
-		}
 		if (kev->data > 0) {
 			int e;
 
@@ -1824,10 +1821,15 @@
 {
 	const char *file2exec = "/usr/libexec/launchproxy";
 	const char **argv;
+	posix_spawnattr_t spattr;
 	int gflags = GLOB_NOSORT|GLOB_NOCHECK|GLOB_TILDE|GLOB_DOOFFS;
+	pid_t junk_pid;
 	glob_t g;
+	short spflags = POSIX_SPAWN_SETEXEC;
 	int i;
 
+	posix_spawnattr_init(&spattr);
+
 	job_setup_attributes(j);
 
 	if (j->argv && j->globargv) {
@@ -1860,8 +1862,8 @@
 		argv++;
 	}
 
-	if (j->wait4debugger && ptrace(PT_TRACE_ME, getpid(), NULL, 0) == -1) {
-		job_log_error(j, LOG_ERR, "ptrace(PT_TRACE_ME, ...)");
+	if (j->wait4debugger) {
+		spflags |= POSIX_SPAWN_START_SUSPENDED;
 	}
 
 	if (j->force_ppc) {
@@ -1873,12 +1875,14 @@
 		}
 	}
 
+	posix_spawnattr_setflags(&spattr, spflags);
+
 	if (j->prog) {
-		execv(j->inetcompat ? file2exec : j->prog, (char *const*)argv);
-		job_log_error(j, LOG_ERR, "execv(\"%s\", ...)", j->prog);
+		posix_spawn(&junk_pid, j->inetcompat ? file2exec : j->prog, NULL, &spattr, (char *const*)argv, environ);
+		job_log_error(j, LOG_ERR, "posix_spawn(\"%s\", ...)", j->prog);
 	} else {
-		execvp(j->inetcompat ? file2exec : argv[0], (char *const*)argv);
-		job_log_error(j, LOG_ERR, "execvp(\"%s\", ...)", argv[0]);
+		posix_spawnp(&junk_pid, j->inetcompat ? file2exec : argv[0], NULL, &spattr, (char *const*)argv, environ);
+		job_log_error(j, LOG_ERR, "posix_spawnp(\"%s\", ...)", argv[0]);
 	}
 
 	write(execfd, &errno, sizeof(errno));

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/launchd-changes/attachments/20061206/838a8e61/attachment.html