Changeset 28915 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Apr 29, 2010 6:12:35 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

60863

Message:

iprt: More path conversion avoidance.

Location:

trunk/src/VBox/Runtime/r3

Files:

• darwin/pathhost-darwin.cpp (modified) (2 diffs)
• darwin/rtProcInitExePath-darwin.cpp (modified) (1 diff)
• dir.cpp (modified) (1 diff)
• freebsd/rtProcInitExePath-freebsd.cpp (modified) (3 diffs)
• linux/rtProcInitExePath-linux.cpp (modified) (1 diff)
• os2/rtProcInitExePath-os2.cpp (modified) (1 diff)
• path.cpp (modified) (4 diffs)
• posix/dir-posix.cpp (modified) (8 diffs)
• posix/fileio-posix.cpp (modified) (3 diffs)
• posix/fs-posix.cpp (modified) (3 diffs)
• posix/path-posix.cpp (modified) (11 diffs)
• posix/pathhost-posix.cpp (modified) (3 diffs)
• solaris/rtProcInitExePath-solaris.cpp (modified) (1 diff)
• win/dir-win.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r3/darwin/pathhost-darwin.cpp

@@ -41 +41 @@
 
 
-int rtPathToNative(char **ppszNativePath, const char *pszPath)
+int rtPathToNative(const char **ppszNativePath, const char *pszPath, const char *pszBasePath)
 {
     /** @todo We should decompose the string here, but the file system will do
      *        that for us if we don't, so why bother. */
     *ppszNativePath = (char *)pszPath;
+    NOREF(pszBasePath); /* We don't query the FS for codeset preferences. */
     return VINF_SUCCESS;
 }
 
 
