+Thu May 25 13:29:23 2000 Christopher Faylor <cgf@cygnus.com>
+
+ * dir.cc (rmdir): Use file attributes that have already been discovered
+ by path_conv.
+
2000-05-25 Kazuhiro Fujieda <fujieda@jaist.ac.jp>
* dir.cc (rmdir): Correct the manner in checking the target directory.
* dir.cc (rmdir): Care for misleading error messages
when trying to remove a directory on a samba share.
- Eliminate superfluous else branch.
+ Eliminate superfluous else branch.
* syscalls.cc (_rename): Additional check for ERROR_FILE_EXISTS
if MoveFile fails.
/* Under Windows 9X or on a samba share, ERROR_ACCESS_DENIED is
returned if you try to remove a file. On 9X the same error is
returned if you try to remove a non-empty directory. */
- int attr = GetFileAttributes (real_dir.get_win32());
- if (attr != -1 && !(attr & FILE_ATTRIBUTE_DIRECTORY))
+ if (real_dir.fileattr != (DWORD) -1 && !(real_dir.fileattr & FILE_ATTRIBUTE_DIRECTORY))
set_errno (ENOTDIR);
else if (os_being_run != winNT)
set_errno (ENOTEMPTY);