Changeset 85875 in vbox

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

Files:

• include/iprt/file.h (modified) (1 diff)
• include/iprt/mangling.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (8 diffs)
• src/VBox/Runtime/generic/RTFileQuerySectorSize-generic.cpp (added)
• src/VBox/Runtime/r3/darwin/RTFileQuerySectorSize-darwin.cpp (added)
• src/VBox/Runtime/r3/freebsd/RTFileQuerySectorSize-freebsd.cpp (added)
• src/VBox/Runtime/r3/linux/RTFileQuerySectorSize-linux.cpp (added)
• src/VBox/Runtime/r3/posix/fileio-posix.cpp (modified) (2 diffs)
• src/VBox/Runtime/r3/solaris/RTFileQuerySectorSize-solaris.cpp (added)
• src/VBox/Runtime/r3/win/RTFileQuerySectorSize-win.cpp (added)

trunk/include/iprt/file.h

@@ -594 +594 @@
 
 /**
+ * Queries the sector size (/ logical block size) for a disk or similar.
+ *
+ * @returns IPRT status code.
+ * @retval  VERR_INVALID_FUNCTION if not a disk/similar.  Could also be returned
+ *          if not really implemented.
+ * @param   hFile       Handle to the disk.  This must typically be a device
+ *                      rather than a file or directory, though this may vary
+ *                      from OS to OS.
+ * @param   pcbSector   Where to store the sector size.
+ */
+RTDECL(int) RTFileQuerySectorSize(RTFILE hFile, uint32_t *pcbSector);
+
+/**
  * Gets the current file position.
  *

trunk/include/iprt/mangling.h

@@ -965 +965 @@
 # define RTFileQueryFsSizes                             RT_MANGLER(RTFileQueryFsSizes)
 # define RTFileQueryInfo                                RT_MANGLER(RTFileQueryInfo)
+# define RTFileQuerySectorSize                          RT_MANGLER(RTFileQuerySectorSize)
 # define RTFileQuerySize                                RT_MANGLER(RTFileQuerySize)
 # define RTFileRead                                     RT_MANGLER(RTFileRead)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -908 +908 @@
         r3/win/env-win.cpp \
         r3/win/RTCrStoreCreateSnapshotById-win.cpp \
+        r3/win/RTFileQuerySectorSize-win.cpp \
         r3/win/RTHandleGetStandard-win.cpp \
         r3/win/RTLocaleQueryNormalizedBaseLocaleName-win.cpp \
@@ -999 +1000 @@
         r3/linux/thread-affinity-linux.cpp \
         r3/linux/RTFileCopyPartEx-linux.cpp \
+        r3/linux/RTFileQuerySectorSize-linux.cpp \
         r3/linux/RTFileSetAllocationSize-linux.cpp \
         r3/linux/RTProcIsRunningByName-linux.cpp \
@@ -1079 +1081 @@
         generic/RTFileCopyPartEx-generic.cpp \
         generic/RTFileMove-generic.cpp \
+        generic/RTFileQuerySectorSize-generic.cpp \
         generic/RTFileSetAllocationSize-generic.cpp \
         generic/RTLogWriteDebugger-generic.cpp \
@@ -1187 +1190 @@
         r3/darwin/RTCrStoreCreateSnapshotById-darwin.cpp \
         r3/darwin/filelock-darwin.cpp \
+        r3/darwin/RTFileQuerySectorSize-darwin.cpp \
         r3/darwin/krnlmod-darwin.cpp \
         r3/darwin/mp-darwin.cpp \
@@ -1278 +1282 @@
         generic/RTThreadGetNativeState-generic.cpp \
         r3/freebsd/fileaio-freebsd.cpp \
+        r3/freebsd/RTFileQuerySectorSize-freebsd.cpp \
         r3/freebsd/mp-freebsd.cpp \
         r3/freebsd/systemmem-freebsd.cpp \
@@ -1339 +1344 @@
         generic/RTFileCopyPartEx-generic.cpp \
         generic/RTFileMove-generic.cpp \
+        generic/RTFileQuerySectorSize-generic.cpp \
         generic/RTLogWriteDebugger-generic.cpp \
         generic/RTPathGetCurrentOnDrive-generic.cpp \
@@ -1491 +1497 @@
         r3/posix/utf8-posix.cpp \
         r3/solaris/fileaio-solaris.cpp \
+        r3/solaris/RTFileQuerySectorSize-solaris.cpp \
         r3/solaris/krnlmod-solaris.cpp \
         r3/solaris/systemmem-solaris.cpp \
@@ -1522 +1529 @@
         generic/RTFileCopyPartEx-generic.cpp \
         generic/RTFileMove-generic.cpp \
+        generic/RTFileQuerySectorSize-generic.cpp \
         generic/RTFileSetAllocationSize-generic.cpp \
         generic/RTLogWriteDebugger-generic.cpp \

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)