The following commit has been merged in the master branch:
commit d02a285c9a529b474760cf62f492a3cd592bdceb
Author: Erast Benson <[EMAIL PROTECTED]>
Date: Sat Mar 15 17:13:35 2008 +0200
s-s-d: Move 'return' inside preprocessor conditionals
So that it does not just return on non-handled OSes.
diff --git a/ChangeLog b/ChangeLog
index 7581f18..3e181d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-03-15 Erast Benson <[EMAIL PROTECTED]>
+ * utils/start-stop-daemon.c (check): Move 'return' inside preprocessor
+ conditionals, so that it does not just return on non-handled OSes.
+
+2008-03-15 Erast Benson <[EMAIL PROTECTED]>
+
* utils/start-stop-daemon.c: Use __sun instead of __sparc__ to
define OSsunos.
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index c02bd6a..72ad518 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -803,11 +803,12 @@ check(pid_t pid)
{
#if defined(OSLinux) || defined(OShpux)
if (execname && !pid_is_exec(pid, &exec_stat))
+ return;
#elif defined(OSHURD) || defined(OSFreeBSD) || defined(OSNetBSD)
/* Let's try this to see if it works */
if (execname && !pid_is_cmd(pid, execname))
-#endif
return;
+#endif
if (userspec && !pid_is_user(pid, user_id))
return;
if (cmdname && !pid_is_cmd(pid, cmdname))
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
