Changeset 69818 in vbox for trunk/include/iprt

Timestamp:

Nov 23, 2017 7:44:07 PM (7 years ago)

Author:

vboxsync

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

119242

Message:

IPRT/VFS: Got rid of the pfnTraversalOpen method.

Location:

trunk/include/iprt

Files:

• path.h (modified) (1 diff)
• vfs.h (modified) (2 diffs)
• vfslowlevel.h (modified) (1 diff)

trunk/include/iprt/path.h

@@ -65 +65 @@
  * @{ */
 /** Last component: Work on the link. */
-#define RTPATH_F_ON_LINK          RT_BIT_32(0)
+#define RTPATH_F_ON_LINK            RT_BIT_32(0)
 /** Last component: Follow if link. */
-#define RTPATH_F_FOLLOW_LINK      RT_BIT_32(1)
+#define RTPATH_F_FOLLOW_LINK        RT_BIT_32(1)
 /** Don't allow symbolic links as part of the path.
  * @remarks this flag is currently not implemented and will be ignored. */
-#define RTPATH_F_NO_SYMLINKS      RT_BIT_32(2)
+#define RTPATH_F_NO_SYMLINKS        RT_BIT_32(2)
+/** Current RTPATH_F_XXX flag mask. */
+#define RTPATH_F_MASK               UINT32_C(0x00000007)
 /** @} */
 

trunk/include/iprt/vfs.h

@@ -183 +183 @@
 /** Socket (RTFS_TYPE_SOCKET). */
 #define RTVFSOBJ_F_OPEN_SOCKET              RT_BIT_32(14)
+/** Mounted VFS. */
+#define RTVFSOBJ_F_OPEN_MOUNT               RT_BIT_32(15)
 /** Mask object types we wish to open. */
-#define RTVFSOBJ_F_OPEN_MASK                UINT32_C(0x00003f00)
+#define RTVFSOBJ_F_OPEN_MASK                UINT32_C(0x0000ff00)
 /** Any kind of object that translates to RTVFSOBJTYPE_FILE. */
-#define RTVFSOBJ_F_OPEN_ANY_FILE            (RTVFSOBJ_F_FILE | RTVFSOBJ_F_DEV_BLOCK)
+#define RTVFSOBJ_F_OPEN_ANY_FILE            (RTVFSOBJ_F_OPEN_FILE | RTVFSOBJ_F_OPEN_DEV_BLOCK)
 /** Any kind of object that translates to RTVFSOBJTYPE_IOS or
  *  RTVFSOBJTYPE_FILE. */
-#define RTVFSOBJ_F_OPEN_ANY_IO_STREAM       (RTVFSOBJ_F_ANY_FILE | RTVFSOBJ_F_DEV_BLOCK | RTVFSOBJ_F_FIFO | RTVFSOBJ_F_SOCKET)
+#define RTVFSOBJ_F_OPEN_ANY_IO_STREAM       (  RTVFSOBJ_F_ANY_OPEN_FILE | RTVFSOBJ_F_DEV_OPEN_BLOCK \
+                                             | RTVFSOBJ_F_OPEN_FIFO     | RTVFSOBJ_F_OPEN_SOCKET)
 /** Any kind of object. */
 #define RTVFSOBJ_F_OPEN_ANY                 RTVFSOBJ_F_OPEN_MASK
@@ -208 +211 @@
 #define RTVFSOBJ_F_TRAVERSAL                RT_BIT_32(31)
 /** Valid mask for external callers. */
-#define RTVFSOBJ_F_VALID_MASK               UINT32_C(0x00003f00)
+#define RTVFSOBJ_F_VALID_MASK               UINT32_C(0x0007ff00)
 /** @} */
 

trunk/include/iprt/vfslowlevel.h

@@ -562 +562 @@
     DECLCALLBACKMEMBER(int, pfnOpen)(void *pvThis, const char *pszEntry, uint64_t fOpenFile,
                                      uint32_t fObjFlags, PRTVFSOBJ phVfsObj);
-
-    /**
-     * Opens a directory entry for traversal purposes.
-     *
-     * Method which sole purpose is helping the path traversal.  Only one of
-     * the three output variables will be set, the others will left untouched
-     * (caller sets them to NIL).
-     *
-     * @returns IPRT status code.
-     * @retval  VERR_PATH_NOT_FOUND if @a pszEntry was not found.
-     * @retval  VERR_NOT_A_DIRECTORY if @a pszEntry isn't a directory or symlink.
-     * @param   pvThis          The implementation specific directory data.
-     * @param   pszEntry        The name of the directory entry to remove.
-     * @param   phVfsDir        If not NULL and it is a directory, open it and
-     *                          return the handle here.
-     * @param   phVfsSymlink    If not NULL and it is a symbolic link, open it
-     *                          and return the handle here.
-     * @param   phVfsMounted    If not NULL and it is a mounted VFS directory,
-     *                          reference it and return the handle here.
-     * @todo    Should com dir, symlinks and mount points using some common
-     *          ancestor "class".
-     * @note    Will be replaced by pfnOpenObj.
-     */
-    DECLCALLBACKMEMBER(int, pfnTraversalOpen)(void *pvThis, const char *pszEntry, PRTVFSDIR phVfsDir,
-                                              PRTVFSSYMLINK phVfsSymlink, PRTVFS phVfsMounted);
 
     /**