-int rtPathToNativeEx(char **ppszNativePath, const char *pszPath, const char *pszBasePath)
+void rtPathFreeNative(char const *pszNativePath, const char *pszPath)
 {
-    NOREF(pszBasePath);
-    return rtPathToNative(ppszNativePath, pszPath);
-}
-
-
-void rtPathFreeNative(char *pszNativePath, const char *pszPath)
-{
-    Assert((const char *)pszNativePath == pszPath || !pszNativePath);
+    Assert(pszNativePath == pszPath || !pszNativePath);
     NOREF(pszNativePath);
     NOREF(pszPath);
@@ -65 +59 @@
 
 
-int rtPathFromNative(char **ppszPath, const char *pszNativePath)
+int rtPathFromNative(char const **ppszPath, const char *pszNativePath, const char *pszBasePath)
 {
     /** @todo We must compose the codepoints in the string here.  We get file names
      *        in normalization form D so we'll end up with normalization form C
      *        whatever approach we take. */
-    return RTStrDupEx(ppszPath, pszNativePath);
+    int rc = RTStrValidateEncodingEx(pszNativePath, RTSTR_MAX, 0 /*fFlags*/);
+    if (RT_SUCCESS(rc))
+        *ppszPath = pszNativePath;
+    NOREF(pszBasePath); /* We don't query the FS for codeset preferences. */
+    return rc;
 }
 
 
-int rtPathFromNativeEx(char **ppszPath, const char *pszNativePath, const char *pszBasePath)
+void rtPathFreeIprt(const char *pszPath, const char *pszNativePath)
 {
-    NOREF(pszBasePath);
-    return rtPathFromNative(ppszPath, pszNativePath);
+    Assert(pszPath == pszNativePath || !pszPath);
+    NOREF(pszPath); NOREF(pszNativePath);
 }
 
+
+int rtPathFromNativeCopy(char *pszPath, size_t cbPath, const char *pszNativePath, const char *pszBasePath)
+{
+    /** @todo We must compose the codepoints in the string here.  We get file names
+     *        in normalization form D so we'll end up with normalization form C
+     *        whatever approach we take. */
+    int rc = RTStrValidateEncodingEx(pszNativePath, RTSTR_MAX, 0 /*fFlags*/);
+    if (RT_SUCCESS(rc))
+        rc = RTStrCopyEx(pszPath, cbPath, pszNativePath, RTSTR_MAX);
+    NOREF(pszBasePath); /* We don't query the FS for codeset preferences. */
+    return rc;
+}
+

trunk/src/VBox/Runtime/r3/darwin/rtProcInitExePath-darwin.cpp

@@ -49 +49 @@
     AssertReturn(pszImageName, VERR_INTERNAL_ERROR);
 
-    char *pszTmp;
-    int rc = rtPathFromNative(&pszTmp, pszImageName);
+    int rc = rtPathFromNativeCopy(pszPath, cchPath, pszImageName, NULL);
     AssertMsgRCReturn(rc, ("rc=%Rrc pszLink=\"%s\"\nhex: %.*Rhsx\n", rc, pszPath, strlen(pszImageName), pszPath), rc);
-
-    size_t cch = strlen(pszTmp);
-    AssertReturn(cch <= cchPath, VERR_BUFFER_OVERFLOW);
-
-    memcpy(pszPath, pszTmp, cch + 1);
-    RTStrFree(pszTmp);
 
     return VINF_SUCCESS;

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

@@ -648 +648 @@
      * Hand it over to the native part.
      */
-    rc = rtOpenDirNative(pDir, szRealPath);
+    rc = rtDirNativeOpen(pDir, szRealPath);
     if (RT_SUCCESS(rc))
         *ppDir = pDir;

trunk/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp

@@ -56 +56 @@
     if (sysctl(aiName, RT_ELEMENTS(aiName), pszPath, &cchExePath, NULL, 0) == 0)
     {
-
-        char *pszTmp = NULL;
-        int rc = rtPathFromNative(&pszTmp, pszPath);
+        const char *pszTmp;
+        int rc = rtPathFromNative(&pszTmp, pszPath, NULL);
         AssertMsgRCReturn(rc, ("rc=%Rrc pszPath=\"%s\"\nhex: %.*Rhsx\n", rc, pszPath, cchExePath, pszPath), rc);
-
-        size_t cch = strlen(pszTmp);
-        AssertReturn(cch <= cchPath, VERR_BUFFER_OVERFLOW);
-
-        memcpy(pszPath, pszTmp, cch + 1);
-        RTStrFree(pszTmp);
-
-        return VINF_SUCCESS;
+        if (pszTmp != pszPath)
+        {
+            rc = RTStrCopy(pszPath, cchPath, pszTmp);
+            rtPathFreeIprt(pszTmp, pszPath);
+        }
+        return rc;
     }
 
@@ -84 +81 @@
         pszPath[cchLink] = '\0';
 
-        char *pszTmp = NULL;
+        char const *pszTmp;
         int rc = rtPathFromNative(&pszTmp, pszPath);
         AssertMsgRCReturn(rc, ("rc=%Rrc pszLink=\"%s\"\nhex: %.*Rhsx\n", rc, pszPath, cchLink, pszPath), rc);
-
-        size_t cch = strlen(pszTmp);
-        AssertReturn(cch <= cchPath, VERR_BUFFER_OVERFLOW);
-
-        memcpy(pszPath, pszTmp, cch + 1);
-        RTStrFree(pszTmp);
-
-        return VINF_SUCCESS;
+        if (pszTmp != pszPath)
+        {
+            rc = RTStrCopy(pszPath, cchPath, pszTmp);
+            rtPathFreeIprt(pszTmp);
+        }
+        return rc;
     }
 
