rm: do not complain about d/f conflicts during deletion

diff --git a/dir.c b/dir.c
index 57394e452eb0de117b27f64804e529b617a6c7e0..f9e7355c694a0bb248695f7aa7c79f42fd6fa62d 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -1603,7 +1603,7 @@ int remove_path(const char *name)
 {
        char *slash;
 
-       if (unlink(name) && errno != ENOENT)
+       if (unlink(name) && errno != ENOENT && errno != ENOTDIR)
                return -1;
 
        slash = strrchr(name, '/');