Changeset 78098 in vbox

Timestamp:

Apr 10, 2019 3:51:59 PM (5 years ago)

Author:

vboxsync

Message:

IPRT,*: Cleaning up RTPathAbsExEx, renaming it to RTPathAbsEx and removing dead code. bugref:9172

Location:

trunk

Files:

• include/iprt/mangling.h (modified) (1 diff)
• include/iprt/path.h (modified) (2 diffs)
• src/VBox/HostServices/SharedFolders/vbsfpathabs.cpp (modified) (1 diff)
• src/VBox/Main/src-server/MachineImpl.cpp (modified) (1 diff)
• src/VBox/Main/src-server/VirtualBoxImpl.cpp (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (13 diffs)
• src/VBox/Runtime/common/path/RTPathAbsEx.cpp (moved) (moved from trunk/src/VBox/Runtime/common/path/RTPathAbsExEx.cpp ) (16 diffs)
• src/VBox/Runtime/common/path/RTPathAbsExDup.cpp (modified) (2 diffs)
• src/VBox/Runtime/generic/RTPathAbs-generic.cpp (deleted)
• src/VBox/Runtime/r3/generic/dirrel-r3-generic.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/nt/dirrel-r3-nt.cpp (modified) (1 diff)
• src/VBox/Runtime/testcase/tstRTPath.cpp (modified) (2 diffs)

trunk/include/iprt/mangling.h

@@ -1600 +1600 @@
 # define RTPathAbsDup                                   RT_MANGLER(RTPathAbsDup)
 # define RTPathAbsEx                                    RT_MANGLER(RTPathAbsEx)
-# define RTPathAbsExEx                                  RT_MANGLER(RTPathAbsExEx)
 # define RTPathAbsExDup                                 RT_MANGLER(RTPathAbsExDup)
 # define RTPathAppDocs                                  RT_MANGLER(RTPathAppDocs)

trunk/include/iprt/path.h

@@ -332 +332 @@
 /**
  * Get the absolute path (no symlinks, no . or .. components), assuming the
- * given base path as the current directory. The resulting path doesn't have
- * to exist.
- *
- * @returns iprt status code.
- * @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.
- * @param   pszAbsPath      Where to store the absolute path.
- * @param   cbAbsPath       Size of the buffer.
- *
- * @note    Current implementation is buggy and will remove trailing slashes
- *          that would normally specify a directory.  Don't depend on this.
- */
-RTDECL(int) RTPathAbsEx(const char *pszBase, const char *pszPath, char *pszAbsPath, size_t cbAbsPath);
-
-/**
- * Get the absolute path (no symlinks, no . or .. components), assuming the
  * given base path as the current directory.
  *
@@ -369 +351 @@
  *                          failures.
  */
-RTDECL(int) RTPathAbsExEx(const char *pszBase, const char *pszPath, uint32_t fFlags, char *pszAbsPath, size_t *pcbAbsPath);
+RTDECL(int) RTPathAbsEx(const char *pszBase, const char *pszPath, uint32_t fFlags, char *pszAbsPath, size_t *pcbAbsPath);
 
 /** @name RTPATHABS_F_XXX - Flags for RTPathAbsEx.

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

@@ -185 +185 @@
     /* Fallback for the common paths. */
 
-    return RTPathAbsExEx(pszRoot, pszPath, RTPATH_STR_F_STYLE_HOST, pszAbsPath, &cbAbsPath);
+    return RTPathAbsEx(pszRoot, pszPath, RTPATH_STR_F_STYLE_HOST, pszAbsPath, &cbAbsPath);
 }

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

@@ -7260 +7260 @@
     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);
+    int vrc = RTPathAbsEx(strSettingsDir.c_str(), strPath.c_str(), RTPATH_STR_F_STYLE_HOST, szFolder, &cbFolder);
     if (RT_SUCCESS(vrc))
         aResult = szFolder;

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

@@ -4014 +4014 @@
     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);
