Changeset 46013 in vbox

Timestamp:

May 13, 2013 11:52:15 AM (12 years ago)

Author:

vboxsync

Message:

RTDirQueryUnknownType* adjustment.

Location:

trunk

Files:

• include/iprt/dir.h (modified) (3 diffs)
• src/VBox/Runtime/r3/dir.cpp (modified) (3 diffs)

trunk/include/iprt/dir.h

@@ -421 +421 @@
  *                          compose this, it's NOT sufficient to pass
  *                          RTDIRENTRY::szName!
+ * @param   fFollowSymLinks Whether to follow symbolic links or not.
  * @param   penmType        Pointer to the RTDIRENTRY::enmType member.  If this
  *                          is not RTDIRENTRYTYPE_UNKNOWN, the function will
@@ -428 +429 @@
  *                          unchanged.
  */
-RTDECL(int) RTDirQueryUnknownType(const char *pszComposedName, RTDIRENTRYTYPE *penmType);
+RTDECL(int) RTDirQueryUnknownType(const char *pszComposedName, bool fFollowSymLinks, RTDIRENTRYTYPE *penmType);
 
 /**
@@ -438 +439 @@
  *                          compose this, it's NOT sufficient to pass
  *                          RTDIRENTRY::szName!
+ * @param   fFollowSymLinks Whether to follow symbolic links or not.
  * @param   penmType        Pointer to the RTDIRENTRY::enmType member or
  *                          similar.  Will NOT be checked on input.
  * @param   pObjInfo        The object info buffer to use with RTPathQueryInfo.
  */
-RTDECL(int) RTDirQueryUnknownTypeEx(const char *pszComposedName, RTDIRENTRYTYPE *penmType, PRTFSOBJINFO pObjInfo);
+RTDECL(int) RTDirQueryUnknownTypeEx(const char *pszComposedName, bool fFollowSymLinks, RTDIRENTRYTYPE *penmType, PRTFSOBJINFO pObjInfo);
 
 /**

trunk/src/VBox/Runtime/r3/dir.cpp

@@ -732 +732 @@
 
 
-RTDECL(int) RTDirQueryUnknownTypeEx(const char *pszComposedName, RTDIRENTRYTYPE *penmType, PRTFSOBJINFO pObjInfo)
-{
-    int rc = RTPathQueryInfoEx(pszComposedName, pObjInfo, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
+RTDECL(int) RTDirQueryUnknownTypeEx(const char *pszComposedName, bool fFollowSymLinks,
+                                    RTDIRENTRYTYPE *penmType, PRTFSOBJINFO pObjInfo)
+{
+    int rc = RTPathQueryInfoEx(pszComposedName, pObjInfo, RTFSOBJATTRADD_NOTHING,
+                               fFollowSymLinks ? RTPATH_F_FOLLOW_LINK : RTPATH_F_ON_LINK);
     if (RT_FAILURE(rc))
         return rc;
@@ -761 +763 @@
 
 
-RTDECL(int) RTDirQueryUnknownType(const char *pszComposedName, RTDIRENTRYTYPE *penmType)
+RTDECL(int) RTDirQueryUnknownType(const char *pszComposedName, bool fFollowSymLinks, RTDIRENTRYTYPE *penmType)
 {
     if (*penmType != RTDIRENTRYTYPE_UNKNOWN)
@@ -767 +769 @@
 
     RTFSOBJINFO ObjInfo;
-    return RTDirQueryUnknownTypeEx(pszComposedName, penmType, &ObjInfo);
+    return RTDirQueryUnknownTypeEx(pszComposedName, fFollowSymLinks, penmType, &ObjInfo);
 }