Changeset 85875 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Aug 24, 2020 4:22:01 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

140046

Message:

Main: bugref:9224: Added RTFileQuerySectorSize into IPRT

Location:

trunk/src/VBox/Runtime/r3

Files:

• darwin/RTFileQuerySectorSize-darwin.cpp (added)
• freebsd/RTFileQuerySectorSize-freebsd.cpp (added)
• linux/RTFileQuerySectorSize-linux.cpp (added)
• posix/fileio-posix.cpp (modified) (2 diffs)
• solaris/RTFileQuerySectorSize-solaris.cpp (added)
• win/RTFileQuerySectorSize-win.cpp (added)

trunk/src/VBox/Runtime/r3/posix/fileio-posix.cpp

@@ -680 +680 @@
         *pcbSize = st.st_size;
         if (   st.st_size != 0
-#if defined(RT_OS_SOLARIS)
+#if defined(RT_OS_SOLARIS) || defined(RT_OS_DARWIN)
             || (!S_ISBLK(st.st_mode) && !S_ISCHR(st.st_mode))
-#elif defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+#elif defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD) || defined(RT_OS_DARWIN)
             || !S_ISCHR(st.st_mode)
 #else
@@ -705 +705 @@
             }
         }
-        /* must be a block device, fail on failure. */
+
+        /* Always fail block devices.  Character devices doesn't all need to be
+           /dev/rdisk* nodes, they should return ENOTTY but include EINVAL too. */
+        if (!S_ISBLK(st.st_mode) && (errno == ENOTTY || errno == EINVAL))
+            return VINF_SUCCESS;
 
 #elif defined(RT_OS_SOLARIS)