From 7e06494e35676aaddddfcce363273b4b1f335605 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Thu, 25 May 2000 21:02:28 +0000
Subject: [PATCH] * dir.cc (rmdir): Use file attributes that have already been
discovered by path_conv.
---
winsup/cygwin/ChangeLog | 2 +-
winsup/cygwin/dir.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index df6cdbca0..f846b5053 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,4 +1,4 @@
-Thu May 25 13:29:23 2000 Christopher Faylor <cgf@cygnus.com>
+Thu May 25 17:01:53 2000 Christopher Faylor <cgf@cygnus.com>
* dir.cc (rmdir): Use file attributes that have already been discovered
by path_conv.
diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc
index 6ab6dae1c..cce81d80d 100644
--- a/winsup/cygwin/dir.cc
+++ b/winsup/cygwin/dir.cc
@@ -341,7 +341,7 @@ rmdir (const char *dir)
/* 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. */
- if (real_dir.fileattr != (DWORD) -1 && !(real_dir.fileattr & FILE_ATTRIBUTE_DIRECTORY))
+ if (real_dir.file_attributes () != (DWORD) -1 && !(real_dir.fileattr & FILE_ATTRIBUTE_DIRECTORY))
set_errno (ENOTDIR);
else if (os_being_run != winNT)
set_errno (ENOTEMPTY);