Changeset 15808 in vbox for trunk/src/VBox

Timestamp:

Jan 5, 2009 3:44:53 PM (16 years ago)

Author:

vboxsync

Message:

iprt: added RTPathGetCurrent.

Location:

trunk/src/VBox/Runtime

Files:

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

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

@@ -209 +209 @@
          * No, prepend the current directory to the relative path.
          */
-        /** @todo use RTPathGetCurrent */
-        char szNativeCurDir[PATH_MAX + 1];
-        if (getcwd(szNativeCurDir, sizeof(szNativeCurDir)) == NULL)
-        {
-            rc = RTErrConvertFromErrno(errno);
-            AssertMsgFailedReturn(("Couldn't get cwd! rc=%Rrc errno=%d\n", rc, errno), rc);
-        }
-
-        char *pszCurDir;
-        rc = rtPathFromNative(&pszCurDir, szNativeCurDir);
-        if (RT_FAILURE(rc))
-        {
-            LogFlow(("RTPathAbs(%p:{%s}, %p, %d): returns %Rrc\n", pszPath, pszPath, pszAbsPath, cchAbsPath, rc));
-            return rc;
-        }
-
-        size_t cchCurDir = fsCleanPath(pszCurDir); /* paranoia */
+        char szCurDir[RTPATH_MAX];
+        rc = RTPathGetCurrent(szCurDir, sizeof(szCurDir));
+        AssertRCReturn(rc, rc);
+
+        size_t cchCurDir = fsCleanPath(szCurDir); /* paranoia */
         if (cchCurDir + cchTmpPath + 1 > PATH_MAX)
         {
-            RTStrFree(pszCurDir);
             LogFlow(("RTPathAbs(%p:{%s}, %p, %d): returns %Rrc\n", pszPath, pszPath, pszAbsPath, cchAbsPath, VERR_FILENAME_TOO_LONG));
             return VERR_FILENAME_TOO_LONG;
@@ -234 +221 @@
 
         memmove(szTmpPath + cchCurDir + 1, szTmpPath, cchTmpPath + 1);
-        memcpy(szTmpPath, pszCurDir, cchCurDir);
+        memcpy(szTmpPath, szCurDir, cchCurDir);
         szTmpPath[cchCurDir] = '/';
 
-        RTStrFree(pszCurDir);
 
 #ifdef HAVE_DRIVE
@@ -815 +801 @@
 
 
+RTDECL(int)  RTPathGetCurrent(char *pszPath, size_t cchPath)
+{
+    int rc;
+    char szNativeCurDir[RTPATH_MAX];
+    if (getcwd(szNativeCurDir, sizeof(szNativeCurDir)) != NULL)
+    {
+        char *pszCurDir;
+        rc = rtPathFromNative(&pszCurDir, szNativeCurDir);
+        if (RT_SUCCESS(rc))
+        {
+            size_t cchCurDir = strlen(pszCurDir);
+            if (cchCurDir < cchPath)
+            {
+                memcpy(pszPath, pszCurDir, cchCurDir + 1);
+                RTStrFree(pszCurDir);
+                return VINF_SUCCESS;
+            }
+
+            rc = VERR_BUFFER_OVERFLOW;
+            RTStrFree(pszCurDir);
+        }
+    }
+    else
+        rc = RTErrConvertFromErrno(errno);
+    return rc;
+}
+
+
 RTDECL(int) RTPathSetCurrent(const char *pszPath)
 {

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

@@ -485 +485 @@
 
 
+RTDECL(int) RTPathGetCurrent(char *pszPath, size_t cchPath)
+{
+    int rc;
+
+    /*
+     * GetCurrentDirectory may in some cases omit the drive letter, according
+     * to MSDN, thus the GetFullPathName call.
+     */
+#ifndef RT_DONT_CONVERT_FILENAMES
+    RTUTF16 wszCurPath[RTPATH_MAX];
+    if (GetCurrentDirectoryW(RTPATH_MAX, wszCurPath))
+    {
+        RTUTF16 wszFullPath[RTPATH_MAX];
+        if (GetFullPathNameW(wszCurPath, RTPATH_MAX, wszFullPath, NULL))
+            rc = RTUtf16ToUtf8Ex(&wszFullPath[0], RTSTR_MAX, &pszPath, cchPath, NULL);
+        else
+            rc = RTErrConvertFromWin32(GetLastError());
+    }
+    else
+        rc = RTErrConvertFromWin32(GetLastError());
+#else
+    char szCurPath[RTPATH_MAX];
+    if (GetCurrentDirectory(RTPATH_MAX, szCurPath))
+    {
+        if (GetFullPathName(szCurPath, cchPath, pszPath, NULL))
+            rc = VINF_SUCCESS;
+        else
+            rc = RTErrConvertFromWin32(GetLastError());
+    }
+    else
+        rc = RTErrConvertFromWin32(GetLastError());
+#endif
+    return rc;
+}
+
+
 RTDECL(int) RTPathSetCurrent(const char *pszPath)
 {

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

@@ -40 +40 @@
 #include <iprt/param.h>
 
-#if defined (RT_OS_WINDOWS)
-# include <direct.h> // for getcwd
-#else
-# include <unistd.h> // for getcwd
-#endif
-#include <errno.h> // for getcwd
 
 #define CHECK_RC(method) \
@@ -179 +173 @@
             if (s_aRTPathAbsExTests[i].pcszOutput[0] == '%')
             {
-                /** @todo Use RTPathGetCurrent(). */
-                if (getcwd(szTmp, sizeof(szTmp)) == NULL)
+                rc = RTPathGetCurrent(szTmp, sizeof(szTmp));
+                if (RT_FAILURE(rc))
                 {
-                    RTPrintf("tstPath: getcwd failed with errno=%d!\n", errno);
+                    RTPrintf("tstPath: RTPathGetCurrent failed with rc=%Rrc!\n", rc);
                     cErrors++;
                     break;