Changeset 23302 in vbox

Timestamp:

Sep 24, 2009 5:00:38 PM (15 years ago)

Author:

vboxsync

Message:

IPRT: r52791 repated for RTFileExists.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• generic/RTFileExists-generic.cpp (copied) (copied from trunk/src/VBox/Runtime/generic/RTDirExists-generic.cpp ) (3 diffs)
• r3/win/fileio-win.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -374 +374 @@
         generic/RTDirQueryInfo-generic.cpp \
         generic/RTDirSetTimes-generic.cpp \
+        generic/RTFileExists-generic.cpp \
         generic/RTMpGetCurFrequency-generic.cpp \
         generic/RTMpGetMaxFrequency-generic.cpp \

trunk/src/VBox/Runtime/generic/RTFileExists-generic.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - RTDirExists, generic implementation.
+ * IPRT - RTFileExists, generic implementation.
  */
 
@@ -33 +33 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#define LOG_GROUP RTLOGGROUP_DIR
+#define LOG_GROUP RTLOGGROUP_FILE
 #include "internal/iprt.h"
 
-#include <iprt/dir.h>
+#include <iprt/file.h>
 #include <iprt/err.h>
 #include <iprt/log.h>
@@ -42 +42 @@
 
 
-RTDECL(bool) RTDirExists(const char *pszPath)
+RTDECL(bool) RTFileExists(const char *pszPath)
 {
     RTFSOBJINFO ObjInfo;
     int rc = RTPathQueryInfoEx(pszPath, &ObjInfo, RTFSOBJATTRADD_NOTHING, RTPATH_F_FOLLOW_LINK);
     bool fRc = RT_SUCCESS(rc)
-            && RTFS_IS_DIRECTORY(ObjInfo.Attr.fMode);
-    LogFlow(("RTDirExists(%p:{%s}): returns %RTbool (%Rrc)\n", pszPath, pszPath, fRc, rc));
+            && RTFS_IS_FILE(ObjInfo.Attr.fMode)
+            && !(ObjInfo.Attr.fMode & (RTFS_DOS_NT_DEVICE | RTFS_DOS_NT_REPARSE_POINT)); /* paranoia */
+    LogFlow(("RTFileExists(%p:{%s}): returns %RTbool (%Rrc)\n", pszPath, pszPath, fRc, rc));
     return fRc;
 }

trunk/src/VBox/Runtime/r3/win/fileio-win.cpp

@@ -126 +126 @@
 
     return fIsBeyondLimit;
-}
-
-
-RTDECL(bool) RTFileExists(const char *pszPath)
-{
-    bool fRc = false;
-
-    /*
-     * Convert to UTF-16.
-     */
-    PRTUTF16 pwszString;
-    int rc = RTStrToUtf16(pszPath, &pwszString);
-    AssertRC(rc);
-    if (RT_SUCCESS(rc))
-    {
-        /*
-         * Query and check attributes.
-         */
-        DWORD dwAttr = GetFileAttributesW((LPCWSTR)pwszString);
-        fRc = dwAttr != INVALID_FILE_ATTRIBUTES
-            && !(dwAttr & (  FILE_ATTRIBUTE_DIRECTORY
-                           | FILE_ATTRIBUTE_DEVICE
-                           | FILE_ATTRIBUTE_REPARSE_POINT));
-        RTUtf16Free(pwszString);
-    }
-
-    LogFlow(("RTFileExists(%p:{%s}): returns %RTbool\n", pszPath, pszPath, fRc));
-    return fRc;
 }