commit 9bb3730

Michael Forney  ·  2018-11-14 08:08:23 +0000 UTC
parent 1fafc78
launch: Don't need to reset signals to default

Signals with handlers will automatically reset to default, and we don't
ignore any signals.
1 files changed,  +1, -8
+1, -8
 1@@ -488,18 +488,11 @@ main(int argc, char *argv[])
 2 	sprintf(buf, "%d", sock[1]);
 3 	setenv(SWC_LAUNCH_SOCKET_ENV, buf, 1);
 4 
 5-	if (posix_spawnattr_setflags(&attr, POSIX_SPAWN_RESETIDS | POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK) != 0)
 6+	if (posix_spawnattr_setflags(&attr, POSIX_SPAWN_RESETIDS|POSIX_SPAWN_SETSIGMASK) != 0)
 7 		die("failed to set spawnattr flags:");
 8 	sigemptyset(&set);
 9 	if (posix_spawnattr_setsigmask(&attr, &set) != 0)
10 		die("failed to set spawnattr sigmask:");
11-	sigaddset(&set, SIGCHLD);
12-	sigaddset(&set, SIGUSR1);
13-	sigaddset(&set, SIGUSR2);
14-	sigaddset(&set, SIGINT);
15-	sigaddset(&set, SIGTERM);
16-	if (posix_spawnattr_setsigdefault(&attr, &set) != 0)
17-		die("failed to set spawnattr sigdefault:");
18 	if (posix_spawnp(&child_pid, argv[optind], NULL, &attr, argv + optind, environ) != 0)
19 		die("failed to spawn server:");
20