Changeset 25076 in vbox for trunk/src/VBox/Runtime

Timestamp:

Nov 28, 2009 10:55:30 PM (15 years ago)

Author:

vboxsync

Message:

RTFileQueryFsSizes: Moving it to a separate file so we can select platform specific implementations where it becomes necessary..

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (6 diffs)
• r3/posix/RTFileQueryFsSizes-posix.cpp (added)
• r3/posix/fileio-posix.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -443 +443 @@
         r3/linux/time-linux.cpp \
         r3/linux/RTProcIsRunningByName-linux.cpp \
+        r3/posix/RTFileQueryFsSizes-posix.cpp \
         r3/posix/RTSystemQueryOSInfo-posix.cpp \
         r3/posix/alloc-posix.cpp \
@@ -511 +512 @@
         r3/os2/thread-os2.cpp \
         r3/os2/time-os2.cpp \
+        r3/posix/RTFileQueryFsSizes-posix.cpp \
         r3/posix/RTSystemQueryOSInfo-posix.cpp \
         r3/posix/alloc-posix.cpp \
@@ -548 +550 @@
         r3/darwin/sched-darwin.cpp \
         r3/darwin/time-darwin.cpp \
+        r3/posix/RTFileQueryFsSizes-posix.cpp \
         r3/posix/RTSystemQueryOSInfo-posix.cpp \
         r3/posix/dir-posix.cpp \
@@ -592 +595 @@
         r3/freebsd/alloc-freebsd.cpp \
         r3/freebsd/rtProcInitExePath-freebsd.cpp \
+        r3/posix/RTFileQueryFsSizes-posix.cpp \
         r3/posix/RTSystemQueryOSInfo-posix.cpp \
         r3/posix/dir-posix.cpp \
@@ -628 +632 @@
         generic/uuid-generic.cpp \
         generic/RTProcIsRunningByName-generic.cpp \
+        r3/posix/RTFileQueryFsSizes-posix.cpp \
         r3/posix/RTSystemQueryOSInfo-posix.cpp \
         r3/posix/dir-posix.cpp \
@@ -692 +697 @@
         l4/timer-l4env.cpp \
         l4/utf8-l4env.cpp \
+        r3/posix/RTFileQueryFsSizes-posix.cpp \
         r3/posix/alloc-posix.cpp \
         r3/posix/dir-posix.cpp \

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

@@ -47 +47 @@
 # include <unistd.h>
 # include <sys/time.h>
-# include <sys/statvfs.h>
 #endif
 #ifdef RT_OS_LINUX
@@ -719 +718 @@
 
 
-RTR3DECL(int) RTFileQueryFsSizes(RTFILE hFile, PRTFOFF pcbTotal, RTFOFF *pcbFree,
-                                 uint32_t *pcbBlock, uint32_t *pcbSector)
-{
-    struct statvfs StatVFS;
-    RT_ZERO(StatVFS);
-    if (fstatvfs(hFile, &StatVFS))
-        return RTErrConvertFromErrno(errno);
-
-    /*
-     * Calc the returned values.
-     */
-    if (pcbTotal)
-        *pcbTotal = (RTFOFF)StatVFS.f_blocks * StatVFS.f_frsize;
-    if (pcbFree)
-        *pcbFree = (RTFOFF)StatVFS.f_bavail * StatVFS.f_frsize;
-    if (pcbBlock)
-        *pcbBlock = StatVFS.f_frsize;
-    /* no idea how to get the sector... */
-    if (pcbSector)
-        *pcbSector = 512;
-
-    return VINF_SUCCESS;
-}
-
-
-
 RTR3DECL(int) RTFileRename(const char *pszSrc, const char *pszDst, unsigned fRename)
 {