Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions src/uu/stat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ uucore = { workspace = true, features = [
"fs",
"fsext",
"time",
"quoting-style",
"i18n-common",
] }
thiserror = { workspace = true }
fluent = { workspace = true }
Expand Down
17 changes: 13 additions & 4 deletions src/uu/stat/src/stat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
// spell-checker:ignore datetime

use uucore::error::{UError, UResult, USimpleError};
use uucore::i18n::UEncoding;
use uucore::quoting_style::{QuotingStyle as UucoreQuotingStyle, escape_name};
use uucore::translate;

use clap::builder::ValueParser;
Expand Down Expand Up @@ -443,10 +445,17 @@ fn quote_file_name(file_name: &str, quoting_style: &QuotingStyle) -> String {
let escaped = file_name.replace('\'', r"\'");
format!("'{escaped}'")
}
QuotingStyle::ShellEscapeAlways => {
let quote = if file_name.contains('\'') { '"' } else { '\'' };
format!("{quote}{file_name}{quote}")
}
QuotingStyle::ShellEscapeAlways => escape_name(
OsStr::new(file_name),
UucoreQuotingStyle::Shell {
escape: true,
always_quote: true,
show_control: true,
},
UEncoding::Utf8,
)
.to_string_lossy()
.to_string(),
QuotingStyle::Quote => file_name.to_string(),
}
}
Expand Down
33 changes: 33 additions & 0 deletions tests/by-util/test_stat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,39 @@ fn test_quoting_style_locale() {
.stdout_only("\'\"\'\n");
}

#[test]
fn test_quoting_newline_in_filename() {
let ts = TestScenario::new(util_name!());
let at = &ts.fixtures;

// example from issue #9925
at.touch("test\nnewline");
ts.ucmd()
.args(&["-c", r#"{"name":"%N"}"#, "test\nnewline"])
.succeeds()
.stdout_only("{\"name\":\"'test'$'\\n''newline'\"}\n");

// with stat, contiguous escape characters are clumped into one escape sequence
at.touch("contiguous\n\nescape_characters");
ts.ucmd()
.args(&["-c", "%N", "contiguous\n\nescape_characters"])
.succeeds()
.stdout_only("'contiguous'$'\\n\\n''escape_characters'\n");

at.touch("multiple\nescape\ncharacters");
ts.ucmd()
.args(&["-c", "%N", "multiple\nescape\ncharacters"])
.succeeds()
.stdout_only("'multiple'$'\\n''escape'$'\\n''characters'\n");

// testing other escape characters
at.touch("\t \n \r \x01");
ts.ucmd()
.args(&["-c", "%N", "\t \n \r \x01"])
.succeeds()
.stdout_only("''$'\\t'' '$'\\n'' '$'\\r'' '$'\\001'\n");
}

#[test]
fn test_quoting_style_invalid_env() {
let ts = TestScenario::new(util_name!());
Expand Down
Loading