Changeset 96609 in vbox for trunk/src/VBox/Runtime/common/path

Timestamp:

Sep 6, 2022 2:13:23 PM (3 years ago)

Author:

vboxsync

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

153486

Message:

IPRT/path: Added fFlags parameter to RTPathAppendEx and RTPathJoinEx to make it possible to select the path style. bugref:10286

Location:

trunk/src/VBox/Runtime/common/path

Files:

• RTPathAppend.cpp (modified) (1 diff)
• RTPathAppendEx.cpp (modified) (3 diffs)
• RTPathAppendEx.cpp.h (copied) (copied from trunk/src/VBox/Runtime/common/path/RTPathAppendEx.cpp ) (8 diffs, 1 prop)
• RTPathJoinEx.cpp (modified) (2 diffs)

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

@@ -47 +47 @@
 RTDECL(int) RTPathAppend(char *pszPath, size_t cbPathDst, const char *pszAppend)
 {
-    return RTPathAppendEx(pszPath, cbPathDst, pszAppend, RTSTR_MAX);
+    return RTPathAppendEx(pszPath, cbPathDst, pszAppend, RTSTR_MAX, RTPATH_STR_F_STYLE_HOST);
 }
 

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

@@ -46 +46 @@
 #include <iprt/errcore.h>
 #include <iprt/string.h>
+
+#define RTPATH_TEMPLATE_CPP_H "RTPathAppendEx.cpp.h"
+#include "rtpath-expand-template.cpp.h"
 
 
@@ -115 +118 @@
 
 
-RTDECL(int) RTPathAppendEx(char *pszPath, size_t cbPathDst, const char *pszAppend, size_t cchAppendMax)
+RTDECL(int) RTPathAppendEx(char *pszPath, size_t cbPathDst, const char *pszAppend, size_t cchAppendMax, uint32_t fFlags)
 {
     char *pszPathEnd = RTStrEnd(pszPath, cbPathDst);
     AssertReturn(pszPathEnd, VERR_INVALID_PARAMETER);
+    Assert(RTPATH_STR_F_IS_VALID(fFlags, 0));
 
     /*
@@ -138 +142 @@
 
     /*
-     * Balance slashes and check for buffer overflow.
+     * Go to path style specific code now.
      */
-    if (!RTPATH_IS_SLASH(pszPathEnd[-1]))
+    switch (fFlags & RTPATH_STR_F_STYLE_MASK)
     {
-        if (!RTPATH_IS_SLASH(pszAppend[0]))
-        {
-#if defined (RT_OS_OS2) || defined (RT_OS_WINDOWS)
-            if (    (size_t)(pszPathEnd - pszPath) == 2
-                &&  pszPath[1] == ':'
-                &&  RT_C_IS_ALPHA(pszPath[0]))
-            {
-                if ((size_t)(pszPathEnd - pszPath) + cchAppend >= cbPathDst)
-                    return VERR_BUFFER_OVERFLOW;
-            }
-            else
+#if RTPATH_STYLE == RTPATH_STR_F_STYLE_DOS
+        case RTPATH_STR_F_STYLE_HOST:
 #endif
-            {
-                if ((size_t)(pszPathEnd - pszPath) + 1 + cchAppend >= cbPathDst)
-                    return VERR_BUFFER_OVERFLOW;
-                *pszPathEnd++ = RTPATH_SLASH;
-            }
-        }
-        else
-        {
-            /* One slash is sufficient at this point. */
-            while (cchAppend > 1 && RTPATH_IS_SLASH(pszAppend[1]))
-                pszAppend++, cchAppend--;
+        case RTPATH_STR_F_STYLE_DOS:
+            return rtPathAppendExStyleDos(pszPath, cbPathDst, pszPathEnd, pszAppend, cchAppend);
 
-            if ((size_t)(pszPathEnd - pszPath) + cchAppend >= cbPathDst)
-                return VERR_BUFFER_OVERFLOW;
-        }
+#if RTPATH_STYLE != RTPATH_STR_F_STYLE_DOS
+        case RTPATH_STR_F_STYLE_HOST:
+#endif
+        case RTPATH_STR_F_STYLE_UNIX:
+            return rtPathAppendExStyleUnix(pszPath, cbPathDst, pszPathEnd, pszAppend, cchAppend);
+
+        default:
+            AssertFailedReturn(VERR_INVALID_FLAGS); /* impossible */
     }
-    else
-    {
-        /* No slashes needed in the appended bit. */
-        while (cchAppend && RTPATH_IS_SLASH(*pszAppend))
-            pszAppend++, cchAppend--;
-
-        /* In the leading path we can skip unnecessary trailing slashes, but
-           be sure to leave one. */
-        size_t const cchRoot = rtPathRootSpecLen2(pszPath);
-        while (     (size_t)(pszPathEnd - pszPath) > RT_MAX(1, cchRoot)
-               &&   RTPATH_IS_SLASH(pszPathEnd[-2]))
-            pszPathEnd--;
-
-        if ((size_t)(pszPathEnd - pszPath) + cchAppend >= cbPathDst)
-            return VERR_BUFFER_OVERFLOW;
-    }
-
-    /*
-     * What remains now is the just the copying.
-     */
-    memcpy(pszPathEnd, pszAppend, cchAppend);
-    pszPathEnd[cchAppend] = '\0';
-    return VINF_SUCCESS;
 }
 

