Changeset 42978 in vbox for trunk/src/VBox/Runtime/common/path/comparepaths.cpp

Timestamp:

Aug 24, 2012 2:01:48 PM (12 years ago)

Author:

vboxsync

Message:

RTPathStartsWith: Deal with pszParentPath = root (or having a trailing slash). This fixes 'VBoxManage copyfrom /root-file hostfile'.

File:

• trunk/src/VBox/Runtime/common/path/comparepaths.cpp (modified) (2 diffs)

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

@@ -158 +158 @@
  * @param   pszParentPath   Parent path, must be an absolute path.
  *                          No trailing directory slash!
- *
- * @remarks This API doesn't currently handle root directory compares in a
- *          manner consistent with the other APIs. RTPathStartsWith(pszSomePath,
- *          "/") will not work if pszSomePath isn't "/".
  */
 RTDECL(bool) RTPathStartsWith(const char *pszPath, const char *pszParentPath)
@@ -174 +170 @@
 
     const size_t cchParentPath = strlen(pszParentPath);
-    return RTPATH_IS_SLASH(pszPath[cchParentPath])
-        || pszPath[cchParentPath] == '\0';
+    if (RTPATH_IS_SLASH(pszPath[cchParentPath]))
+        return true;
+    if (pszPath[cchParentPath] == '\0')
+        return true;
+
+    /* Deal with pszParentPath = root (or having a trailing slash). */
+    if (   pszParentPath > 0
+        && RTPATH_IS_SLASH(pszParentPath[cchParentPath - 1])
+        && RTPATH_IS_SLASH(pszPath[cchParentPath - 1]))
+        return true;
+
+    return false;
 }