Changeset 46014 in vbox for trunk

Timestamp:

May 13, 2013 11:55:58 AM (12 years ago)

Author:

vboxsync

Message:

RTDirQueryUnknownType* adjustment.

Location:

trunk

Files:

• include/iprt/dir.h (modified) (2 diffs)
• src/VBox/Runtime/r3/dir.cpp (modified) (2 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   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
- *                          return immediately without doing anything.  If it
- *                          is, it will use RTPathQueryInfo to try figure out
- *                          the correct value.  On failure, this will be
- *                          unchanged.
- */
-RTDECL(int) RTDirQueryUnknownType(const char *pszComposedName, bool fFollowSymLinks, RTDIRENTRYTYPE *penmType);
+ *                          is not RTDIRENTRYTYPE_UNKNOWN and, if
+ *                          @a fFollowSymlinks is false, not
+ *                          RTDIRENTRYTYPE_SYMLINK, the function will return
+ *                          immediately without doing anything.  Otherwise it
+ *                          will use RTPathQueryInfo to try figure out the
+ *                          correct value.  On failure, this will be unchanged.
+ */
+RTDECL(int) RTDirQueryUnknownType(const char *pszComposedName, bool fFollowSymlinks, RTDIRENTRYTYPE *penmType);
 
 /**
@@ -439 +440 @@
  *                          compose this, it's NOT sufficient to pass
  *                          RTDIRENTRY::szName!
- * @param   fFollowSymLinks Whether to follow symbolic links or not.
+ * @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, bool fFollowSymLinks, 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, bool fFollowSymLinks,
+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);
+                               fFollowSymlinks ? RTPATH_F_FOLLOW_LINK : RTPATH_F_ON_LINK);
     if (RT_FAILURE(rc))
         return rc;
@@ -763 +763 @@
 
 
-RTDECL(int) RTDirQueryUnknownType(const char *pszComposedName, bool fFollowSymLinks, RTDIRENTRYTYPE *penmType)
-{
-    if (*penmType != RTDIRENTRYTYPE_UNKNOWN)
+RTDECL(int) RTDirQueryUnknownType(const char *pszComposedName, bool fFollowSymlinks, RTDIRENTRYTYPE *penmType)
+{
+    if (   *penmType != RTDIRENTRYTYPE_UNKNOWN
+        && (   !fFollowSymlinks
+            || *penmType != RTDIRENTRYTYPE_SYMLINK))
         return VINF_SUCCESS;
 
     RTFSOBJINFO ObjInfo;
-    return RTDirQueryUnknownTypeEx(pszComposedName, fFollowSymLinks, penmType, &ObjInfo);
+    return RTDirQueryUnknownTypeEx(pszComposedName, fFollowSymlinks, penmType, &ObjInfo);
 }