From 5ee9c69f59e7bb345e93dec58c37b8feb24d7126 Mon Sep 17 00:00:00 2001
From: Darius Carrier <carrierdarius@gmail.com>
Date: Sat, 27 Apr 2024 08:33:45 -0700
Subject: [PATCH] kill: adding support for handling SIGEXIT (#6269)

kill: convert SIGEXT (0) to None so nix takes correct action
---
 src/uu/kill/src/kill.rs    | 20 +++++++++++++++-----
 tests/by-util/test_kill.rs | 10 ++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/uu/kill/src/kill.rs b/src/uu/kill/src/kill.rs
index 632055b800..5446a7f182 100644
--- a/src/uu/kill/src/kill.rs
+++ b/src/uu/kill/src/kill.rs
@@ -11,7 +11,7 @@ use nix::unistd::Pid;
 use std::io::Error;
 use uucore::display::Quotable;
 use uucore::error::{FromIo, UResult, USimpleError};
-use uucore::signals::{signal_by_name_or_value, ALL_SIGNALS};
+use uucore::signals::{signal_by_name_or_value, signal_name_by_value, ALL_SIGNALS};
 use uucore::{format_usage, help_about, help_usage, show};
 
 static ABOUT: &str = help_about!("kill.md");
@@ -60,9 +60,19 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
             } else {
                 15_usize //SIGTERM
             };
-            let sig: Signal = (sig as i32)
-                .try_into()
-                .map_err(|e| std::io::Error::from_raw_os_error(e as i32))?;
+
+            let sig_name = signal_name_by_value(sig);
+            // Signal does not support converting from EXIT
+            // Instead, nix::signal::kill expects Option::None to properly handle EXIT
+            let sig: Option<Signal> = if sig_name.is_some_and(|name| name == "EXIT") {
+                None
+            } else {
+                let sig = (sig as i32)
+                    .try_into()
+                    .map_err(|e| std::io::Error::from_raw_os_error(e as i32))?;
+                Some(sig)
+            };
+
             let pids = parse_pids(&pids_or_signals)?;
             if pids.is_empty() {
                 Err(USimpleError::new(
@@ -211,7 +221,7 @@ fn parse_pids(pids: &[String]) -> UResult<Vec<i32>> {
         .collect()
 }
 
-fn kill(sig: Signal, pids: &[i32]) {
+fn kill(sig: Option<Signal>, pids: &[i32]) {
     for &pid in pids {
         if let Err(e) = signal::kill(Pid::from_raw(pid), sig) {
             show!(Error::from_raw_os_error(e as i32)
diff --git a/tests/by-util/test_kill.rs b/tests/by-util/test_kill.rs
index a664ff0097..90adf5f299 100644
--- a/tests/by-util/test_kill.rs
+++ b/tests/by-util/test_kill.rs
@@ -288,3 +288,13 @@ fn test_kill_no_pid_provided() {
         .fails()
         .stderr_contains("no process ID specified");
 }
+
+#[test]
+fn test_kill_with_signal_exit_new_form() {
+    let target = Target::new();
+    new_ucmd!()
+        .arg("-s")
+        .arg("EXIT")
+        .arg(format!("{}", target.pid()))
+        .succeeds();
+}