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

Add more '/' checks to rm

Browse source
This commit is contained in:
Arcterus 2013-12-17 22:17:05 -08:00
parent d08d8c8029
commit 2021a55775
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rm/rm.rs
View file

@ -116,7 +116,7 @@ fn remove_files(files: &[~str], force: bool, interactive: InteractiveMode, one_f
}).inside(|| { }).inside(|| {
fs::rmdir(&file); fs::rmdir(&file);
}); });
} else if dir { } else if dir && (*filename != ~"/" || !preserve_root) {
io_error::cond.trap(|_| { io_error::cond.trap(|_| {
writeln!(&mut stderr() as &mut Writer, writeln!(&mut stderr() as &mut Writer,
"Could not remove directory '{}'", *filename); "Could not remove directory '{}'", *filename);
@ -124,9 +124,15 @@ fn remove_files(files: &[~str], force: bool, interactive: InteractiveMode, one_f
fs::rmdir(&file); fs::rmdir(&file);
}); });
} else { } else {
writeln!(&mut stderr() as &mut Writer, if recursive {
"Could not remove directory '{}' (did you mean to pass '-r'?)", writeln!(&mut stderr() as &mut Writer,
*filename); "Could not remove directory '{}'",
*filename);
} else {
writeln!(&mut stderr() as &mut Writer,
"Could not remove directory '{}' (did you mean to pass '-r'?)",
*filename);
}
} }
} else { } else {
io_error::cond.trap(|_| { io_error::cond.trap(|_| {