@@ -111 +106 @@
             if (*pszImageName == '/') /* this may not always be absolute, despite the docs. :-( */
             {
-                char *pszTmp = NULL;
-                int rc = rtPathFromNative(&pszTmp, pszImageName);
+                char const *pszTmp;
+                int rc = rtPathFromNative(&pszTmp, pszImageName, NULL);
                 AssertMsgRCReturn(rc, ("rc=%Rrc pszImageName=\"%s\"\n", rc, pszImageName), rc);
-
-                size_t cch = strlen(pszTmp);
-                AssertReturn(cch <= cchPath, VERR_BUFFER_OVERFLOW);
-
-                memcpy(pszPath, pszTmp, cch + 1);
-                RTStrFree(pszTmp);
-
-                return VINF_SUCCESS;
+                if (pszTmp != pszPath)
+                {
+                    rc = RTStrCopy(pszPath, cchPath, pszTmp);
+                    rtPathFreeIprt(pszTmp, pszPath);
+                }
+                return rc;
             }
             /** @todo Try search the PATH for the file name or append the current

trunk/src/VBox/Runtime/r3/linux/rtProcInitExePath-linux.cpp

@@ -50 +50 @@
         pszPath[cchLink] = '\0';
 
-        char *pszTmp = NULL;
-        int rc = rtPathFromNative(&pszTmp, pszPath);
+        char const *pszTmp;
+        int rc = rtPathFromNative(&pszTmp, pszPath, NULL);
         AssertMsgRCReturn(rc, ("rc=%Rrc pszLink=\"%s\"\nhex: %.*Rhsx\n", rc, pszPath, cchLink, pszPath), rc);
-
-        size_t cch = strlen(pszTmp);
-        AssertReturn(cch <= cchPath, VERR_BUFFER_OVERFLOW);
-
-        memcpy(pszPath, pszTmp, cch + 1);
-        RTStrFree(pszTmp);
-
-        return VINF_SUCCESS;
+        if (pszTmp != pszPath)
+        {
+            rc = RTStrCopy(pszPath, cchPath, pszTmp);
+            rtPathFreeIprt(pszTmp, pszPath);
+        }
+        return rc;
     }
 

trunk/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp

@@ -48 +48 @@
     _execname(pszPath, cchPath);
 
-    char *pszTmp;
-    int rc = rtPathFromNative(&pszTmp, pszPath);
+    char const *pszTmp;
+    int rc = rtPathFromNative(&pszTmp, pszPath, NULL);
     AssertMsgRCReturn(rc, ("rc=%Rrc pszLink=\"%s\"\nhex: %.*Rhsx\n", rc, pszPath, cchPath, pszPath), rc);
-
-    size_t cch = strlen(pszTmp);
-    AssertReturn(cch <= cchPath, VERR_BUFFER_OVERFLOW);
-
-    memcpy(pszPath, pszTmp, cch + 1);
-    RTStrFree(pszTmp);
-
-    return VINF_SUCCESS;
+    if (pszTmp != pszPath)
+    {
+        rc = RTStrCopy(pszPath, cchPath, pszTmp);
+        rtPathFreeIprt(pszTmp, pszPath);
+    }
+    return rc;
 }
 

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

@@ -71 +71 @@
 {
 #if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE)
-    char *pszUtf8Path;
-    int rc;
-    rc = rtPathFromNative(&pszUtf8Path, RTPATH_APP_PRIVATE);
-    if (RT_SUCCESS(rc))
-    {
-        size_t cchPathPrivateNoArch = strlen(pszUtf8Path);
-        if (cchPathPrivateNoArch < cchPath)
-            memcpy(pszPath, pszUtf8Path, cchPathPrivateNoArch + 1);
-        else
-            rc = VERR_BUFFER_OVERFLOW;
-        RTStrFree(pszUtf8Path);
-    }
-    return rc;
+    return RTStrCopyEx(pszPath, cchPath, RTPATH_APP_PRIVATE, RTSTR_MAX);
 #else
     return RTPathExecDir(pszPath, cchPath);
@@ -105 +93 @@
 {
 #if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE_ARCH)
-    char *pszUtf8Path;
-    int rc;
-    rc = rtPathFromNative(&pszUtf8Path, RTPATH_APP_PRIVATE_ARCH);
-    if (RT_SUCCESS(rc))
-    {
-        size_t cchPathPrivateArch = strlen(pszUtf8Path);
-        if (cchPathPrivateArch < cchPath)
-            memcpy(pszPath, pszUtf8Path, cchPathPrivateArch + 1);
-        else
-            rc = VERR_BUFFER_OVERFLOW;
-        RTStrFree(pszUtf8Path);
-    }
-    return rc;
+    return RTStrCopyEx(pszPath, cchPath, RTPATH_APP_PRIVATE_ARCH, RTSTR_MAX);
 #else
     return RTPathExecDir(pszPath, cchPath);
@@ -140 +116 @@
 {
 #if !defined(RT_OS_WINDOWS) && defined(RTPATH_SHARED_LIBS)
-    char *pszUtf8Path;
-    int rc;
-    rc = rtPathFromNative(&pszUtf8Path, RTPATH_SHARED_LIBS);
-    if (RT_SUCCESS(rc))
-    {
-        size_t cchPathSharedLibs = strlen(pszUtf8Path);
-        if (cchPathSharedLibs < cchPath)
-            memcpy(pszPath, pszUtf8Path, cchPathSharedLibs + 1);
-        else
-            rc = VERR_BUFFER_OVERFLOW;
-        RTStrFree(pszUtf8Path);
-    }
-    return rc;
+    return RTStrCopyEx(pszPath, cchPath, RTPATH_SHARED_LIBS, RTSTR_MAX);
 #else
     return RTPathExecDir(pszPath, cchPath);
@@ -173 +137 @@
 {
 #if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_DOCS)
-    char *pszUtf8Path;
-    int rc;
-    rc = rtPathFromNative(&pszUtf8Path, RTPATH_APP_DOCS);
-    if (RT_SUCCESS(rc))
-    {
-        size_t cchPathAppDocs = strlen(pszUtf8Path);
-        if (cchPathAppDocs < cchPath)
-            memcpy(pszPath, pszUtf8Path, cchPathAppDocs + 1);
-        else
-            rc = VERR_BUFFER_OVERFLOW;
-        RTStrFree(pszUtf8Path);
-    }
-    return rc;
+    return RTStrCopyEx(pszPath, cchPath, RTPATH_APP_DOCS, RTSTR_MAX);
 #else
     return RTPathExecDir(pszPath, cchPath);

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

@@ -62 +62 @@
 {
     bool fRc = false;
-    char *pszNativePath;
-    int rc = rtPathToNative(&pszNativePath, pszPath);
+    char const *pszNativePath;
+    int rc = rtPathToNative(&pszNativePath, pszPath, NULL);
     if (RT_SUCCESS(rc))
     {
@@ -84 +84 @@
     if (rtFsModeIsValidPermissions(fMode))
     {
-        char *pszNativePath;
-        rc = rtPathToNative(&pszNativePath, pszPath);
+        char const *pszNativePath;
+        rc = rtPathToNative(&pszNativePath, pszPath, NULL);
         if (RT_SUCCESS(rc))
         {
@@ -124 +124 @@
 RTDECL(int) RTDirRemove(const char *pszPath)
 {
-    char *pszNativePath;
-    int rc = rtPathToNative(&pszNativePath, pszPath);
+    char const *pszNativePath;
+    int rc = rtPathToNative(&pszNativePath, pszPath, NULL);
     if (RT_SUCCESS(rc))
     {
@@ -174 +174 @@
 
 
-int rtOpenDirNative(PRTDIR pDir, char *pszPathBuf)
+int rtDirNativeOpen(PRTDIR pDir, char *pszPathBuf)
 {
     /*
      * Convert to a native path and try opendir.
      */
