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

Merge pull request #2662 from Smicry/master

Browse source 
add kill -l final new line #2644
This commit is contained in:
Sylvestre Ledru 2021-09-29 09:58:50 +02:00 • committed by GitHub
commit 01d098993b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -158,18 +158,13 @@ fn print_signal(signal_name_or_value: &str) -> UResult<()> {
} }
fn print_signals() { fn print_signals() {
let mut pos = 0;
for (idx, signal) in ALL_SIGNALS.iter().enumerate() { for (idx, signal) in ALL_SIGNALS.iter().enumerate() {
pos += signal.len(); if idx > 0 {
print!("{}", signal);
if idx > 0 && pos > 73 {
println!();
pos = 0;
} else {
pos += 1;
print!(" "); print!(" ");
} }
print!("{}", signal);
} }
println!();
} }
fn list(arg: Option<String>) -> UResult<()> { fn list(arg: Option<String>) -> UResult<()> {

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

@ -56,6 +56,12 @@ fn test_kill_list_all_signals() {
.stdout_contains("HUP"); .stdout_contains("HUP");
} }
#[test]
fn test_kill_list_final_new_line() {
let re = Regex::new("\\n$").unwrap();
assert!(re.is_match(new_ucmd!().arg("-l").succeeds().stdout_str()));
}
#[test] #[test]
fn test_kill_list_all_signals_as_table() { fn test_kill_list_all_signals_as_table() {
// Check for a few signals. Do not try to be comprehensive. // Check for a few signals. Do not try to be comprehensive.