Changeset 26133 in vbox

Timestamp:

Feb 1, 2010 4:13:05 PM (15 years ago)

Author:

vboxsync

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

57135

Message:

IPRT: Added RTPathJoin.

Location:

trunk

Files:

• include/iprt/path.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (2 diffs)
• src/VBox/Runtime/testcase/tstRTPath.cpp (modified) (1 diff)

trunk/include/iprt/path.h

@@ -403 +403 @@
 
 /**
+ * Like RTPathAppend, but with the base path as a separate argument instead of
+ * in the path buffer.
+ *
+ * @retval  VINF_SUCCESS on success.
+ * @retval  VERR_BUFFER_OVERFLOW if the result is too big to fit within
+ *          cbPathDst bytes.
+ * @retval  VERR_INVALID_PARAMETER if the string pointed to by pszPath is longer
+ *          than cbPathDst-1 bytes (failed to find terminator). Asserted.
+ *
+ * @param   pszPathDst      Where to store the resulting path.
+ * @param   cbPathDst       The size of the buffer pszPathDst points to,
+ *                          terminator included.
+ * @param   pszPathSrc      The base path to copy into @a pszPathDst before
+ *                          appending @a pszAppend.
+ * @param   pszAppend       The partial path to append to pszPathSrc. This can
+ *                          be NULL, in which case nothing is done.
+ *
+ */
+RTDECL(int) RTPathJoin(char *pszPathDst, size_t cbPathDst, const char *pszPathSrc,
+                       const char *pszAppend);
+
+/**
  * Callback for RTPathTraverseList that's called for each element.
  *

trunk/src/VBox/Runtime/Makefile.kmk

@@ -274 +274 @@
         common/path/RTPathHaveExt.cpp \
         common/path/RTPathHavePath.cpp \
+        common/path/RTPathJoin.cpp \
         common/path/RTPathParse.cpp \
         common/path/RTPathRealDup.cpp \
@@ -831 +832 @@
         common/path/RTPathHaveExt.cpp \
         common/path/RTPathHavePath.cpp \
+        common/path/RTPathJoin.cpp \
         common/path/RTPathParse.cpp \
         common/path/RTPathRealDup.cpp \

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

@@ -331 +331 @@
 
     /*
+     * RTPathJoin - reuse the append tests.
+     */
+    RTTestSub(hTest, "RTPathJoin");
+    for (unsigned i = 0; i < RT_ELEMENTS(s_apszAppendTests); i += 3)
+    {
+        const char *pszInput  = s_apszAppendTests[i];
+        const char *pszAppend = s_apszAppendTests[i + 1];
+        const char *pszExpect = s_apszAppendTests[i + 2];
+
+        memset(szPath, 'a', sizeof(szPath)); szPath[sizeof(szPath) - 1] = '\0';
+
+        RTTESTI_CHECK_RC(rc = RTPathJoin(szPath, sizeof(szPath), pszInput, pszAppend), VINF_SUCCESS);
+        if (RT_FAILURE(rc))
+            continue;
+        if (strcmp(szPath, pszExpect))
+        {
+            RTTestIFailed("Unexpected result\n"
+                          "   input: '%s'\n"
+                          "  append: '%s'\n"
+                          "  output: '%s'\n"
+                          "expected: '%s'",
+                          pszInput, pszAppend, szPath, pszExpect);
+        }
+        else
+        {
+            size_t const cchResult = strlen(szPath);
+
+            memset(szPath, 'a', sizeof(szPath)); szPath[sizeof(szPath) - 1] = '\0';
+            RTTESTI_CHECK_RC(rc = RTPathJoin(szPath, cchResult + 2, pszInput, pszAppend), VINF_SUCCESS);
+            RTTESTI_CHECK(RT_FAILURE(rc) || !strcmp(szPath, pszExpect));
+
+            memset(szPath, 'a', sizeof(szPath)); szPath[sizeof(szPath) - 1] = '\0';
+            RTTESTI_CHECK_RC(rc = RTPathJoin(szPath, cchResult + 1, pszInput, pszAppend), VINF_SUCCESS);
+            RTTESTI_CHECK(RT_FAILURE(rc) || !strcmp(szPath, pszExpect));
+
+            RTTESTI_CHECK_RC(rc = RTPathJoin(szPath, cchResult, pszInput, pszAppend), VERR_BUFFER_OVERFLOW);
+        }
+    }
+
+    /*
      * RTPathStripTrailingSlash
      */