launchd-258.18.tar.gz

[apple/launchd.git] / launchd / src / launchd_runtime_kill.c

diff --git a/launchd/src/launchd_runtime_kill.c b/launchd/src/launchd_runtime_kill.c
index 383c15059a33df87c2475cde2161de99d6322be3..ebed8f05ada28f14f4b12b9c8c7f7320ff3e6ab6 100644 (file)
--- a/launchd/src/launchd_runtime_kill.c
+++ b/launchd/src/launchd_runtime_kill.c
@@ -18,27 +18,27 @@
  * @APPLE_APACHE_LICENSE_HEADER_END@
  */
 
  * @APPLE_APACHE_LICENSE_HEADER_END@
  */
 

-#define _NONSTD_SOURCE 1
+#include <sys/syscall.h>
+#include <unistd.h>

 #include <signal.h>
 
 #include "launchd_runtime_kill.h"
 
 #include <signal.h>
 
 #include "launchd_runtime_kill.h"
 

-/*
- * POSIX defines consistency over correctness, and consequently kill/killpg now
- * returns EPERM instead of ESRCH.
- *
- * I've filed 5487498 to get a non-portable kill() variant, but for now,
- * defining _NONSTD_SOURCE gets us the old behavior.
- */
-

 int
 runtime_kill(pid_t pid, int sig)
 {
 int
 runtime_kill(pid_t pid, int sig)
 {

-       return kill(pid, sig);
+       /*
+        * POSIX defines consistency over correctness, and consequently
+        * kill/killpg now returns EPERM instead of ESRCH.
+        *
+        * I've filed 5487498 to get a non-portable kill().
+        * We'll regretfully take advantage of implementation details for now.
+        */
+       return syscall(SYS_kill, pid, sig, 0);

 }
 
 int
 runtime_killpg(pid_t pgrp, int sig)
 {
 }
 
 int
 runtime_killpg(pid_t pgrp, int sig)
 {

-       return killpg(pgrp, sig);
+       return runtime_kill(-pgrp, sig);

 }
 }