uutils/coreutils
0
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2026-06-10 15:48:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

rm: fix for -rf ./ and variants silently delete current directoryFix/rm fr (#9924)

Browse Source
This commit is contained in:
RustyJack
2026-01-24 19:33:05 +01:00
committed by GitHub
parent a08a79dc90
commit ddd0379523
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/uu/rm/src/rm.rs
+2
View File
@@ -838,7 +838,9 @@ fn path_is_current_or_parent_directory(path: &Path) -> bool {
let dir_separator = MAIN_SEPARATOR as u8;
if let Ok(path_bytes) = path_str {
return path_bytes == ([b'.'])
|| path_bytes == ([b'.', dir_separator])
|| path_bytes == ([b'.', b'.'])
|| path_bytes == ([b'.', b'.', dir_separator])
|| path_bytes.ends_with(&[dir_separator, b'.'])
|| path_bytes.ends_with(&[dir_separator, b'.', b'.'])
|| path_bytes.ends_with(&[dir_separator, b'.', dir_separator])
tests/by-util/test_rm.rs
+37
View File
@@ -767,12 +767,22 @@ fn test_current_or_parent_dir_rm4() {
at.mkdir("d");
let file_1 = "file1";
let file_2 = "d/file2";
at.touch(file_1);
at.touch(file_2);
let answers = [
"rm: refusing to remove '.' or '..' directory: skipping 'd/.'",
"rm: refusing to remove '.' or '..' directory: skipping 'd/./'",
"rm: refusing to remove '.' or '..' directory: skipping 'd/./'",
"rm: refusing to remove '.' or '..' directory: skipping 'd/..'",
"rm: refusing to remove '.' or '..' directory: skipping 'd/../'",
"rm: refusing to remove '.' or '..' directory: skipping '.'",
"rm: refusing to remove '.' or '..' directory: skipping './'",
"rm: refusing to remove '.' or '..' directory: skipping '../'",
"rm: refusing to remove '.' or '..' directory: skipping '..'",
];
let std_err_str = ts
.ucmd()
@@ -782,12 +792,20 @@ fn test_current_or_parent_dir_rm4() {
.arg("d/.////")
.arg("d/..")
.arg("d/../")
.arg(".")
.arg("./")
.arg("../")
.arg("..")
.fails()
.stderr_move_str();
for (idx, line) in std_err_str.lines().enumerate() {
assert_eq!(line, answers[idx]);
}
// checks that no file was silently removed
assert!(at.dir_exists("d"));
assert!(at.file_exists(file_1));
assert!(at.file_exists(file_2));
}
#[test]
@@ -798,12 +816,22 @@ fn test_current_or_parent_dir_rm4_windows() {
at.mkdir("d");
let file_1 = "file1";
let file_2 = "d/file2";
at.touch(file_1);
at.touch(file_2);
let answers = [
"rm: refusing to remove '.' or '..' directory: skipping 'd\\.'",
"rm: refusing to remove '.' or '..' directory: skipping 'd\\.\\'",
"rm: refusing to remove '.' or '..' directory: skipping 'd\\.\\'",
"rm: refusing to remove '.' or '..' directory: skipping 'd\\..'",
"rm: refusing to remove '.' or '..' directory: skipping 'd\\..\\'",
"rm: refusing to remove '.' or '..' directory: skipping '.'",
"rm: refusing to remove '.' or '..' directory: skipping '.\\'",
"rm: refusing to remove '.' or '..' directory: skipping '..'",
"rm: refusing to remove '.' or '..' directory: skipping '..\\'",
];
let std_err_str = ts
.ucmd()
@@ -813,12 +841,21 @@ fn test_current_or_parent_dir_rm4_windows() {
.arg("d\\.\\\\\\\\")
.arg("d\\..")
.arg("d\\..\\")
.arg(".")
.arg(".\\")
.arg("..")
.arg("..\\")
.fails()
.stderr_move_str();
for (idx, line) in std_err_str.lines().enumerate() {
assert_eq!(line, answers[idx]);
}
// checks that no file was silently removed
assert!(at.dir_exists("d"));
assert!(at.file_exists(file_1));
assert!(at.file_exists(file_2));
}
#[test]