diff options
Diffstat (limited to 'winsup/cygwin/dir.cc')
| -rw-r--r-- | winsup/cygwin/dir.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc index 96ab1f282..a044f53f9 100644 --- a/winsup/cygwin/dir.cc +++ b/winsup/cygwin/dir.cc @@ -327,12 +327,17 @@ rmdir (const char *dir) SetFileAttributes (real_dir, (DWORD) real_dir & ~FILE_ATTRIBUTE_READONLY); - if (RemoveDirectory (real_dir)) + int rc = RemoveDirectory (real_dir); + DWORD att = GetFileAttributes (real_dir); + + /* Sometimes smb indicates failure when it really succeeds, so check for + this case specifically. */ + if (rc || att == INVALID_FILE_ATTRIBUTES) { /* RemoveDirectory on a samba drive doesn't return an error if the directory can't be removed because it's not empty. Checking for existence afterwards keeps us informed about success. */ - if (GetFileAttributes (real_dir) != INVALID_FILE_ATTRIBUTES) + if (att != INVALID_FILE_ATTRIBUTES) set_errno (ENOTEMPTY); else res = 0; |