Changeset 15756 in vbox for trunk/src/VBox/Runtime

Timestamp:

Dec 25, 2008 11:12:42 AM (16 years ago)

Author:

vboxsync

Message:

Runtime: RTPathAbs: Fixed the "." case on POSIX, fixed the "" case on Windows.

Location:

trunk/src/VBox/Runtime

Files:

• r3/posix/path-posix.cpp (modified) (2 diffs)
• r3/win/path-win.cpp (modified) (1 diff)
• testcase/tstPath.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/posix/path-posix.cpp

@@ -180 +180 @@
     fsCleanPath(szTmpPath);
 
+    /*
+     * fsCleanPath will leave the single dot alone, we don't need it here.
+     */
+    if (szTmpPath[0] == '.' && !szTmpPath[1])
+        szTmpPath[0] = '\0';
+
     char *pszCur = szTmpPath;
 
@@ -214 +220 @@
 
         {
-            /*
-             * Convert result and copy it to the return buffer.
-             */
             char *pszUtf8CurDir;
             int rc = rtPathFromNative(&pszUtf8CurDir, szCurDir);

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

@@ -99 +99 @@
 RTDECL(int) RTPathAbs(const char *pszPath, char *pszAbsPath, size_t cchAbsPath)
 {
+    Assert(VALID_PTR(pszPath));
+
+    /*
+     * When the input path is just "", GetFullPathNameW() will return a full
+     * executable name instead of the current directory (as the POSIX sister .
+     * does). Go the POSIX way with the following workaround.
+     */
+    static const char szSingleDot[] = ".";
+    if (!pszPath[0])
+        pszPath = szSingleDot;
+
     /*
      * Convert to UTF-16, call Win32 API, convert back.

trunk/src/VBox/Runtime/testcase/tstPath.cpp

@@ -101 +101 @@
     {
 #if defined (RT_OS_OS2) || defined (RT_OS_WINDOWS)
-//  { NULL, "", VINF_SUCCESS, "%p" },
-//  { NULL, ".", VINF_SUCCESS, "%p" },
+    { NULL, "", VINF_SUCCESS, "%p" },
+    { NULL, ".", VINF_SUCCESS, "%p" },
     { NULL, "\\", VINF_SUCCESS, "%d\\" },
     { NULL, "\\..", VINF_SUCCESS, "%d\\" },
@@ -114 +114 @@
     { "relative_base/dir/", "relative_also", VINF_SUCCESS, "%p\\relative_base\\dir\\relative_also" },
 #else
-//  { NULL, "", VINF_SUCCESS, "/" },
-//  { NULL, ".", VINF_SUCCESS, "%p" },
+    { NULL, "", VINF_SUCCESS, "%p" },
+    { NULL, ".", VINF_SUCCESS, "%p" },
     { NULL, "/", VINF_SUCCESS, "/" },
     { NULL, "/..", VINF_SUCCESS, "/" },