+    int vrc = RTPathAbsEx(m->strHomeDir.c_str(),
+                          strPath.c_str(),
+                          RTPATH_STR_F_STYLE_HOST,
+                          szFolder,
+                          &cbFolder);
     if (RT_SUCCESS(vrc))
         aResult = szFolder;

trunk/src/VBox/Runtime/Makefile.kmk

@@ -512 +512 @@
         common/path/RTPathAbsEx.cpp \
         common/path/RTPathAbsExDup.cpp \
-        common/path/RTPathAbsExEx.cpp \
         common/path/RTPathAppend.cpp \
         common/path/RTPathAppendEx.cpp \
@@ -827 +826 @@
         generic/RTMpGetCurFrequency-generic.cpp \
         generic/RTMpGetMaxFrequency-generic.cpp \
-        generic/RTPathAbs-generic.cpp \
         generic/RTRandAdvCreateSystemFaster-generic.cpp \
         generic/RTRandAdvCreateSystemTruer-generic.cpp \
@@ -917 +915 @@
         generic/RTFileMove-generic.cpp \
         generic/RTLogWriteDebugger-generic.cpp \
-        generic/RTPathAbs-generic.cpp \
         generic/RTPathGetCurrentOnDrive-generic.cpp \
         generic/RTProcDaemonize-generic.cpp \
@@ -1024 +1021 @@
         generic/RTFileSetAllocationSize-generic.cpp \
         generic/RTLogWriteDebugger-generic.cpp \
-        generic/RTPathAbs-generic.cpp \
         generic/RTPathGetCurrentOnDrive-generic.cpp \
         generic/RTProcDaemonize-generic.cpp \
@@ -1106 +1102 @@
         generic/RTFileSetAllocationSize-generic.cpp \
         generic/RTLogWriteDebugger-generic.cpp \
-        generic/RTPathAbs-generic.cpp \
         generic/RTPathGetCurrentOnDrive-generic.cpp \
         generic/RTProcDaemonize-generic.cpp \
@@ -1192 +1187 @@
         generic/RTFileSetAllocationSize-generic.cpp \
         generic/RTLogWriteDebugger-generic.cpp \
-        generic/RTPathAbs-generic.cpp \
         generic/RTPathGetCurrentOnDrive-generic.cpp \
         generic/RTSemEventMultiWait-2-ex-generic.cpp \
@@ -1275 +1269 @@
         generic/RTFileMove-generic.cpp \
         generic/RTLogWriteDebugger-generic.cpp \
-        generic/RTPathAbs-generic.cpp \
         generic/RTSemEventMultiWait-2-ex-generic.cpp \
         generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp \
@@ -1357 +1350 @@
         generic/RTFileMove-generic.cpp \
         generic/RTLogWriteDebugger-generic.cpp \
-        generic/RTPathAbs-generic.cpp \
         generic/RTPathGetCurrentOnDrive-generic.cpp \
         generic/RTProcDaemonize-generic.cpp \
@@ -1454 +1446 @@
         generic/RTFileSetAllocationSize-generic.cpp \
         generic/RTLogWriteDebugger-generic.cpp \
-        generic/RTPathAbs-generic.cpp \
         generic/RTPathGetCurrentOnDrive-generic.cpp \
         generic/RTProcDaemonize-generic.cpp \
@@ -1707 +1698 @@
         common/path/RTPathAbsEx.cpp \
         common/path/RTPathAbsExDup.cpp \
-        common/path/RTPathAbsExEx.cpp \
         common/path/RTPathAppend.cpp \
         common/path/RTPathAppendEx.cpp \
@@ -1888 +1878 @@
         generic/RTFileExists-generic.cpp \
         generic/RTFileSetAllocationSize-generic.cpp \
-        generic/RTPathAbs-generic.cpp \
         generic/RTRandAdvCreateSystemFaster-generic.cpp \
         generic/RTRandAdvCreateSystemTruer-generic.cpp \
