summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2002-05-28 02:00:55 +0000
committerChristopher Faylor <me@cgf.cx>2002-05-28 02:00:55 +0000
commit57e2ae682ce64be2e5afefb789eabe846fb400ba (patch)
tree1fdcad7e707a86c7886c22d1c6004468a6bcab97
parent2402700d07f5592d66b7b78823ce9b9aa698801d (diff)
downloadcygnal-57e2ae682ce64be2e5afefb789eabe846fb400ba.tar.gz
cygnal-57e2ae682ce64be2e5afefb789eabe846fb400ba.tar.bz2
cygnal-57e2ae682ce64be2e5afefb789eabe846fb400ba.zip
* fhandler_disk_file.cc (fhandler_disk_file::fstat): Minor logic cleanup.
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/fhandler_disk_file.cc4
2 files changed, 6 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 613fdb5ca..afd659f65 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
2002-05-27 Christopher Faylor <cgf@redhat.com>
+ * fhandler_disk_file.cc (fhandler_disk_file::fstat): Minor logic
+ cleanup.
+
+2002-05-27 Christopher Faylor <cgf@redhat.com>
+
* autoload.cc (LoadFuncEx): Define via new LoadFuncEx2 macro.
(LoadFuncEx2): Adapted from LoadFuncEx. Provides control of return
value for nonexistent function.
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index 5a1e937e2..aa6b50dc6 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -143,9 +143,7 @@ fhandler_disk_file::fstat (struct __stat64 *buf, path_conv *pc)
if (query_open_already && strncasematch (pc->volname (), "FAT", 3))
oret = 0;
- else if ((oret = open (pc, open_flags, 0)))
- /* ok */;
- else
+ else if (!(oret = open (pc, open_flags, 0)))
{
int ntsec_atts = 0;
/* If we couldn't open the file, try a "query open" with no permissions.