RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 03:27:44 +00:00
Code Issues Activity

kill: list signal 0 with -l and -t

Browse source
This commit is contained in:
Daniel Hofstetter 2025-01-22 08:20:47 +01:00
parent 58e4e4bb70
commit af2a26b57f
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/uu/kill/src/kill.rs
View file

@ -154,12 +154,7 @@ fn handle_obsolete(args: &mut Vec<String>) -> Option<usize> {
} }
fn table() { fn table() {
// GNU kill doesn't list the EXIT signal with --table, so we ignore it, too for (idx, signal) in ALL_SIGNALS.iter().enumerate() {
for (idx, signal) in ALL_SIGNALS
.iter()
.enumerate()
.filter(|(_, s)| **s != "EXIT")
{
println!("{idx: >#2} {signal}"); println!("{idx: >#2} {signal}");
} }
} }
@ -183,8 +178,7 @@ fn print_signal(signal_name_or_value: &str) -> UResult<()> {
} }
fn print_signals() { fn print_signals() {
// GNU kill doesn't list the EXIT signal with --list, so we ignore it, too for signal in ALL_SIGNALS {
for signal in ALL_SIGNALS.iter().filter(|x| **x != "EXIT") {
println!("{signal}"); println!("{signal}");
} }
} }

11
tests/by-util/test_kill.rs
View file

@ -63,7 +63,7 @@ fn test_kill_list_all_signals() {
.stdout_contains("KILL") .stdout_contains("KILL")
.stdout_contains("TERM") .stdout_contains("TERM")
.stdout_contains("HUP") .stdout_contains("HUP")
.stdout_does_not_contain("EXIT"); .stdout_contains("EXIT");
} }
#[test] #[test]
@ -80,15 +80,16 @@ fn test_kill_list_all_signals_as_table() {
.succeeds() .succeeds()
.stdout_contains("KILL") .stdout_contains("KILL")
.stdout_contains("TERM") .stdout_contains("TERM")
.stdout_contains("HUP"); .stdout_contains("HUP")
.stdout_contains("EXIT");
} }
#[test] #[test]
fn test_kill_table_starts_at_1() { fn test_kill_table_starts_at_0() {
new_ucmd!() new_ucmd!()
.arg("-t") .arg("-t")
.succeeds() .succeeds()
.stdout_matches(&Regex::new("^\\s?1\\sHUP").unwrap()); .stdout_matches(&Regex::new("^\\s?0\\sEXIT").unwrap());
} }
#[test] #[test]
@ -104,6 +105,7 @@ fn test_kill_table_lists_all_vertically() {
assert!(signals.contains(&"KILL")); assert!(signals.contains(&"KILL"));
assert!(signals.contains(&"TERM")); assert!(signals.contains(&"TERM"));
assert!(signals.contains(&"HUP")); assert!(signals.contains(&"HUP"));
assert!(signals.contains(&"EXIT"));
} }
#[test] #[test]
@ -143,6 +145,7 @@ fn test_kill_list_all_vertically() {
assert!(signals.contains(&"KILL")); assert!(signals.contains(&"KILL"));
assert!(signals.contains(&"TERM")); assert!(signals.contains(&"TERM"));
assert!(signals.contains(&"HUP")); assert!(signals.contains(&"HUP"));
assert!(signals.contains(&"EXIT"));
} }
#[test] #[test]