Changeset 362 for ps

Timestamp:

06/02/04 18:58:35 (21 years ago)

Author:

janwas

Message:

CVS dirs are skipped when mounting

File:

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

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

@@ -454 +454 @@
     // directory
     if(flags & LOC_DIR)
+    {
+        // leave out CVS dirs in debug builds. this makes possible
+        // user code that relies on a fixed data directory structure.
+#ifndef NDEBUG
+        if(!strcmp(fn, "CVS"))
+            return 0;
+#endif
         err = cur_dir->add_subdir(fn);
+    }
     // file
     else
@@ -857 +865 @@
         }
         else
-            goto invalid_filter;
+        {
+        invalid_filter:
+            debug_warn("vfs_next_dirent: invalid filter");
+            return -1;
+        }
     }
 
@@ -881 +893 @@
 
         char* const ext = strrchr(fn, '.');
-        if(!filter || (filter_no_ext && !ext) || strcmp(ext, filter) == 0)
-            goto have_match;
+        // file has an extension
+        if(ext)
+        {
+            // not filtering, or filter matches extension: match
+            if(!filter || strcmp(ext, filter) == 0)
+                goto have_match;
+        }
+        // file has no extension
+        else
+        {
+            // filter accepts files without an extension: match
+            if(filter_no_ext)
+                goto have_match;
+        }
     }
 
@@ -888 +912 @@
     ent->name = fn;
     return 0;
-
-invalid_filter:
-    debug_warn("vfs_next_dirent: invalid filter");
-    return -1;
 }