<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23615] branches/SULeopard/launchd/src/launchd_runtime_kill.c</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23615">23615</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2008-05-02 15:53:47 -0700 (Fri, 02 May 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/5906374> launchd calls __kill() on arm</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesSULeopardlaunchdsrclaunchd_runtime_killc">branches/SULeopard/launchd/src/launchd_runtime_kill.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesSULeopardlaunchdsrclaunchd_runtime_killc"></a>
<div class="modfile"><h4>Modified: branches/SULeopard/launchd/src/launchd_runtime_kill.c (23614 => 23615)</h4>
<pre class="diff"><span>
<span class="info">--- branches/SULeopard/launchd/src/launchd_runtime_kill.c 2008-04-30 21:32:53 UTC (rev 23614)
+++ branches/SULeopard/launchd/src/launchd_runtime_kill.c 2008-05-02 22:53:47 UTC (rev 23615)
</span><span class="lines">@@ -18,36 +18,27 @@
</span><span class="cx"> * @APPLE_APACHE_LICENSE_HEADER_END@
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#if !defined(__LP64__) && !defined(__arm__)
-#define _NONSTD_SOURCE 1
-#define old_kill(x, y) kill(x, y)
-#define old_killpg(x, y) killpg(x, y)
-#else
-/* ??? No blessed way to get the old behavior */
-extern int __kill(int, int, int);
-#define old_kill(x, y) __kill(x, y, 0)
-#define old_killpg(x, y) __kill(-(x), y, 0)
-#endif
</del><ins>+#include <sys/syscall.h>
+#include <unistd.h>
</ins><span class="cx"> #include <signal.h>
</span><span class="cx">
</span><span class="cx"> #include "launchd_runtime_kill.h"
</span><span class="cx">
</span><del>-/*
- * 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.
- */
-
</del><span class="cx"> int
</span><span class="cx"> runtime_kill(pid_t pid, int sig)
</span><span class="cx"> {
</span><del>- return old_kill(pid, sig);
</del><ins>+ /*
+ * 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);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int
</span><span class="cx"> runtime_killpg(pid_t pgrp, int sig)
</span><span class="cx"> {
</span><del>- return old_killpg(pgrp, sig);
</del><ins>+ return runtime_kill(-pgrp, sig);
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>