Changeset 78098 in vbox for trunk/src/VBox/Runtime/common/path/RTPathAbsEx.cpp

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Runtime/common/path/RTPathAbsEx.cpp (moved) (moved from trunk/src/VBox/Runtime/common/path/RTPathAbsExEx.cpp ) (16 diffs)

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);
+}
+