* fhandler_disk_file.cc (fhandler_disk_file::fstat): Minor logic cleanup.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 613fdb5..afd659f 100644 (file)
--- 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 5a1e937..aa6b50d 100644 (file)
--- 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.