From 3b09c8f858c3a7ba49f72d528c4899c148cc30c3 Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <ian@iandouglasscott.com>
Date: Sun, 18 Mar 2018 21:52:48 -0700
Subject: [PATCH] kill: support signal number 0
Tests process existence, but does not send a signal. Matches POSIX
behavior.
---
src/syscall/process.rs | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/syscall/process.rs b/src/syscall/process.rs
index 97776bfd..ce0aea21 100644
--- a/src/syscall/process.rs
+++ b/src/syscall/process.rs
@@ -1050,7 +1050,7 @@ pub fn kill(pid: ContextId, sig: usize) -> Result<usize> {
(context.ruid, context.euid, context.pgid)
};
- if sig > 0 && sig < 0x7F {
+ if sig >= 0 && sig < 0x7F {
let mut found = 0;
let mut sent = 0;
@@ -1062,11 +1062,15 @@ pub fn kill(pid: ContextId, sig: usize) -> Result<usize> {
|| euid == context.ruid
|| ruid == context.ruid
{
- context.pending.push_back(sig as u8);
- // Convert stopped processes to blocked if sending SIGCONT
- if sig == SIGCONT {
- if let context::Status::Stopped(_sig) = context.status {
- context.status = context::Status::Blocked;
+ // If sig = 0, test that process exists and can be
+ // signalled, but don't send any signal.
+ if sig != 0 {
+ context.pending.push_back(sig as u8);
+ // Convert stopped processes to blocked if sending SIGCONT
+ if sig == SIGCONT {
+ if let context::Status::Stopped(_sig) = context.status {
+ context.status = context::Status::Blocked;
+ }
}
}
true
--
GitLab