Ticket #1034: Directory.cpp.diff

/boot/home/Desktop/Directory.cpp

@@ -480 +480 @@
 bool
 BDirectory::Contains(const BEntry *entry, int32 nodeFlags) const
 {
-    bool result = (entry);
-    // check, if the entry exists at all
-    if (result)
-        result = entry->Exists();
+    if (entry == NULL)
+        return false;
+    
+    if (entry->InitCheck() != B_OK)
+        return false;
+    
+    if (! entry->Exists())
+        return false;
+    
     // test the node kind
-    if (result) {
-        switch (nodeFlags) {
-            case B_FILE_NODE:
-                result = entry->IsFile();
-                break;
-            case B_DIRECTORY_NODE:
-                result = entry->IsDirectory();
-                break;
-            case B_SYMLINK_NODE:
-                result = entry->IsSymLink();
-                break;
-            case B_ANY_NODE:
-                break;
-            default:
-                result = false;
-                break;
-        }
+    switch (nodeFlags) {
+        case B_FILE_NODE:
+            if (! entry->IsFile())
+                return false;
+            break;
+        case B_DIRECTORY_NODE:
+            if (! entry->IsDirectory())
+                return false;
+            break;
+        case B_SYMLINK_NODE:
+            if (! entry->IsSymLink())
+                return false;
+            break;
+        case B_ANY_NODE:
+            break;
+        default:
+            break;
     }
+
     // If the directory is initialized, get the canonical paths of the dir and
     // the entry and check, if the latter is a prefix of the first one.
-    if (result && InitCheck() == B_OK) {
+    if (InitCheck() == B_OK) {
         BPath dirPath(this, ".", true);
         BPath entryPath(entry);
-        if (dirPath.InitCheck() == B_OK && entryPath.InitCheck() == B_OK) {
-            result = !strncmp(dirPath.Path(), entryPath.Path(),
-                strlen(dirPath.Path()));
-        } else
-            result = false;
+        
+        if (! (dirPath.InitCheck() == B_OK && entryPath.InitCheck() == B_OK))
+            return false;
+        
+        if (!strncmp(dirPath.Path(), entryPath.Path(), strlen(dirPath.Path())))
+            return true;
+        else
+            return false;
     }
-    return result;
+    else
+        return false;
 }
 
 // GetStatFor