Throughout remove all usage of wincap.access_denied_on_delete.
* dir.cc (rmdir): Add existance check to be errno-compatible with Linux. * fhandler_disk_file.cc (fhandler_disk_file::rmdir): Drop test for non-existent dir on 9x share. * syscalls.cc (unlink): Add comment. * wincap.cc: Remove access_denied_on_delete flag throughout. * wincap.h: Ditto.
This commit is contained in:
@@ -1404,16 +1404,6 @@ fhandler_disk_file::rmdir ()
|
||||
}
|
||||
else
|
||||
err = GetLastError ();
|
||||
/* On 9X ERROR_ACCESS_DENIED is returned if you try to remove a
|
||||
non-empty directory. */
|
||||
if (err == ERROR_ACCESS_DENIED
|
||||
&& wincap.access_denied_on_delete ())
|
||||
err = ERROR_DIR_NOT_EMPTY;
|
||||
/* ...and, that's *not* funny, when trying to remove a non-existing
|
||||
directory on a share, which is hosted by a 9x machine, the error
|
||||
code ERROR_INVALID_FUNCTION is returned. */
|
||||
else if (err == ERROR_INVALID_FUNCTION)
|
||||
err = ERROR_FILE_NOT_FOUND;
|
||||
|
||||
__seterrno_from_win_error (err);
|
||||
|
||||
|
Reference in New Issue
Block a user