Skip to content

ls: fix QUOTING_STYLE=invalid ls 2>/dev/full SIGABRT #13209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oech3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ls: fix QUOTING_STYLE=invalid ls 2>/dev/full SIGABRT #13209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/uu/ls/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use std::{
borrow::Cow,
ffi::{OsStr, OsString},
io::{IsTerminal, stdout},
io::{self, IsTerminal, Write as _, stdout},
num::IntErrorKind,
};

Expand Down Expand Up @@ -574,12 +574,14 @@
} else {
// If set, the QUOTING_STYLE environment variable specifies a default style.
if let Ok(style) = std::env::var("QUOTING_STYLE") {
match match_quoting_style_name(style.as_str(), show_control) {
Some(pair) => return pair,
None => eprintln!(
if let Some(pair) = match_quoting_style_name(style.as_str(), show_control) {
return pair;
} else {

Check failure on line 579 in src/uu/ls/src/config.rs

View workflow job for this annotation

GitHub Actions / Style and Lint (ubuntu-24.04, unix) 

ERROR: `cargo clippy`: redundant else block (file:'src/uu/ls/src/config.rs', line:579)

Check failure on line 579 in src/uu/ls/src/config.rs

View workflow job for this annotation

GitHub Actions / Style and Lint (unix) 

ERROR: `cargo clippy`: redundant else block (file:'src/uu/ls/src/config.rs', line:579)
let _ = writeln!(
io::stderr(),
"{}",
translate!("ls-invalid-quoting-style", "program" => std::env::args().next().unwrap_or_else(|| "ls".to_string()), "style" => style.clone())
),
);
}
}

Expand Down
Loading