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/shred/locales/en-US.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ shred-invalid-number-of-passes = invalid number of passes: {$passes}
shred-cannot-open-random-source = cannot open random source: {$source}
shred-invalid-file-size = invalid file size: {$size}
shred-no-such-file-or-directory = {$file}: No such file or directory
shred-failed-to-open-for-writing-not-a-directory = {$file}: failed to open for writing: Not a directory
shred-failed-to-open-for-writing-is-a-directory = {$file}: failed to open for writing: Is a directory
shred-not-a-file = {$file}: Not a file

# Option help text
Expand Down
2 changes: 2 additions & 0 deletions src/uu/shred/locales/fr-FR.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ shred-invalid-number-of-passes = nombre de passes invalide : {$passes}
shred-cannot-open-random-source = impossible d'ouvrir la source aléatoire : {$source}
shred-invalid-file-size = taille de fichier invalide : {$size}
shred-no-such-file-or-directory = {$file} : Aucun fichier ou répertoire de ce type
shred-failed-to-open-for-writing-not-a-directory = {$file} : impossible d'ouvrir en écriture : N'est pas un répertoire
shred-failed-to-open-for-writing-is-a-directory = {$file} : impossible d'ouvrir en écriture : Est un répertoire
shred-not-a-file = {$file} : N'est pas un fichier

# Texte d'aide des options
Expand Down
16 changes: 16 additions & 0 deletions src/uu/shred/src/shred.rs
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,22 @@ fn wipe_file(
) -> UResult<()> {
// Get these potential errors out of the way first
let path = Path::new(path_str);

if path_str.as_encoded_bytes().ends_with(b"/") {
if path.is_dir() {
return Err(USimpleError::new(
1,
translate!("shred-failed-to-open-for-writing-is-a-directory", "file" => path.maybe_quote()),
));
}
if fs::metadata(path).is_err_and(|e| e.kind() == io::ErrorKind::NotADirectory) {
return Err(USimpleError::new(
1,
translate!("shred-failed-to-open-for-writing-not-a-directory", "file" => path.maybe_quote()),
));
}
}

if !path.exists() {
return Err(USimpleError::new(
1,
Expand Down
24 changes: 24 additions & 0 deletions tests/by-util/test_shred.rs
Original file line number Diff line number Diff line change
Expand Up @@ -434,3 +434,27 @@ fn test_gnu_shred_passes_different_counts() {
result.stderr_contains("pass 1/19 (random)");
result.stderr_contains("pass 19/19 (random)");
}

#[test]
fn test_shred_trailing_slash_on_file() {
let scene = TestScenario::new(util_name!());
let at = &scene.fixtures;
at.touch("a");
scene
.ucmd()
.arg("a/")
.fails()
.stderr_contains("Not a directory");
}

#[test]
fn test_shred_trailing_slash_on_dir() {
let scene = TestScenario::new(util_name!());
let at = &scene.fixtures;
at.mkdir("d");
scene
.ucmd()
.arg("d/")
.fails()
.stderr_contains("Is a directory");
}
Loading