Changeset 45400 in vbox

Timestamp:

Apr 8, 2013 12:08:00 PM (11 years ago)

Author:

vboxsync

Message:

IPRT: A Study in Paths - Chapter 3: Reassembling parsed and split paths.

Location:

trunk

Files:

• include/iprt/mangling.h (modified) (2 diffs)
• include/iprt/path.h (modified) (3 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (2 diffs)
• src/VBox/Runtime/common/path/RTPathParsedReassemble.cpp (added)
• src/VBox/Runtime/common/path/RTPathSplitReassemble.cpp (added)
• src/VBox/Runtime/testcase/tstRTPath.cpp (modified) (3 diffs)

trunk/include/iprt/mangling.h

@@ -939 +939 @@
 # define RTPathJoinEx                                   RT_MANGLER(RTPathJoinEx)
 # define RTPathParse                                    RT_MANGLER(RTPathParse)
+# define RTPathParsedReassemble                         RT_MANGLER(RTPathParsedReassemble)
 # define RTPathParseSimple                              RT_MANGLER(RTPathParseSimple)
 # define RTPathQueryInfo                                RT_MANGLER(RTPathQueryInfo)
@@ -956 +957 @@
 # define RTPathSplitATag                                RT_MANGLER(RTPathSplitATag)
 # define RTPathSplitFree                                RT_MANGLER(RTPathSplitFree)
+# define RTPathSplitReassemble                          RT_MANGLER(RTPathSplitReassemble)
 # define RTPathStartsWith                               RT_MANGLER(RTPathStartsWith)
 # define RTPathStartsWithRoot                           RT_MANGLER(RTPathStartsWithRoot)

trunk/include/iprt/path.h

@@ -611 +611 @@
  * @sa      RTPathSplit, RTPathSplitA.
  */
-RTDECL(int) RTPathParse(const char *pszPath,  PRTPATHPARSED pParsed, size_t cbParsed, uint32_t fFlags);
+RTDECL(int) RTPathParse(const char *pszPath, PRTPATHPARSED pParsed, size_t cbParsed, uint32_t fFlags);
+
+/**
+ * Reassembles a path parsed by RTPathParse.
+ *
+ * This will be more useful as more APIs manipulating the RTPATHPARSED output
+ * are added.
+ *
+ * @returns IPRT status code.
+ * @retval  VERR_BUFFER_OVERFLOW if @a cbDstPath is less than or equal to
+ *          RTPATHPARSED::cchPath.
+ *
+ * @param   pszSrcPath          The source path.
+ * @param   pParsed             The parser output for @a pszSrcPath.
+ * @param   fFlags              Combination of RTPATH_STR_F_STYLE_XXX.
+ *                              Most users will pass 0.
+ * @param   pszDstPath          Pointer to the buffer where the path is to be
+ *                              reassembled.
+ * @param   cbDstPath           The size of the output buffer.
+ */
+RTDECL(int) RTPathParsedReassemble(const char *pszSrcPath, PRTPATHPARSED pParsed, uint32_t fFlags,
+                                   char *pszDstPath, size_t cbDstPath);
+
 
 /**
@@ -691 +713 @@
  * @sa      RTPathSplitFree, RTPathSplit, RTPathParse.
  */
-#define  RTPathSplitA(pszPath, ppSplit, fFlags)     RTPathSplitATag(pszPath, ppSplit, fFlags, RTPATH_TAG)
+#define RTPathSplitA(pszPath, ppSplit, fFlags)      RTPathSplitATag(pszPath, ppSplit, fFlags, RTPATH_TAG)
 
 /**
@@ -720 +742 @@
 RTDECL(void) RTPathSplitFree(PRTPATHSPLIT pSplit);
 
+/**
+ * Reassembles a path parsed by RTPathSplit.
+ *
+ * This will be more useful as more APIs manipulating the RTPATHSPLIT output are
+ * added.
+ *
+ * @returns IPRT status code.
+ * @retval  VERR_BUFFER_OVERFLOW if @a cbDstPath is less than or equal to
+ *          RTPATHSPLIT::cchPath.
+ *
+ * @param   pParsed             The parser output for @a pszSrcPath.
+ * @param   fFlags              Combination of RTPATH_STR_F_STYLE_XXX.
+ *                              Most users will pass 0.
+ * @param   pszDstPath          Pointer to the buffer where the path is to be
+ *                              reassembled.
+ * @param   cbDstPath           The size of the output buffer.
+ */
+RTDECL(int) RTPathSplitReassemble(PRTPATHSPLIT pSplit, uint32_t fFlags, char *pszDstPath, size_t cbDstPath);
 
 /**

trunk/src/VBox/Runtime/Makefile.kmk

@@ -363 +363 @@
         common/path/RTPathJoinEx.cpp \
         common/path/RTPathParse.cpp \
+        common/path/RTPathParsedReassemble.cpp \
         common/path/RTPathParseSimple.cpp \
         common/path/RTPathRealDup.cpp \
@@ -368 +369 @@
         common/path/RTPathSplit.cpp \
         common/path/RTPathSplitA.cpp \
+        common/path/RTPathSplitReassemble.cpp \
         common/path/RTPathStartsWithRoot.cpp \
         common/path/RTPathStripExt.cpp \

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

@@ -87 +87 @@
     };
 
+    char szPath1[RTPATH_MAX];
     union
     {
@@ -116 +117 @@
                                  s_aTests[i].offSuffix, u.Parsed.offSuffix,
                                  s_aTests[i].cchPath,   u.Parsed.cchPath);
+        }
+        else
+        {
+            rc = RTPathParsedReassemble(s_aTests[i].pszPath, &u.Parsed, s_aTests[i].fFlags & ~RTPATH_STR_F_MIDDLE,
+                                        szPath1, sizeof(szPath1));
+            if (rc == VINF_SUCCESS)
+            {
+                RTTESTI_CHECK_MSG(strlen(szPath1) == s_aTests[i].cchPath, ("%s\n", szPath1));
+                if (   !(u.Parsed.fProps & RTPATH_PROP_EXTRA_SLASHES)
+                    && (s_aTests[i].fFlags & RTPATH_STR_F_STYLE_MASK) != RTPATH_STR_F_STYLE_DOS)
+                    RTTESTI_CHECK_MSG(strcmp(szPath1, s_aTests[i].pszPath) == 0, ("%s\n", szPath1));
+            }
+            else
+                RTTestIFailed("RTPathParsedReassemble -> %Rrc", rc);
         }
     }
@@ -162 +177 @@
                 RTPathSplitFree(pSplit);
             }
+
+            rc = RTPathSplitReassemble(&u.Split, s_aTests[i].fFlags & ~RTPATH_STR_F_MIDDLE, szPath1, sizeof(szPath1));
+            if (rc == VINF_SUCCESS)
+            {
+                RTTESTI_CHECK_MSG(strlen(szPath1) == s_aTests[i].cchPath, ("%s\n", szPath1));
+                if (   !(u.Parsed.fProps & RTPATH_PROP_EXTRA_SLASHES)
+                    && (s_aTests[i].fFlags & RTPATH_STR_F_STYLE_MASK) != RTPATH_STR_F_STYLE_DOS)
+                    RTTESTI_CHECK_MSG(strcmp(szPath1, s_aTests[i].pszPath) == 0, ("%s\n", szPath1));
+            }
+            else
+                RTTestIFailed("RTPathSplitReassemble -> %Rrc", rc);
         }
     }