trunk/src/VBox/Runtime/common/path/RTPathAppendEx.cpp.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - RTPathAppendEx
+ * IPRT - rtPathAppendEx - Code Template.
  */
 
@@ -36 +36 @@
 
 
-/*********************************************************************************************************************************
-*   Header Files                                                                                                                 *
-*********************************************************************************************************************************/
-#include "internal/iprt.h"
-#include <iprt/path.h>
-
-#include <iprt/assert.h>
-#include <iprt/ctype.h>
-#include <iprt/errcore.h>
-#include <iprt/string.h>
-
-
 /**
  * Figures the length of the root part of the path.
@@ -60 +48 @@
  *          counts them.)
  */
-static size_t rtPathRootSpecLen2(const char *pszPath)
+DECLINLINE(size_t) RTPATH_STYLE_FN(rtPathRootSpecLen2)(const char *pszPath)
 {
     /* fend of wildlife. */
@@ -69 +57 @@
     if (RTPATH_IS_SLASH(pszPath[0]))
     {
-#if defined (RT_OS_OS2) || defined (RT_OS_WINDOWS)
+#if RTPATH_STYLE == RTPATH_STR_F_STYLE_DOS
         /* UNC? */
         if (    RTPATH_IS_SLASH(pszPath[1])
@@ -100 +88 @@
     }
 
-#if defined (RT_OS_OS2) || defined (RT_OS_WINDOWS)
+#if RTPATH_STYLE == RTPATH_STR_F_STYLE_DOS
     /* Drive specifier? */
     if (   pszPath[0] != '\0'
@@ -115 +103 @@
 
 
-RTDECL(int) RTPathAppendEx(char *pszPath, size_t cbPathDst, const char *pszAppend, size_t cchAppendMax)
+/** Internal worker for RTPathAppendEx. */
+DECLINLINE(int) RTPATH_STYLE_FN(rtPathAppendEx)(char *pszPath, size_t cbPathDst, char *pszPathEnd,
+                                                const char *pszAppend, size_t cchAppend)
 {
-    char *pszPathEnd = RTStrEnd(pszPath, cbPathDst);
-    AssertReturn(pszPathEnd, VERR_INVALID_PARAMETER);
-
-    /*
-     * Special cases.
-     */
-    if (!pszAppend)
-        return VINF_SUCCESS;
-    size_t cchAppend = RTStrNLen(pszAppend, cchAppendMax);
-    if (!cchAppend)
-        return VINF_SUCCESS;
-    if (pszPathEnd == pszPath)
-    {
-        if (cchAppend >= cbPathDst)
-            return VERR_BUFFER_OVERFLOW;
-        memcpy(pszPath, pszAppend, cchAppend);
-        pszPath[cchAppend] = '\0';
-        return VINF_SUCCESS;
-    }
-
     /*
      * Balance slashes and check for buffer overflow.
@@ -144 +114 @@
         if (!RTPATH_IS_SLASH(pszAppend[0]))
         {
-#if defined (RT_OS_OS2) || defined (RT_OS_WINDOWS)
+#if RTPATH_STYLE == RTPATH_STR_F_STYLE_DOS
             if (    (size_t)(pszPathEnd - pszPath) == 2
                 &&  pszPath[1] == ':'
@@ -178 +148 @@
         /* In the leading path we can skip unnecessary trailing slashes, but
            be sure to leave one. */
-        size_t const cchRoot = rtPathRootSpecLen2(pszPath);
+        size_t const cchRoot = RTPATH_STYLE_FN(rtPathRootSpecLen2)(pszPath);
         while (     (size_t)(pszPathEnd - pszPath) > RT_MAX(1, cchRoot)
                &&   RTPATH_IS_SLASH(pszPathEnd[-2]))

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

@@ -50 +50 @@
 RTDECL(int) RTPathJoinEx(char *pszPathDst, size_t cbPathDst,
                          const char *pszPathSrc, size_t cchPathSrcMax,
-                         const char *pszAppend, size_t cchAppendMax)
+                         const char *pszAppend, size_t cchAppendMax, uint32_t fFlags)
 {
     AssertPtr(pszPathDst);
     AssertPtr(pszPathSrc);
     AssertPtr(pszAppend);
+    Assert(RTPATH_STR_F_IS_VALID(fFlags, 0));
 
     /*
@@ -65 +66 @@
     pszPathDst[cchPathSrc] = '\0';
 
-    return RTPathAppendEx(pszPathDst, cbPathDst, pszAppend, cchAppendMax);
+    return RTPathAppendEx(pszPathDst, cbPathDst, pszAppend, cchAppendMax, fFlags);
 }