Changeset 30281 in vbox for trunk

Timestamp:

Jun 17, 2010 10:25:10 AM (15 years ago)

Author:

vboxsync

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

62807

Message:

Runtime: added Darwin support to RTFsQueryType

Location:

trunk

Files:

• include/iprt/fs.h (modified) (1 diff)
• src/VBox/Runtime/r3/posix/fs-posix.cpp (modified) (2 diffs)
• src/VBox/Runtime/testcase/tstRTFsQueries.cpp (modified) (1 diff)

trunk/include/iprt/fs.h

@@ -194 +194 @@
 #define RTFS_FS_TYPE_NTFS              11
 #define RTFS_FS_TYPE_ZFS               12
+#define RTFS_FS_TYPE_XFS               13
+#define RTFS_FS_TYPE_AUTOFS            14
+#define RTFS_FS_TYPE_DEVFS             15
 
 

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

@@ -35 +35 @@
 #ifdef RT_OS_LINUX
 # include <mntent.h>
+#endif
+#ifdef RT_OS_DARWIN
+# include <sys/mount.h>
 #endif
 
@@ -228 +231 @@
             if (!strcmp("zfs", Stat.st_fstype))
                 *pu32Type = RTFS_FS_TYPE_ZFS;
+#elif defined(RT_OS_DARWIN)
+            struct statfs statfsBuf;
+            if (!statfs(pszNativeFsPath, &statfsBuf))
+            {
+                if (!strcmp("hfs", statfsBuf.f_fstypename))
+                    *pu32Type = RTFS_FS_TYPE_HFS;
+                else if (   !strcmp("fat", statfsBuf.f_fstypename)
+                         || !strcmp("msdos", statfsBuf.f_fstypename))
+                    *pu32Type = RTFS_FS_TYPE_FAT;
+                else if (!strcmp("ntfs", statfsBuf.f_fstypename))
+                    *pu32Type = RTFS_FS_TYPE_NTFS;
+                else if (!strcmp("autofs", statfsBuf.f_fstypename))
+                    *pu32Type = RTFS_FS_TYPE_AUTOFS;
+                else if (!strcmp("devfs", statfsBuf.f_fstypename))
+                    *pu32Type = RTFS_FS_TYPE_DEVFS;
+                else if (!strcmp("nfs", statfsBuf.f_fstypename))
+                    *pu32Type = RTFS_FS_TYPE_NFS;
+            }
 #endif
         }

trunk/src/VBox/Runtime/testcase/tstRTFsQueries.cpp

@@ -99 +99 @@
                 "cifs",
                 "fat",
-                "ntfs"
+                "ntfs",
+                "zfs",
+                "xfs",
+                "autofs",
+                "devfs"
             };