Changeset 33450 in vbox for trunk

Timestamp:

Oct 26, 2010 9:24:32 AM (14 years ago)

Author:

vboxsync

Message:

iprt/path: Added RTPathJoinA.

Location:

trunk

Files:

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

trunk/include/iprt/path.h

@@ -481 +481 @@
 
 /**
+ * Same as RTPathJoin, except that the output buffer is allocated.
+ *
+ * @returns Buffer containing the joined up path, call RTStrFree to free.  NULL
+ *          on allocation failure.
+ * @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(char *) RTPathJoinA(const char *pszPathSrc, const char *pszAppend);
+
+/**
  * Callback for RTPathTraverseList that's called for each element.
  *

trunk/src/VBox/Runtime/Makefile.kmk

@@ -297 +297 @@
         common/path/RTPathHavePath.cpp \
         common/path/RTPathJoin.cpp \
+        common/path/RTPathJoinA.cpp \
         common/path/RTPathParse.cpp \
         common/path/RTPathRealDup.cpp \
@@ -939 +940 @@
         common/path/RTPathHavePath.cpp \
         common/path/RTPathJoin.cpp \
+        common/path/RTPathJoinA.cpp \
         common/path/RTPathParse.cpp \
         common/path/RTPathRealDup.cpp \

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - RTPathJoin
+ * IPRT - RTPathJoin.
  */
 
@@ -43 +43 @@
     AssertPtr(pszPathDst);
     AssertPtr(pszPathSrc);
+    AssertPtr(pszAppend);
 
     /*

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

@@ -367 +367 @@
 
     /*
+     * RTPathJoinA - reuse the append tests.
+     */
+    RTTestSub(hTest, "RTPathJoinA");
+    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];
+
+        char *pszPathDst;
+        RTTESTI_CHECK(pszPathDst = RTPathJoinA(pszInput, pszAppend));
+        if (!pszPathDst)
+            continue;
+        if (strcmp(pszPathDst, pszExpect))
+        {
+            RTTestIFailed("Unexpected result\n"
+                          "   input: '%s'\n"
+                          "  append: '%s'\n"
+                          "  output: '%s'\n"
+                          "expected: '%s'",
+                          pszInput, pszAppend, pszPathDst, pszExpect);
+        }
+        RTStrFree(pszPathDst);
+    }
+
+    /*
      * RTPathStripTrailingSlash
      */