@@ -1957 +1946 @@
         generic/RTFileSetAllocationSize-generic.cpp \
         generic/RTLogWriteDebugger-generic.cpp \
-        generic/RTPathAbs-generic.cpp \
         generic/RTPathGetCurrentOnDrive-generic.cpp \
         generic/RTRandAdvCreateSystemFaster-generic.cpp \
@@ -2720 +2708 @@
         common/path/RTPathAbsEx.cpp \
         common/path/RTPathAbsExDup.cpp \
-        common/path/RTPathAbsExEx.cpp \
         common/path/RTPathAppend.cpp \
         common/path/RTPathAppendEx.cpp \

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - RTPathAbsExEx
+ * IPRT - RTPathAbsEx and RTPathAbs.
  */
 
@@ -44 +44 @@
  * Ensures that the drive letter is capitalized (prereq: RTPATH_PROP_VOLUME).
  */
-DECLINLINE(void) rtPathAbsExExUpperCaseDriveLetter(char *pszAbsPath)
+DECLINLINE(void) rtPathAbsExUpperCaseDriveLetter(char *pszAbsPath)
 {
     AssertReturnVoid(pszAbsPath[1] == ':');
@@ -58 +58 @@
  * Uses RTPATHABS_F_STOP_AT_BASE for RTPATHABS_F_STOP_AT_CWD.
  */
-static int rtPathAbsExExWithCwdOrBaseCommon(const char *pszBase, size_t cchBaseInPlace, PRTPATHPARSED pBaseParsed,
-                                            const char *pszPath, PRTPATHPARSED pParsed, uint32_t fFlags,
-                                            char *pszAbsPath, size_t *pcbAbsPath)
+static int rtPathAbsExWithCwdOrBaseCommon(const char *pszBase, size_t cchBaseInPlace, PRTPATHPARSED pBaseParsed,
+                                          const char *pszPath, PRTPATHPARSED pParsed, uint32_t fFlags,
+                                          char *pszAbsPath, size_t *pcbAbsPath)
 {
     AssertReturn(pBaseParsed->cComps > 0, VERR_INVALID_PARAMETER);
@@ -199 +199 @@
     {
         if (pBaseParsed->fProps & RTPATH_PROP_VOLUME)
-            rtPathAbsExExUpperCaseDriveLetter(pszAbsPath);
+            rtPathAbsExUpperCaseDriveLetter(pszAbsPath);
 
         cchBaseInPlace = pBaseParsed->cchPath;
@@ -232 +232 @@
  * Handles the no-root-path scenario where we do CWD prefixing.
  */
-static int rtPathAbsExExWithCwd(const char *pszPath, PRTPATHPARSED pParsed, uint32_t fFlags, char *pszAbsPath, size_t *pcbAbsPath)
+static int rtPathAbsExWithCwd(const char *pszPath, PRTPATHPARSED pParsed, uint32_t fFlags, char *pszAbsPath, size_t *pcbAbsPath)
 {
     /*
@@ -313 +313 @@
     else
         fFlags &= ~RTPATHABS_F_STOP_AT_BASE;
-    rc = rtPathAbsExExWithCwdOrBaseCommon(pszCwd, cchInPlace, pCwdParsed, pszPath, pParsed, fFlags, pszAbsPath, pcbAbsPath);
+    rc = rtPathAbsExWithCwdOrBaseCommon(pszCwd, cchInPlace, pCwdParsed, pszPath, pParsed, fFlags, pszAbsPath, pcbAbsPath);
     if (pCwdParsedFree)
         RTMemTmpFree(pCwdParsedFree);
@@ -325 +325 @@
  * Handles the no-root-path scenario where we've got a base path.
  */
-static int rtPathAbsExExWithBase(const char *pszBase, const char *pszPath, PRTPATHPARSED pParsed, uint32_t fFlags,
-                                 char *pszAbsPath, size_t *pcbAbsPath)
+static int rtPathAbsExWithBase(const char *pszBase, const char *pszPath, PRTPATHPARSED pParsed, uint32_t fFlags,
+                               char *pszAbsPath, size_t *pcbAbsPath)
 {
     /*
@@ -362 +362 @@
     {
         cchInPlace = *pcbAbsPath;
-        rc = RTPathAbsExEx(NULL, pszBase, fFlags, pszAbsPath, &cchInPlace);
+        rc = RTPathAbsEx(NULL, pszBase, fFlags, pszAbsPath, &cchInPlace);
         if (RT_SUCCESS(rc))
         {
@@ -400 +400 @@
      * Join paths with the CWD code.
      */
-    rc = rtPathAbsExExWithCwdOrBaseCommon(cchInPlace ? pszAbsPath : pszBase, cchInPlace, pBaseParsed,
-                                          pszPath, pParsed, fFlags, pszAbsPath, pcbAbsPath);
+    rc = rtPathAbsExWithCwdOrBaseCommon(cchInPlace ? pszAbsPath : pszBase, cchInPlace, pBaseParsed,
+                                        pszPath, pParsed, fFlags, pszAbsPath, pcbAbsPath);
     if (pBaseParsedFree)
         RTMemTmpFree(pBaseParsedFree);
@@ -411 +411 @@
  * Handles the RTPATH_PROP_ROOT_SLASH case.
  */
-static int rtPathAbsExExRootSlash(const char *pszBase, const char *pszPath, PRTPATHPARSED pParsed,
-                                  uint32_t fFlags, char *pszAbsPath, size_t *pcbAbsPath)
+static int rtPathAbsExRootSlash(const char *pszBase, const char *pszPath, PRTPATHPARSED pParsed,
+                                uint32_t fFlags, char *pszAbsPath, size_t *pcbAbsPath)
 {
     /*
@@ -482 +482 @@
                     return VERR_BUFFER_OVERFLOW;
                 }
-                rtPathAbsExExUpperCaseDriveLetter(pszAbsPath);
+                rtPathAbsExUpperCaseDriveLetter(pszAbsPath);
             }
             else if (uBase.Parsed.fProps & RTPATH_PROP_UNC)
@@ -560 +560 @@
  * Handles the RTPATH_PROP_ABSOLUTE case.
  */
-static int rtPathAbsExExAbsolute(const char *pszPath, PRTPATHPARSED pParsed,
-                                 uint32_t fFlags, char *pszAbsPath, size_t *pcbAbsPath)
+static int rtPathAbsExAbsolute(const char *pszPath, PRTPATHPARSED pParsed, uint32_t fFlags, char *pszAbsPath, size_t *pcbAbsPath)
 {
     if (pParsed->fProps & RTPATH_PROP_DOT_REFS)
@@ -574 +573 @@
     *pcbAbsPath = pParsed->cchPath + (rc == VERR_BUFFER_OVERFLOW);
     if (RT_SUCCESS(rc) && (pParsed->fProps & RTPATH_PROP_VOLUME))
-        rtPathAbsExExUpperCaseDriveLetter(pszAbsPath);
+        rtPathAbsExUpperCaseDriveLetter(pszAbsPath);
     return rc;
 }
 
 
-RTDECL(int) RTPathAbsExEx(const char *pszBase, const char *pszPath, uint32_t fFlags, char *pszAbsPath, size_t *pcbAbsPath)
+RTDECL(int) RTPathAbsEx(const char *pszBase, const char *pszPath, uint32_t fFlags, char *pszAbsPath, size_t *pcbAbsPath)
 {
     /*
@@ -624 +623 @@
      */
     if (pParsed->fProps & RTPATH_PROP_ABSOLUTE)
-        rc = rtPathAbsExExAbsolute(pszPath, pParsed, fFlags, pszAbsPath, pcbAbsPath);
+        rc = rtPathAbsExAbsolute(pszPath, pParsed, fFlags, pszAbsPath, pcbAbsPath);
     /*
      * What about relative but with a root slash.
      */
     else if (pParsed->fProps & RTPATH_PROP_ROOT_SLASH)
-        rc = rtPathAbsExExRootSlash(pszBase, pszPath, pParsed, fFlags, pszAbsPath, pcbAbsPath);
+        rc = rtPathAbsExRootSlash(pszBase, pszPath, pParsed, fFlags, pszAbsPath, pcbAbsPath);
     /*
      * Not exactly perfect.  No root slash.
@@ -646 +645 @@
                 )
             )
-        rc = rtPathAbsExExWithBase(pszBase, pszPath, pParsed, fFlags, pszAbsPath, pcbAbsPath);
-    else
-        rc = rtPathAbsExExWithCwd(pszPath, pParsed, fFlags, pszAbsPath, pcbAbsPath);
+        rc = rtPathAbsExWithBase(pszBase, pszPath, pParsed, fFlags, pszAbsPath, pcbAbsPath);
+    else
+        rc = rtPathAbsExWithCwd(pszPath, pParsed, fFlags, pszAbsPath, pcbAbsPath);
 
     if (pParsedFree)
@@ -655 +654 @@
 }
 
+
+RTDECL(int) RTPathAbs(const char *pszPath, char *pszAbsPath, size_t cbAbsPath)
+{
+    return RTPathAbsEx(NULL, pszPath, RTPATH_STR_F_STYLE_HOST, pszAbsPath, &cbAbsPath);
+}
+

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

@@ -51 +51 @@
     char szPath[RTPATH_MAX];
     size_t cbPath = sizeof(szPath);
-    int rc = RTPathAbsExEx(pszBase, pszPath, RTPATH_STR_F_STYLE_HOST, szPath, &cbPath);
+    int rc = RTPathAbsEx(pszBase, pszPath, RTPATH_STR_F_STYLE_HOST, szPath, &cbPath);
     if (RT_SUCCESS(rc))
         return RTStrDup(szPath);
@@ -66 +66 @@
             if (pszAbsPath)
             {
-                rc = RTPathAbsExEx(pszBase, pszPath, RTPATH_STR_F_STYLE_HOST, pszAbsPath, &cbPath);
+                rc = RTPathAbsEx(pszBase, pszPath, RTPATH_STR_F_STYLE_HOST, pszAbsPath, &cbPath);
                 if (RT_SUCCESS(rc))
                     return pszAbsPath;

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

@@ -84 +84 @@
      * This ASSUMES that pThis->pszPath is an absolute path.
      */
-    int rc = RTPathAbsExEx(pThis->pszPath, pszRelPath, RTPATH_STR_F_STYLE_HOST, pszPathDst, &cbPathDst);
+    int rc = RTPathAbsEx(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 = RTPathAbsExEx(pThis->pszPath, pszRelPath, RTPATH_STR_F_STYLE_HOST, pszPathDst, &cbPathDst);
+    int rc = RTPathAbsEx(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
+    /*
+     * RTPathAbsEx.
      */
     RTTestSub(hTest, "RTPathAbsEx");
-    static const struct
-    {
-        const char *pcszInputBase;
-        const char *pcszInputPath;
-        int rc;
-        const char *pcszOutput;
-    }
-    s_aRTPathAbsExTests[] =
-    {
-#if defined (RT_OS_OS2) || defined (RT_OS_WINDOWS)
-    { NULL, "", VERR_INVALID_PARAMETER, NULL },
-    { NULL, ".", VINF_SUCCESS, "%p" },
-    { NULL, "\\", VINF_SUCCESS, "%d\\" },
-    { NULL, "\\..", VINF_SUCCESS, "%d\\" },
-    { NULL, "/absolute/..", VINF_SUCCESS, "%d\\" },
-    { NULL, "/absolute\\\\../..", VINF_SUCCESS, "%d\\" },
-    { NULL, "/absolute//../path\\", VINF_SUCCESS, "%d\\path" },
-    { NULL, "/absolute/../../path", VINF_SUCCESS, "%d\\path" },
-    { NULL, "relative/../dir\\.\\.\\.\\file.txt", VINF_SUCCESS, "%p\\dir\\file.txt" },
-    { NULL, "\\data\\", VINF_SUCCESS, "%d\\data" },
-    { "relative_base/dir\\", "\\from_root", VINF_SUCCESS, "%d\\from_root" },
-    { "relative_base/dir/", "relative_also", VINF_SUCCESS, "%p\\relative_base\\dir\\relative_also" },
-#else
-    { NULL, "", VERR_INVALID_PARAMETER, NULL },
-    { NULL, ".", VINF_SUCCESS, "%p" },
-    { NULL, "/", VINF_SUCCESS, "/" },
-    { NULL, "/..", VINF_SUCCESS, "/" },
-    { NULL, "/absolute/..", VINF_SUCCESS, "/" },
-    { NULL, "/absolute\\\\../..", VINF_SUCCESS, "/" },
-    { NULL, "/absolute//../path/", VINF_SUCCESS, "/path" },
-    { NULL, "/absolute/../../path", VINF_SUCCESS, "/path" },
-    { NULL, "relative/../dir/./././file.txt", VINF_SUCCESS, "%p/dir/file.txt" },
-    { NULL, "relative/../dir\\.\\.\\.\\file.txt", VINF_SUCCESS, "%p/dir\\.\\.\\.\\file.txt" },  /* linux-specific */
-    { NULL, "/data/", VINF_SUCCESS, "/data" },
-    { "relative_base/dir/", "/from_root", VINF_SUCCESS, "/from_root" },
-    { "relative_base/dir/", "relative_also", VINF_SUCCESS, "%p/relative_base/dir/relative_also" },
-#endif
-#if defined (RT_OS_OS2) || defined (RT_OS_WINDOWS)
-    { NULL, "C:\\", VINF_SUCCESS, "C:\\" },
-    { "C:\\", "..", VINF_SUCCESS, "C:\\" },
-    { "C:\\temp", "..", VINF_SUCCESS, "C:\\" },
-    { "C:\\VirtualBox/Machines", "..\\VirtualBox.xml", VINF_SUCCESS, "C:\\VirtualBox\\VirtualBox.xml" },
-    { "C:\\MustDie", "\\from_root/dir/..", VINF_SUCCESS, "C:\\from_root" },
-    { "C:\\temp", "D:\\data", VINF_SUCCESS, "D:\\data" },
-    { NULL, "\\\\server\\..\\share", VINF_SUCCESS, "\\\\server\\..\\share" /* kind of strange */ },
-    { NULL, "\\\\server/", VINF_SUCCESS, "\\\\server\\" },
-    { NULL, "\\\\", VINF_SUCCESS, "\\\\" },
-    { NULL, "\\\\\\something", VINF_SUCCESS, "\\\\\\something" /* kind of strange */ },
-    { "\\\\server\\share_as_base", "/from_root", VINF_SUCCESS, "\\\\server\\from_root" },
-    { "\\\\just_server", "/from_root", VINF_SUCCESS, "\\\\just_server\\from_root" },
-    { "\\\\server\\share_as_base", "relative\\data", VINF_SUCCESS, "\\\\server\\share_as_base\\relative\\data" },
-    { "base", "\\\\?\\UNC\\relative/edwef/..", VINF_SUCCESS, "\\\\?\\UNC\\relative" },
-    { "\\\\?\\UNC\\base", "/from_root", VERR_INVALID_NAME, NULL },
-#else
-    { "/temp", "..", VINF_SUCCESS, "/" },
-    { "/VirtualBox/Machines", "../VirtualBox.xml", VINF_SUCCESS, "/VirtualBox/VirtualBox.xml" },
-    { "/MustDie", "/from_root/dir/..", VINF_SUCCESS, "/from_root" },
-    { "\\temp", "\\data", VINF_SUCCESS, "%p/\\temp/\\data" },
-#endif
-    };
-
-    for (unsigned i = 0; i < RT_ELEMENTS(s_aRTPathAbsExTests); ++ i)
-    {
-        rc = RTPathAbsEx(s_aRTPathAbsExTests[i].pcszInputBase,
-                         s_aRTPathAbsExTests[i].pcszInputPath,
-                         szPath, sizeof(szPath));
-        if (rc != s_aRTPathAbsExTests[i].rc)
-        {
-            RTTestIFailed("unexpected result code!\n"
-                          "   input base: '%s'\n"
-                          "   input path: '%s'\n"
-                          "       output: '%s'\n"
-                          "           rc: %Rrc\n"
-                          "  expected rc: %Rrc",
-                          s_aRTPathAbsExTests[i].pcszInputBase,
-                          s_aRTPathAbsExTests[i].pcszInputPath,
-                          szPath, rc,
-                          s_aRTPathAbsExTests[i].rc);
-            continue;
-        }
-
-        char szTmp[RTPATH_MAX];
-        char *pszExpected = NULL;
-        if (s_aRTPathAbsExTests[i].pcszOutput != NULL)
-        {
-            if (s_aRTPathAbsExTests[i].pcszOutput[0] == '%')
-            {
-                RTTESTI_CHECK_RC(rc = RTPathGetCurrent(szTmp, sizeof(szTmp)), VINF_SUCCESS);
-                if (RT_FAILURE(rc))
-                    break;
-
-                pszExpected = szTmp;
-
-                if (s_aRTPathAbsExTests[i].pcszOutput[1] == 'p')
-                {
-                    cch = strlen(szTmp);
-                    if (cch + strlen(s_aRTPathAbsExTests[i].pcszOutput) - 2 <= sizeof(szTmp))
-                        strcpy(szTmp + cch, s_aRTPathAbsExTests[i].pcszOutput + 2);
-                }
-#if defined(RT_OS_OS2) || defined(RT_OS_WINDOWS)
-                else if (s_aRTPathAbsExTests[i].pcszOutput[1] == 'd')
-                {
-                    if (2 + strlen(s_aRTPathAbsExTests[i].pcszOutput) - 2 <= sizeof(szTmp))
-                        strcpy(szTmp + 2, s_aRTPathAbsExTests[i].pcszOutput + 2);
-                }
-#endif
-            }
-            else
-            {
-                strcpy(szTmp, s_aRTPathAbsExTests[i].pcszOutput);
-                pszExpected = szTmp;
-            }
-
-            if (strcmp(szPath, pszExpected))
-            {
-                RTTestIFailed("Unexpected result\n"
-                              "   input base: '%s'\n"
-                              "   input path: '%s'\n"
-                              "       output: '%s'\n"
-                              "     expected: '%s'",
-                              s_aRTPathAbsExTests[i].pcszInputBase,
-                              s_aRTPathAbsExTests[i].pcszInputPath,
-                              szPath,
-                              s_aRTPathAbsExTests[i].pcszOutput);
-            }
-        }
-    }
-#endif
-
-    /*
-     * RTPathAbsExEx - will replace RTPathAbsEx shortly.
-     */
-    RTTestSub(hTest, "RTPathAbsExEx");
     static const struct
     {
@@ -477 +343 @@
 
         size_t cbAbsPath = sizeof(szPath);
-        rc = RTPathAbsExEx(s_aRTPathAbsExExTests[i].pcszInputBase,
-                           s_aRTPathAbsExExTests[i].pcszInputPath,
-                           s_aRTPathAbsExExTests[i].fFlags,
-                           szPath, &cbAbsPath);
+        rc = RTPathAbsEx(s_aRTPathAbsExExTests[i].pcszInputBase,
+                         s_aRTPathAbsExExTests[i].pcszInputPath,
+                         s_aRTPathAbsExExTests[i].fFlags,
+                         szPath, &cbAbsPath);
 
         if (RT_FAILURE(s_aRTPathAbsExExTests[i].rc))