squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

remove_dir_all_recursive: treat ELOOP the same as ENOTDIR

Browse source
This commit is contained in:
Geoffry Song 2022-04-20 00:46:50 +00:00
parent 8305398d7a
commit cff3f1e8d5
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/std/src/sys/unix/fs.rs
View file

@ -1647,8 +1647,9 @@ mod remove_dir_impl {
fn remove_dir_all_recursive(parent_fd: Option<RawFd>, path: &CStr) -> io::Result<()> { fn remove_dir_all_recursive(parent_fd: Option<RawFd>, path: &CStr) -> io::Result<()> {
// try opening as directory // try opening as directory
let fd = match openat_nofollow_dironly(parent_fd, &path) { let fd = match openat_nofollow_dironly(parent_fd, &path) {
Err(err) if err.raw_os_error() == Some(libc::ENOTDIR) => { Err(err) if matches!(err.raw_os_error(), Some(libc::ENOTDIR | libc::ELOOP)) => {
// not a directory - don't traverse further // not a directory - don't traverse further
// (for symlinks, older Linux kernels may return ELOOP instead of ENOTDIR)
return match parent_fd { return match parent_fd {
// unlink... // unlink...
Some(parent_fd) => { Some(parent_fd) => {