Changeset 78090 in vbox

Timestamp:

Apr 10, 2019 2:19:04 PM (6 years ago)

Author:

vboxsync

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

129946

Message:

*,IPRT: Use new RTPathAbsExEx function instead of RTPathAbsEx. bugref:9172

Location:

trunk/src/VBox

Files:

• HostServices/SharedFolders/vbsfpathabs.cpp (modified) (2 diffs)
• Main/src-all/SharedFolderImpl.cpp (modified) (1 diff)
• Main/src-client/ConsoleImpl.cpp (modified) (1 diff)
• Main/src-server/MachineImpl.cpp (modified) (1 diff)
• Main/src-server/VirtualBoxImpl.cpp (modified) (1 diff)
• Runtime/common/path/RTPathAbsEx.cpp (modified) (1 diff)
• Runtime/common/path/RTPathAbsExDup.cpp (modified) (1 diff)
• Runtime/generic/RTPathAbs-generic.cpp (modified) (1 diff)
• Runtime/r3/generic/dirrel-r3-generic.cpp (modified) (1 diff)
• Runtime/r3/nt/dirrel-r3-nt.cpp (modified) (1 diff)
• Runtime/testcase/tstRTPath.cpp (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedFolders/vbsfpathabs.cpp

@@ -97 +97 @@
 {
 #if defined(RT_OS_WINDOWS)
+    /** @todo This code is not needed in 6.0 and later as IPRT translates paths
+     *        to \\.\ format if they're too long.  */
     const char *pszPathStart = pszRoot? pszRoot: pszPath;
 
@@ -182 +184 @@
 
     /* Fallback for the common paths. */
-    return RTPathAbsEx(pszRoot, pszPath, pszAbsPath, cbAbsPath);
+
+    return RTPathAbsExEx(pszRoot, pszPath, RTPATH_STR_F_STYLE_HOST, pszAbsPath, &cbAbsPath);
 }

trunk/src/VBox/Main/src-all/SharedFolderImpl.cpp

@@ -283 +283 @@
         /* Check whether the path is full (absolute) */
         char hostPathFull[RTPATH_MAX];
-        int vrc = RTPathAbsEx(NULL,
-                              hostPath.c_str(),
-                              hostPathFull,
-                              sizeof (hostPathFull));
+        int vrc = RTPathAbs(hostPath.c_str(),
+                            hostPathFull,
+                            sizeof(hostPathFull));
         if (RT_FAILURE(vrc))
             return setErrorBoth(E_INVALIDARG, vrc, tr("Invalid shared folder path: '%s' (%Rrc)"), hostPath.c_str(), vrc);

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -8664 +8664 @@
      */
     char szAbsHostPath[RTPATH_MAX];
-    int vrc = RTPathAbsEx(NULL, aData.m_strHostPath.c_str(), szAbsHostPath, sizeof(szAbsHostPath));
+    int vrc = RTPathAbs(aData.m_strHostPath.c_str(), szAbsHostPath, sizeof(szAbsHostPath));
     if (RT_FAILURE(vrc))
         return setErrorBoth(E_INVALIDARG, vrc, tr("Invalid shared folder path: '%s' (%Rrc)"), aData.m_strHostPath.c_str(), vrc);

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -7258 +7258 @@
 
     strSettingsDir.stripFilename();
-    char folder[RTPATH_MAX];
-    int vrc = RTPathAbsEx(strSettingsDir.c_str(), strPath.c_str(), folder, sizeof(folder));
+    char szFolder[RTPATH_MAX];
+    size_t cbFolder = sizeof(szFolder);
+    int vrc = RTPathAbsExEx(strSettingsDir.c_str(), strPath.c_str(), RTPATH_STR_F_STYLE_HOST, szFolder, &cbFolder);
     if (RT_SUCCESS(vrc))
-        aResult = folder;
+        aResult = szFolder;
 
     return vrc;

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -4010 +4010 @@
     AssertComRCReturn(autoCaller.rc(), VERR_GENERAL_FAILURE);
 
-    /* no need to lock since mHomeDir is const */
-
-    char folder[RTPATH_MAX];
-    int vrc = RTPathAbsEx(m->strHomeDir.c_str(),
-                          strPath.c_str(),
-                          folder,
-                          sizeof(folder));
+    /* no need to lock since strHomeDir is const */
+
+    char szFolder[RTPATH_MAX];
+    size_t cbFolder = sizeof(szFolder);
+    int vrc = RTPathAbsExEx(m->strHomeDir.c_str(),
+                            strPath.c_str(),
+                            RTPATH_STR_F_STYLE_HOST,
+                            szFolder,
+                            &cbFolder);
     if (RT_SUCCESS(vrc))
-        aResult = folder;
+        aResult = szFolder;
 
     return vrc;

trunk/src/VBox/Runtime/common/path/RTPathAbsEx.cpp

@@ -53 +53 @@
 RTDECL(int) RTPathAbsEx(const char *pszBase, const char *pszPath, char *pszAbsPath, size_t cbAbsPath)
 {
-#if 1
+#if 0
     if (    pszBase
         &&  pszPath

trunk/src/VBox/Runtime/common/path/RTPathAbsExDup.cpp

@@ -50 +50 @@
 {
     char szPath[RTPATH_MAX];
-    int rc = RTPathAbsEx(pszBase, pszPath, szPath, sizeof(szPath));
+    size_t cbPath = sizeof(szPath);
+    int rc = RTPathAbsExEx(pszBase, pszPath, RTPATH_STR_F_STYLE_HOST, szPath, &cbPath);
     if (RT_SUCCESS(rc))
         return RTStrDup(szPath);
+
+    if (rc == VERR_BUFFER_OVERFLOW)
+    {
+        size_t   cbPrevPath = sizeof(szPath);
+        uint32_t cTries = 6;
+        while (cTries-- > 0)
+        {
+            cbPath     = RT_MAX(RT_ALIGN_Z(cbPath + 16, 64), cbPrevPath + 256);
+            cbPrevPath = cbPath;
+            char *pszAbsPath = (char *)RTStrAlloc(cbPath);
+            if (pszAbsPath)
+            {
+                rc = RTPathAbsExEx(pszBase, pszPath, RTPATH_STR_F_STYLE_HOST, pszAbsPath, &cbPath);
+                if (RT_SUCCESS(rc))
+                    return pszAbsPath;
+                RTStrFree(pszAbsPath);
+            }
+            else
+                break;
+        }
+    }
     return NULL;
 }

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

@@ -40 +40 @@
 #include "internal/fs.h"
 
-#if 1
+#if 0
 
 static char *rtPathSkipRootSpec(char *pszCur)

trunk/src/VBox/Runtime/r3/generic/dirrel-r3-generic.cpp

@@ -84 +84 @@
      * This ASSUMES that pThis->pszPath is an absolute path.
      */
-    int rc = RTPathAbsEx(pThis->pszPath, pszRelPath, pszPathDst, cbPathDst);
+    int rc = RTPathAbsExEx(pThis->pszPath, pszRelPath, RTPATH_STR_F_STYLE_HOST, pszPathDst, &cbPathDst);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/Runtime/r3/nt/dirrel-r3-nt.cpp

@@ -95 +95 @@
      * This ASSUMES that pThis->pszPath is an absolute path.
      */
-    int rc = RTPathAbsEx(pThis->pszPath, pszRelPath, pszPathDst, cbPathDst);
+    int rc = RTPathAbsExEx(pThis->pszPath, pszRelPath, RTPATH_STR_F_STYLE_HOST, pszPathDst, &cbPathDst);
     if (RT_SUCCESS(rc))
     {

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

@@ -267 +267 @@
 
 
+#if 0
     /*
      * RTPathAbsEx
@@ -398 +399 @@
         }
     }
+#endif
 
     /*