Changeset 78104 in vbox

Timestamp:

Apr 10, 2019 5:33:18 PM (6 years ago)

Author:

vboxsync

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

129960

Message:

IPRT,*: Added fFlags to RTPathAbsExDup so it matches the new RTPAthAbsEx. bugref:9172

Location:

trunk

Files:

• include/iprt/path.h (modified) (1 diff)
• src/VBox/Devices/Network/slirp/tftp.c (modified) (1 diff)
• src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (4 diffs)
• src/VBox/Runtime/common/path/RTPathAbsExDup.cpp (modified) (3 diffs)
• src/bldprogs/scm.cpp (modified) (1 diff)

trunk/include/iprt/path.h

@@ -365 +365 @@
  * Same as RTPathAbsEx only the result is RTStrDup()'ed.
  *
- * @returns Pointer to the absolute path. Use RTStrFree() to free this string.
- * @returns NULL if RTPathAbsEx() or RTStrDup() fails.
+ * @returns Pointer to the absolute path.  Use RTStrFree() to free this string.
+ * @retval  NULL if RTPathAbsEx() or RTStrDup() fails.
+ *
  * @param   pszBase         The base path to act like a current directory.
  *                          When NULL, the actual cwd is used (i.e. the call
  *                          is equivalent to RTPathAbs(pszPath, ...).
  * @param   pszPath         The path to resolve.
- *
- * @note    Current implementation is buggy and will remove trailing slashes
- *          that would normally specify a directory.  Don't depend on this.
- */
-RTDECL(char *) RTPathAbsExDup(const char *pszBase, const char *pszPath);
+ * @param   fFlags          One of the RTPATH_STR_F_STYLE_XXX flags combined
+ *                          with any of the RTPATHABS_F_XXX ones.  Most
+ *                          users will pass RTPATH_STR_F_STYLE_HOST (0).
+ */
+RTDECL(char *) RTPathAbsExDup(const char *pszBase, const char *pszPath, uint32_t fFlags);
 
 /**

trunk/src/VBox/Devices/Network/slirp/tftp.c

@@ -142 +142 @@
     else
     {
-        char *pszFullPathAbs = RTPathAbsExDup(tftp_prefix, (const char*)pcTftpSession->pszFilename);
+        char *pszFullPathAbs = RTPathAbsExDup(tftp_prefix, (const char *)pcTftpSession->pszFilename, RTPATH_STR_F_STYLE_HOST);
 
         if (   !pszFullPathAbs

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

@@ -19 +19 @@
 #include <iprt/alloca.h>
 #include <iprt/path.h>
+#include <iprt/cpp/path.h>
 #include <iprt/dir.h>
 #include <iprt/file.h>
@@ -2394 +2395 @@
  * @param pTargetMedium out: The newly created target medium. This also gets pushed on stack.llHardDisksCreated for cleanup.
  * @param stack
+ *
+ * @throws HRESULT
  */
 void Appliance::i_importOneDiskImage(const ovf::DiskImage &di,
@@ -2401 +2404 @@
 {
     HRESULT rc;
-    char *pszAbsDstPath = RTPathAbsExDup(stack.strMachineFolder.c_str(),
-                                         strDstPath.c_str());
-    Utf8Str strAbsDstPath(pszAbsDstPath);
-    RTStrFree(pszAbsDstPath);
-    pszAbsDstPath = NULL;
+
+    Utf8Str strAbsDstPath;
+    int vrc = RTPathAbsExCxx(strAbsDstPath, stack.strMachineFolder, strDstPath);
+    AssertRCStmt(vrc, throw Global::vboxStatusCodeToCOM(vrc));
 
     /* Get the system properties. */
@@ -2432 +2434 @@
      * the current code can't possibly handle. */
     RTUUID uuid;
-    int vrc = RTUuidFromStr(&uuid, strDstPath.c_str());
+    vrc = RTUuidFromStr(&uuid, strDstPath.c_str());
     if (vrc == VINF_SUCCESS)
     {

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

@@ -37 +37 @@
 
 
-/**
- * Same as RTPathAbsEx only the result is RTStrDup()'ed.
- *
- * @returns Pointer to the absolute path. Use RTStrFree() to free this string.
- * @returns NULL if RTPathAbsEx() or RTStrDup() fails.
- * @param   pszBase         The base path to act like a current directory.
- *                          When NULL, the actual cwd is used (i.e. the call
- *                          is equivalent to RTPathAbs(pszPath, ...).
- * @param   pszPath         The path to resolve.
- */
-RTDECL(char *) RTPathAbsExDup(const char *pszBase, const char *pszPath)
+RTDECL(char *) RTPathAbsExDup(const char *pszBase, const char *pszPath, uint32_t fFlags)
 {
     char szPath[RTPATH_MAX];
     size_t cbPath = sizeof(szPath);
-    int rc = RTPathAbsEx(pszBase, pszPath, RTPATH_STR_F_STYLE_HOST, szPath, &cbPath);
+    int rc = RTPathAbsEx(pszBase, pszPath, fFlags, szPath, &cbPath);
     if (RT_SUCCESS(rc))
         return RTStrDup(szPath);
@@ -58 +48 @@
     {
         size_t   cbPrevPath = sizeof(szPath);
-        uint32_t cTries = 6;
+        uint32_t cTries = 8;
         while (cTries-- > 0)
         {
@@ -66 +56 @@
             if (pszAbsPath)
             {
-                rc = RTPathAbsEx(pszBase, pszPath, RTPATH_STR_F_STYLE_HOST, pszAbsPath, &cbPath);
+                rc = RTPathAbsEx(pszBase, pszPath, fFlags, pszAbsPath, &cbPath);
                 if (RT_SUCCESS(rc))
                     return pszAbsPath;

trunk/src/bldprogs/scm.cpp

@@ -1105 +1105 @@
                     if (pszDir)
                     {
-                        pSettings->pszGuardRelativeToDir = RTPathAbsExDup(pszDir, pValueUnion->psz);
+                        pSettings->pszGuardRelativeToDir = RTPathAbsExDup(pszDir, pValueUnion->psz, RTPATH_STR_F_STYLE_HOST);
                         RTStrFree(pszDir);
                         if (pSettings->pszGuardRelativeToDir)