Changeset 358 for ps

Timestamp:

06/02/04 18:12:13 (21 years ago)

Author:

janwas

Message:

yet more tree_lookup fixes for bug pointed out by simon

File:

• ps/trunk/source/lib/res/vfs.cpp (modified) (3 diffs)

ps/trunk/source/lib/res/vfs.cpp

@@ -351 +351 @@
     Dir* cur_dir = &vfs_root;
     const char* cur_component = buf;
-    bool is_last_component = false;
 
     // subdirectory traverse logic
@@ -374 +373 @@
         if(slash)
             *slash = 0;
-        // allow root dir ("") and trailing '/' if looking up a dir
+
+        // early outs:
+        // .. last component and it's a filename
+        if(slash == 0 && loc != 0)
+            break;
+        // .. root dir ("") or trailing '/' in dir name
         if(*cur_component == '\0' && loc == 0)
             break;
-        is_last_component = (slash == 0);
 
         // create <cur_component> subdir (no-op if it already exists)
@@ -384 +387 @@
 
         // switch to <cur_component>
-        Dir* subdir = cur_dir->find_subdir(cur_component);
-        if(!subdir)
-        {
-            // this last component is a filename.
-            if(is_last_component && loc != 0)
-                break;
-            // otherwise, we had an (invalid) subdir name - fail.
+        cur_dir = cur_dir->find_subdir(cur_component);
+        if(!cur_dir)
             return -ENOENT;
-        }
-        cur_dir = subdir; // don't assign if invalid - need cur_dir below.
 
         // next component
-        if(is_last_component)
+        if(!slash)  // done, no more components left
             break;
         cur_component = slash+1;