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

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.

File:

• trunk/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp (modified) (3 diffs)

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