Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-16 01:38:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

rm: Remove invalid symlinks

Browse source 
Checking with file.exists() was not good for this purpose as
Path::exists() returns false for invalid symlinks.
This commit is contained in:
Shinichiro Hamaji 2017-04-09 01:03:16 +09:00
parent 5f1cb07df8
commit 416c2b7f89
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/rm/rm.rs
View file

@ -128,16 +128,8 @@ fn remove(files: Vec<String>, force: bool, interactive: InteractiveMode, one_fs:
for filename in &files {
let filename = &filename[..];
let file = Path::new(filename);
if file.exists() {
let is_dir = match file.symlink_metadata() {
Ok(metadata) => metadata.is_dir(),
Err(e) => {
had_err = true;
show_error!("could not read metadata of '{}': {}", filename, e);
continue;
}
};
if is_dir {
match file.symlink_metadata() {
Ok(metadata) => if metadata.is_dir() {
if recursive && (filename != "/" || !preserve_root) {
if interactive != InteractiveMode::InteractiveAlways {
if let Err(e) = fs::remove_dir_all(file) {
@ -214,10 +206,16 @@ fn remove(files: Vec<String>, force: bool, interactive: InteractiveMode, one_fs:
}
} else {
had_err = remove_file(&file, interactive, verbose).bitor(had_err);
},
Err(e) => {
// TODO: When the error is not about missing files
// (e.g., permission), even rm -f should fail with
// outputting the error, but there's no easy eay.
if !force {
had_err = true;
show_error!("no such file or directory '{}'", filename);
}
}
} else if !force {
show_error!("no such file or directory '{}'", filename);
had_err = true;
}
}

10
tests/test_rm.rs
View file

@ -148,3 +148,13 @@ fn test_rm_dir_symlink() {
ucmd.arg(link).succeeds();
}
#[test]
fn test_rm_invalid_symlink() {
let (at, mut ucmd) = at_and_ucmd!();
let link = "test_rm_invalid_symlink";
at.symlink(link, link);
ucmd.arg(link).succeeds();
}