Changeset 44615 in vbox

Timestamp:

Feb 10, 2013 6:10:50 PM (12 years ago)

Author:

vboxsync

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

83701

Message:

Runtime/path: Add RTPathCreateRelative to create a relative path between two absolute ones

Location:

trunk

Files:

• include/iprt/path.h (modified) (1 diff)
• src/VBox/Runtime/common/path/RTPathCreateRelative.cpp (added)
• src/VBox/Runtime/testcase/tstRTPath.cpp (modified) (1 diff)

trunk/include/iprt/path.h

@@ -594 +594 @@
 
 
+/**
+ * Create a relative path between the two given paths.
+ *
+ * @returns IPRT status code.
+ * @retval  VINF_SUCCESS on success.
+ * @retval  VERR_BUFFER_OVERFLOW if the result is too big to fit within
+ *          cbPathDst bytes.
+ * @retval  VERR_NOT_SUPPORTED if both paths start with different volume specifiers.
+ * @param   pszPathDst      Where to store the resulting path.
+ * @param   cbPathDst       The size of the buffer pszPathDst points to,
+ *                          terminator included.
+ * @param   pszPathFrom     The path to start from creating the relative path.
+ * @param   pszPathTo       The path to reach with the created relative path.
+ */
+RTDECL(int) RTPathCreateRelative(char *pszPathDst, size_t cbPathDst,
+                                 const char *pszPathFrom,
+                                 const char *pszPathTo);
+
 #ifdef IN_RING3
 

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

@@ -554 +554 @@
     }
 
+    /*
+     * RTPathCreateRelative
+     */
+    RTTestSub(hTest, "RTPathCreateRelative");
+    struct
+    {
+        const char *pszFrom;
+        const char *pszTo;
+        int rc;
+        const char *pszExpected;
+    } s_aRelPath[] =
+    {
+        { "/home/test.ext", "/home/test2.ext", VINF_SUCCESS, "test2.ext"},
+        { "/dir/test.ext", "/dir/dir2/test2.ext", VINF_SUCCESS, "dir2/test2.ext"},
+        { "/dir/dir2/test.ext", "/dir/test2.ext", VINF_SUCCESS, "../test2.ext"},
+        { "/dir/dir2/test.ext", "/dir/dir3/test2.ext", VINF_SUCCESS, "../dir3/test2.ext"},
+#if defined (RT_OS_OS2) || defined (RT_OS_WINDOWS)
+        { "\\\\server\\share\\test.ext", "\\\\server\\share2\\test2.ext", VERR_NOT_SUPPORTED, ""},
+        { "c:\\dir\\test.ext", "f:\\dir\\test.ext", VERR_NOT_SUPPORTED, ""}
+#endif
+    };
+    for (unsigned i = 0; i < RT_ELEMENTS(s_aRelPath); i++)
+    {
+        const char *pszFrom = s_aRelPath[i].pszFrom;
+        const char *pszTo   = s_aRelPath[i].pszTo;
+
+        rc = RTPathCreateRelative(szPath, sizeof(szPath), pszFrom, pszTo);
+        if (rc != s_aRelPath[i].rc)
+            RTTestIFailed("Unexpected return code\n"
+                          "     got: %Rrc\n"
+                          "expected: %Rrc",
+                          rc, s_aRelPath[i].rc);
+        else if (   RT_SUCCESS(rc)
+                 && strcmp(szPath, s_aRelPath[i].pszExpected))
+            RTTestIFailed("Unexpected result\n"
+                          "    from: '%s'\n"
+                          "      to: '%s'\n"
+                          "  output: '%s'\n"
+                          "expected: '%s'",
+                          pszFrom, pszTo, szPath, s_aRelPath[i].pszExpected);
+    }
 
     /*