Ticket #3186: dir.contains.diff

Directory.cpp

@@ -18 +18 @@
 #include <File.h>
 #include <fs_info.h>
 #include <Path.h>
+#include <String.h>
 #include <SymLink.h>
 
 #include <fcntl.h>
@@ -508 +509 @@
     if (dirPath.InitCheck() != B_OK || entryPath.InitCheck() != B_OK)
         return false;
 
-    return !strncmp(dirPath.Path(), entryPath.Path(), strlen(dirPath.Path()));
+    // we need to compare path components individually
+    // for correctness
+    const char *dirStr = dirPath.Path();
+    const char *entryStr = entryPath.Path();
+    if (dirStr[0] == '/')
+        ++dirStr;
+    if (entryStr[0] == '/')
+        ++entryStr;
+    while (dirStr[0] != '\0') {
+        const char *slashPos = strchr(dirStr, '/');
+        const char *entryPos = strchr(entryStr, '/');
+        if (slashPos == NULL) {
+            if (entryPos == NULL)
+                return strcmp(dirStr, entryStr) == 0;
+            else
+                return strncmp(dirStr, entryStr, entryPos - entryStr) == 0;
+        } else {
+            if (entryPos == NULL)
+                return false;
+            if (entryPos - entryStr != slashPos - dirStr)
+                return false;
+            if (strncmp(dirStr, entryStr, slashPos - dirStr) != 0)
+                return false;
+        }
+        
+        dirStr = slashPos + 1;
+        entryStr = entryPos + 1;
+    }
+    
+    return false;
 }