-    char *pszNativePath;
-    int rc = rtPathToNative(&pszNativePath, pDir->pszPath);
+    char const *pszNativePath;
+    int rc = rtPathToNative(&pszNativePath, pDir->pszPath, NULL);
     if (RT_SUCCESS(rc))
     {
@@ -267 +267 @@
         if (!pDir->pszName)
         {
-            int rc = rtPathFromNativeEx(&pDir->pszName, pDir->Data.d_name, pDir->pszPath);
+            int rc = rtPathFromNative(&pDir->pszName, pDir->Data.d_name, pDir->pszPath);
             if (RT_FAILURE(rc))
             {
@@ -278 +278 @@
             ||  pDir->pfnFilter(pDir, pDir->pszName))
             break;
-        RTStrFree(pDir->pszName);
+        rtPathFreeIprt(pDir->pszName, pDir->Data.d_name);
         pDir->pszName = NULL;
 #else
@@ -377 +377 @@
             pDir->fDataUnread  = false;
 #ifndef RT_DONT_CONVERT_FILENAMES
-            RTStrFree(pDir->pszName);
+            rtPathFreeIprt(pDir->pszName, pDir->Data.d_name);
             pDir->pszName = NULL;
 #endif
@@ -502 +502 @@
             pDir->fDataUnread  = false;
 #ifndef RT_DONT_CONVERT_FILENAMES
-            RTStrFree(pDir->pszName);
+            rtPathFreeIprt(pDir->pszName, pDir->Data.d_name);
             pDir->pszName = NULL;
 #endif

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

@@ -92 +92 @@
 {
     bool fRc = false;
-    char *pszNativePath;
-    int rc = rtPathToNative(&pszNativePath, pszPath);
+    char const *pszNativePath;
+    int rc = rtPathToNative(&pszNativePath, pszPath, NULL);
     if (RT_SUCCESS(rc))
     {
@@ -205 +205 @@
     int iErr = errno;
 #else
-    char *pszNativeFilename;
-    rc = rtPathToNative(&pszNativeFilename, pszFilename);
+    char const *pszNativeFilename;
+    rc = rtPathToNative(&pszNativeFilename, pszFilename, NULL);
     if (RT_FAILURE(rc))
         return (rc);
@@ -372 +372 @@
 RTR3DECL(int)  RTFileDelete(const char *pszFilename)
 {
-    char *pszNativeFilename;
-    int rc = rtPathToNative(&pszNativeFilename, pszFilename);
+    char const *pszNativeFilename;
+    int rc = rtPathToNative(&pszNativeFilename, pszFilename, NULL);
     if (RT_SUCCESS(rc))
     {

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

@@ -56 +56 @@
      * Convert the path and query the information.
      */
-    char *pszNativeFsPath;
-    int rc = rtPathToNative(&pszNativeFsPath, pszFsPath);
+    char const *pszNativeFsPath;
+    int rc = rtPathToNative(&pszNativeFsPath, pszFsPath, NULL);
     if (RT_SUCCESS(rc))
     {
@@ -103 +103 @@
      * We're simply return the device id.
      */
-    char *pszNativeFsPath;
-    int rc = rtPathToNative(&pszNativeFsPath, pszFsPath);
+    char const *pszNativeFsPath;
+    int rc = rtPathToNative(&pszNativeFsPath, pszFsPath, NULL);
     if (RT_SUCCESS(rc))
     {
@@ -134 +134 @@
      * Convert the path and query the information.
      */
-    char *pszNativeFsPath;
-    int rc = rtPathToNative(&pszNativeFsPath, pszFsPath);
+    char const *pszNativeFsPath;
+    int rc = rtPathToNative(&pszNativeFsPath, pszFsPath, NULL);
     if (RT_SUCCESS(rc))
     {

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

@@ -62 +62 @@
      * Convert input.
      */
-    char *pszNativePath;
-    int rc = rtPathToNative(&pszNativePath, pszPath);
+    char const *pszNativePath;
+    int rc = rtPathToNative(&pszNativePath, pszPath, NULL);
     if (RT_SUCCESS(rc))
     {
@@ -73 +73 @@
         const char *psz = realpath(pszNativePath, szTmpPath);
         if (psz)
-        {
-            /*
-             * Convert result and copy it to the return buffer.
-             */
-            char *pszUtf8RealPath;
-            rc = rtPathFromNative(&pszUtf8RealPath, szTmpPath);
-            if (RT_SUCCESS(rc))
-            {
-                size_t cch = strlen(pszUtf8RealPath) + 1;
-                if (cch <= cchRealPath)
-                    memcpy(pszRealPath, pszUtf8RealPath, cch);
-                else
-                    rc = VERR_BUFFER_OVERFLOW;
-                RTStrFree(pszUtf8RealPath);
-            }
-        }
+            rc = rtPathFromNativeCopy(pszRealPath, cchRealPath, szTmpPath, NULL);
         else
             rc = RTErrConvertFromErrno(errno);
@@ -360 +345 @@
      * Convert it to UTF-8 and copy it to the return buffer.
      */
-    char *pszUtf8Path;
-    rc = rtPathFromNative(&pszUtf8Path, pPasswd->pw_dir);
-    if (RT_SUCCESS(rc))
-    {
-        size_t cchHome = strlen(pszUtf8Path);
-        if (cchHome < cchPath)
-            memcpy(pszPath, pszUtf8Path, cchHome + 1);
-        else
-            rc = VERR_BUFFER_OVERFLOW;
-        RTStrFree(pszUtf8Path);
-    }
-    return rc;
+    return rtPathFromNativeCopy(pszPath, cchPath, pPasswd->pw_dir, NULL);
 }
 #endif
@@ -389 +363 @@
      * Get HOME env. var it and validate it's existance.
      */
-    int rc = VERR_PATH_NOT_FOUND;
-    const char *pszHome = RTEnvGet("HOME");
+    int         rc      = VERR_PATH_NOT_FOUND;
+    const char *pszHome = RTEnvGet("HOME"); /** @todo Codeset confusion in RTEnv. */
     if (pszHome)
 
@@ -397 +371 @@
         if (    !stat(pszHome, &st)
             &&  S_ISDIR(st.st_mode))
-        {
-            /*
-             * Convert it to UTF-8 and copy it to the return buffer.
-             */
-            char *pszUtf8Path;
-            rc = rtPathFromNative(&pszUtf8Path, pszHome);
-            if (RT_SUCCESS(rc))
-            {
-                size_t cchHome = strlen(pszUtf8Path);
-                if (cchHome < cchPath)
-                    memcpy(pszPath, pszUtf8Path, cchHome + 1);
-                else
-                    rc = VERR_BUFFER_OVERFLOW;
-                RTStrFree(pszUtf8Path);
-            }
-        }
+            rc = rtPathFromNativeCopy(pszPath, cchPath, pszHome, NULL);
     }
     return rc;
@@ -480 +439 @@
      * Convert the filename.
      */
-    char *pszNativePath;
-    int rc = rtPathToNative(&pszNativePath, pszPath);
+    char const *pszNativePath;
+    int rc = rtPathToNative(&pszNativePath, pszPath, NULL);
     if (RT_SUCCESS(rc))
     {
@@ -545 +504 @@
      * Convert the paths.
      */
-    char *pszNativePath;
-    int rc = rtPathToNative(&pszNativePath, pszPath);
+    char const *pszNativePath;
+    int rc = rtPathToNative(&pszNativePath, pszPath, NULL);
     if (RT_SUCCESS(rc))
     {
@@ -663 +622 @@
      * Convert the paths.
      */
-    char *pszNativeSrc;
-    int rc = rtPathToNative(&pszNativeSrc, pszSrc);
+    char const *pszNativeSrc;
+    int rc = rtPathToNative(&pszNativeSrc, pszSrc, NULL);
     if (RT_SUCCESS(rc))
     {
-        char *pszNativeDst;
-        rc = rtPathToNative(&pszNativeDst, pszDst);
+        char const *pszNativeDst;
+        rc = rtPathToNative(&pszNativeDst, pszDst, NULL);
         if (RT_SUCCESS(rc))
         {
@@ -836 +795 @@
      * Convert the path and check if it exists using stat().
      */
-    char *pszNativePath;
-    int rc = rtPathToNative(&pszNativePath, pszPath);
+    char const *pszNativePath;
+    int rc = rtPathToNative(&pszNativePath, pszPath, NULL);
     if (RT_SUCCESS(rc))
     {
@@ -860 +819 @@
     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);
-        }
-    }
+        rc = rtPathFromNativeCopy(pszPath, cchPath, szNativeCurDir, NULL);
     else
         rc = RTErrConvertFromErrno(errno);
@@ -894 +837 @@
      * Change the directory.
      */
-    char *pszNativePath;
-    int rc = rtPathToNative(&pszNativePath, pszPath);
+    char const *pszNativePath;
+    int rc = rtPathToNative(&pszNativePath, pszPath, NULL);
     if (RT_SUCCESS(rc))
     {

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

@@ -177 +177 @@
 
 
-int rtPathToNative(char **ppszNativePath, const char *pszPath)
+int rtPathToNative(char const **ppszNativePath, const char *pszPath, const char *pszBasePath)
 {
     *ppszNativePath = NULL;
@@ -185 +185 @@
     {
         if (g_fPassthruUtf8 || !*pszPath)
-            *ppszNativePath = (char *)pszPath;
+            *ppszNativePath = pszPath;
         else
             rc = rtStrConvert(pszPath, strlen(pszPath), "UTF-8",
-                              ppszNativePath, 0, g_szFsCodeset,
+                              (char **)ppszNativePath, 0, g_szFsCodeset,
                               2, g_enmUtf8ToFsIdx);
     }
+    NOREF(pszBasePath); /* We don't query the FS for codeset preferences. */
     return rc;
 }
 
 
-int rtPathToNativeEx(char **ppszNativePath, const char *pszPath, const char *pszBasePath)
-{
-    /* We don't query the FS for codeset preferences yet, so nothing special to do here. */
-    NOREF(pszBasePath);
-    return rtPathToNative(ppszNativePath, pszPath);
-}
-
-
-void rtPathFreeNative(char *pszNativePath, const char *pszPath)
+void rtPathFreeNative(char const *pszNativePath, const char *pszPath)
 {
     if (    pszNativePath != pszPath
         &&  pszNativePath)
-        RTStrFree(pszNativePath);
-}
-
-
-int rtPathFromNative(char **ppszPath, const char *pszNativePath)
+        RTStrFree((char *)pszNativePath);
+}
+
+
+int rtPathFromNative(const char **ppszPath, const char *pszNativePath, const char *pszBasePath)
 {
     *ppszPath = NULL;
@@ -235 +228 @@
         else
             rc = rtStrConvert(pszNativePath, strlen(pszNativePath), g_szFsCodeset,
-                              ppszPath, 0, "UTF-8",
+                              (char **)ppszPath, 0, "UTF-8",
                               2, g_enmFsToUtf8Idx);
     }
+    NOREF(pszBasePath); /* We don't query the FS for codeset preferences. */
     return rc;
 }
 
 
-int rtPathFromNativeEx(char **ppszPath, const char *pszNativePath, const char *pszBasePath)
-{
-    /* We don't query the FS for codeset preferences yet, so nothing special to do here. */
-    NOREF(pszBasePath);
-    return rtPathFromNative(ppszPath, pszNativePath);
-}
-
+void rtPathFreeIprt(const char *pszPath, const char *pszNativePath)
+{
+    if (   pszPath != pszNativePath
+        && !pszPath)
+        RTStrFree((char *)pszPath);
+}
+
+
+int rtPathFromNativeCopy(char *pszPath, size_t cbPath, const char *pszNativePath, const char *pszBasePath)
+{
+    int rc = RTOnce(&g_OnceInitPathConv, rtPathConvInitOnce, NULL, NULL);
+    if (RT_SUCCESS(rc))
+    {
+        if (g_fPassthruUtf8 || !*pszNativePath)
+            rc = RTStrCopyEx(pszPath, cbPath, pszNativePath, RTSTR_MAX);
+        else if (cbPath)
+            rc = rtStrConvert(pszNativePath, strlen(pszNativePath), g_szFsCodeset,
+                              &pszPath, cbPath, "UTF-8",
+                              2, g_enmFsToUtf8Idx);
+        else
+            rc = VERR_BUFFER_OVERFLOW;
+    }
+
+    NOREF(pszBasePath); /* We don't query the FS for codeset preferences. */
+    return rc;
+}
+

trunk/src/VBox/Runtime/r3/solaris/rtProcInitExePath-solaris.cpp

@@ -52 +52 @@
         pszPath[cchLink] = '\0';
 
-        char *pszTmp = NULL;
-        int rc = rtPathFromNative(&pszTmp, pszPath);
+        char const *pszTmp;
+        int rc = rtPathFromNative(&pszTmp, pszPath, NULL);
         AssertMsgRCReturn(rc, ("rc=%Rrc pszLink=\"%s\"\nhex: %.*Rhsx\n", rc, pszPath, cchLink, pszPath), rc);
-
-        size_t cch = strlen(pszTmp);
-        AssertReturn(cch <= cchPath, VERR_BUFFER_OVERFLOW);
-
-        memcpy(pszPath, pszTmp, cch + 1);
-        RTStrFree(pszTmp);
-
-        return VINF_SUCCESS;
+        if (pszTmp != pszPath)
+        {
+            rc = RTStrCopy(pszPath, cchPath, pszTmp);
+            rtPathFreeIprt(pszTmp, pszPath);
+        }
+        return rc;
     }
 

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

@@ -130 +130 @@
 
 
-int rtOpenDirNative(PRTDIR pDir, char *pszPathBuf)
+int rtDirNativeOpen(PRTDIR pDir, char *pszPathBuf)
 {
     /*