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

ls: always quote backslash in shell style

Browse source
This commit is contained in:
Terts Diepraam 2021-04-21 12:45:21 +02:00
parent fd54614130
commit f34c992932
2 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/uu/ls/src/quoting_style.rs
View file

@ -1,6 +1,6 @@
use std::char::from_digit; use std::char::from_digit;
const SPECIAL_SHELL_CHARS: &str = "~`#$&*()|[]{};'\"<>?! "; const SPECIAL_SHELL_CHARS: &str = "~`#$&*()|[]{};\\'\"<>?! ";
pub(super) enum QuotingStyle { pub(super) enum QuotingStyle {
Shell { Shell {

75
tests/by-util/test_ls.rs
View file

@ -1118,12 +1118,13 @@ fn test_ls_quoting_style() {
at.touch("one two"); at.touch("one two");
at.touch("one"); at.touch("one");
at.touch("one\\two");
// It seems that windows doesn't allow \n in filenames. // It seems that windows doesn't allow \n in filenames.
// And it also doesn't like \, of course.
#[cfg(unix)] #[cfg(unix)]
{ {
at.touch("one\ntwo"); at.touch("one\ntwo");
at.touch("one\\two");
// Default is shell-escape // Default is shell-escape
scene scene
.ucmd() .ucmd()
@ -1185,6 +1186,42 @@ fn test_ls_quoting_style() {
.succeeds() .succeeds()
.stdout_only(format!("{}\n", correct)); .stdout_only(format!("{}\n", correct));
} }
for (arg, correct) in &[
("--quoting-style=literal", "one\\two"),
("-N", "one\\two"),
("--quoting-style=c", "\"one\\\\two\""),
("-Q", "\"one\\\\two\""),
("--quote-name", "\"one\\\\two\""),
("--quoting-style=escape", "one\\\\two"),
("-b", "one\\\\two"),
("--quoting-style=shell-escape", "'one\\two'"),
("--quoting-style=shell-escape-always", "'one\\two'"),
("--quoting-style=shell", "'one\\two'"),
("--quoting-style=shell-always", "'one\\two'"),
] {
scene
.ucmd()
.arg(arg)
.arg("one\\two")
.succeeds()
.stdout_only(format!("{}\n", correct));
}
// Tests for a character that forces quotation in shell-style escaping
// after a character in a dollar expression
at.touch("one\n&two");
for (arg, correct) in &[
("--quoting-style=shell-escape", "'one'$'\\n''&two'"),
("--quoting-style=shell-escape-always", "'one'$'\\n''&two'"),
] {
scene
.ucmd()
.arg(arg)
.arg("one\n&two")
.succeeds()
.stdout_only(format!("{}\n", correct));
}
} }
scene scene
@ -1238,42 +1275,6 @@ fn test_ls_quoting_style() {
.succeeds() .succeeds()
.stdout_only(format!("{}\n", correct)); .stdout_only(format!("{}\n", correct));
} }
for (arg, correct) in &[
("--quoting-style=literal", "one\\two"),
("-N", "one\\two"),
("--quoting-style=c", "\"one\\\\two\""),
("-Q", "\"one\\\\two\""),
("--quote-name", "\"one\\\\two\""),
("--quoting-style=escape", "one\\\\two"),
("-b", "one\\\\two"),
("--quoting-style=shell-escape", "one\\two"),
("--quoting-style=shell-escape-always", "'one\\two'"),
("--quoting-style=shell", "one\\two"),
("--quoting-style=shell-always", "'one\\two'"),
] {
scene
.ucmd()
.arg(arg)
.arg("one\\two")
.succeeds()
.stdout_only(format!("{}\n", correct));
}
// Tests for a character that forces quotation in shell-style escaping
// after a character in a dollar expression
at.touch("one\n&two");
for (arg, correct) in &[
("--quoting-style=shell-escape", "'one'$'\\n''&two'"),
("--quoting-style=shell-escape-always", "'one'$'\\n''&two'"),
] {
scene
.ucmd()
.arg(arg)
.arg("one\n&two")
.succeeds()
.stdout_only(format!("{}\n", correct));
}
} }
#[test] #[test]