Changeset 3019 in kBuild

Timestamp:

Jan 7, 2017 12:07:08 AM (8 years ago)

Author:

bird

Message:

ntstat.c: mount point fix.

File:

• trunk/src/lib/nt/ntstat.c (modified) (1 diff)

trunk/src/lib/nt/ntstat.c

@@ -645 +645 @@
         birdCloseFile(hFile);
 
-        /*
-         * If we hit a mount point (NTFS volume mounted under an empty NTFS directory),
-         * we should return information about what's mounted there rather than the
-         * directory it is mounted at as this is what UNIX does.
-         */
-        hFile = birdOpenFileExW(hRoot, pwszPath,
-                                FILE_READ_ATTRIBUTES,
-                                FILE_ATTRIBUTE_NORMAL,
-                                FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-                                FILE_OPEN,
-                                FILE_OPEN_FOR_BACKUP_INTENT,
-                                OBJ_CASE_INSENSITIVE);
-        if (hFile != INVALID_HANDLE_VALUE)
-        {
-            rc = birdStatHandle2(hFile, pStat, NULL, pwszPath);
-            pStat->st_ismountpoint = 2;
-            birdCloseFile(hFile);
+        if (rc || !pStat->st_ismountpoint)
+        { /* very likely */ }
+        else
+        {
+            /*
+             * If we hit a mount point (NTFS volume mounted under an empty NTFS directory),
+             * we should return information about what's mounted there rather than the
+             * directory it is mounted at as this is what UNIX does.
+             */
+            hFile = birdOpenFileExW(hRoot, pwszPath,
+                                    FILE_READ_ATTRIBUTES,
+                                    FILE_ATTRIBUTE_NORMAL,
+                                    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+                                    FILE_OPEN,
+                                    FILE_OPEN_FOR_BACKUP_INTENT,
+                                    OBJ_CASE_INSENSITIVE);
+            if (hFile != INVALID_HANDLE_VALUE)
+            {
+                rc = birdStatHandle2(hFile, pStat, NULL, pwszPath);
+                pStat->st_ismountpoint = 2;
+                birdCloseFile(hFile);
+            }
         }
     }