Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl
===================================================================
--- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 55610)
+++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 55611)
@@ -2813,23 +2813,4 @@
-
-
- File types known by VFSExplorer.
-
-
-
-
-
-
-
-
-
-
-
-
-
- The list of types for the entries.
+ The list of types for the entries .
@@ -10419,36 +10400,37 @@
- File system object type.
-
-
-
- Type is undefined / unknown.
-
-
- Named pipe.
-
-
+ File system object (file) types.
+
+
+ Used either if the object has type that is not in this enum, or
+ if the type has not yet been determined or set.
+
+
+ FIFO or named pipe, depending on the platform/terminology.
+
+
Character device.
-
+
+ Directory.
+
+
Block device.
-
- Directory.
-
-
- File.
-
-
- Symlink.
-
-
+
+ Regular file.
+
+
+ Symbolic link.
+
+
Socket.
-
- Whiteout.
+
+ A white-out file. Found in union mounts where it is used for
+ hiding files after deletion, I think.
@@ -12257,5 +12239,5 @@
@@ -12367,5 +12349,5 @@
Index: /trunk/src/VBox/Main/include/VFSExplorerImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/VFSExplorerImpl.h (revision 55610)
+++ /trunk/src/VBox/Main/include/VFSExplorerImpl.h (revision 55611)
@@ -77,5 +77,5 @@
/* Private member methods */
- VFSFileType_T i_RTToVFSFileType(int aType) const;
+ FsObjType_T i_iprtToVfsObjType(RTFMODE aType) const;
HRESULT i_updateFS(TaskVFSExplorer *aTask);
Index: /trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp (revision 55610)
+++ /trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp (revision 55611)
@@ -60,5 +60,5 @@
/** @todo Add more types! */
else
- mType = FsObjType_Undefined;
+ mType = FsObjType_Unknown;
/* Object size. */
rc = strmBlk.GetInt64Ex("st_size", &mObjectSize);
@@ -126,5 +126,5 @@
/** @todo Add more types! */
else
- mType = FsObjType_Undefined;
+ mType = FsObjType_Unknown;
/* Object size. */
rc = strmBlk.GetInt64Ex("st_size", &mObjectSize);
Index: /trunk/src/VBox/Main/src-server/VFSExplorerImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/VFSExplorerImpl.cpp (revision 55610)
+++ /trunk/src/VBox/Main/src-server/VFSExplorerImpl.cpp (revision 55611)
@@ -41,5 +41,5 @@
struct DirEntry
{
- DirEntry(Utf8Str strName, VFSFileType_T fileType, uint64_t cbSize, uint32_t fMode)
+ DirEntry(Utf8Str strName, FsObjType_T fileType, uint64_t cbSize, uint32_t fMode)
: name(strName)
, type(fileType)
@@ -48,5 +48,5 @@
Utf8Str name;
- VFSFileType_T type;
+ FsObjType_T type;
uint64_t size;
uint32_t mode;
@@ -258,24 +258,24 @@
}
-VFSFileType_T VFSExplorer::i_RTToVFSFileType(int aType) const
+FsObjType_T VFSExplorer::i_iprtToVfsObjType(RTFMODE aType) const
{
int a = aType & RTFS_TYPE_MASK;
- VFSFileType_T t = VFSFileType_Unknown;
+ FsObjType_T t = FsObjType_Unknown;
if ((a & RTFS_TYPE_DIRECTORY) == RTFS_TYPE_DIRECTORY)
- t = VFSFileType_Directory;
+ t = FsObjType_Directory;
else if ((a & RTFS_TYPE_FILE) == RTFS_TYPE_FILE)
- t = VFSFileType_File;
+ t = FsObjType_File;
else if ((a & RTFS_TYPE_SYMLINK) == RTFS_TYPE_SYMLINK)
- t = VFSFileType_SymLink;
+ t = FsObjType_Symlink;
else if ((a & RTFS_TYPE_FIFO) == RTFS_TYPE_FIFO)
- t = VFSFileType_Fifo;
+ t = FsObjType_Fifo;
else if ((a & RTFS_TYPE_DEV_CHAR) == RTFS_TYPE_DEV_CHAR)
- t = VFSFileType_DevChar;
+ t = FsObjType_DevChar;
else if ((a & RTFS_TYPE_DEV_BLOCK) == RTFS_TYPE_DEV_BLOCK)
- t = VFSFileType_DevBlock;
+ t = FsObjType_DevBlock;
else if ((a & RTFS_TYPE_SOCKET) == RTFS_TYPE_SOCKET)
- t = VFSFileType_Socket;
+ t = FsObjType_Socket;
else if ((a & RTFS_TYPE_WHITEOUT) == RTFS_TYPE_WHITEOUT)
- t = VFSFileType_WhiteOut;
+ t = FsObjType_WhiteOut;
return t;
@@ -313,5 +313,5 @@
if ( name != "."
&& name != "..")
- fileList.push_back(VFSExplorer::Data::DirEntry(name, i_RTToVFSFileType(entry.Info.Attr.fMode),
+ fileList.push_back(VFSExplorer::Data::DirEntry(name, i_iprtToVfsObjType(entry.Info.Attr.fMode),
entry.Info.cbObject,
entry.Info.Attr.fMode & (RTFS_UNIX_IRWXU | RTFS_UNIX_IRWXG | RTFS_UNIX_IRWXO)));
@@ -431,5 +431,5 @@
{
/* Set always read/write permissions of the current logged in user. */
- fileList.push_back(VFSExplorer::Data::DirEntry(pBuckets->pszName, VFSFileType_Directory,
+ fileList.push_back(VFSExplorer::Data::DirEntry(pBuckets->pszName, FsObjType_Directory,
0, RTFS_UNIX_IRUSR | RTFS_UNIX_IWUSR));
pBuckets = pBuckets->pNext;
@@ -449,5 +449,5 @@
Utf8Str name(pKeys->pszName);
/* Set always read/write permissions of the current logged in user. */
- fileList.push_back(VFSExplorer::Data::DirEntry(pKeys->pszName, VFSFileType_File, pKeys->cbFile,
+ fileList.push_back(VFSExplorer::Data::DirEntry(pKeys->pszName, FsObjType_File, pKeys->cbFile,
RTFS_UNIX_IRUSR | RTFS_UNIX_IWUSR));
pKeys = pKeys->pNext;