Changeset 1091 for Whitix

Timestamp:

10/05/08 00:01:17 (2 months ago)

Author:

mwhitworth

Message:

Add IcFsRemoveDir and KeFsRemoveDir functions.

Location:

Whitix/branches/keobject/fs

Files:

• icfs/info.c (modified) (1 diff)
• kfs/dir.c (modified) (4 diffs)

Whitix/branches/keobject/fs/icfs/info.c

@@ -167 +167 @@
 }
 
+int IcFsRemoveDir(struct KeFsEntry* dir)
+{
+        return KeFsRemoveDir(dir);
+}
+
 DWORD IcFsGetRootId()
 {

Whitix/branches/keobject/fs/kfs/dir.c

@@ -36 +36 @@
 
         ListForEachEntry(entry,&dir->entries,next)
-                if (!strnicmp(name, entry->name, nameLength))
+                if (!strnicmp(name, entry->name, nameLength) && strlen(entry->name) == nameLength)
                         goto found;
 
@@ -89 +89 @@
                 if ((entry->type & VFS_ATTR_SOFTLINK) && !strnicmp(entry->name, name, nameLength))
                 {
-                        /* Follow the softlink. TODO: Must be a simple one? */
                         struct KeFsEntry* dest;
                         
@@ -154 +153 @@
         ListAddTail(&entry->next, &dir->entries);
         
+//      KePrint("%s\n", entry->name);
+        
         return entry;
 }
@@ -192 +193 @@
 
 SYMBOL_EXPORT(KeFsInitRoot);
+
+/* Recursively remove dir. */
+int KeFsRemoveDir(struct KeFsEntry* entry)
+{
+        struct KeFsDir* dir;
+        
+        if (!entry || !entry->name)
+                return -EFAULT;
+        
+        if (!(entry->type & VFS_ATTR_DIR))
+                return -ENOTDIR;
+                
+        dir=&entry->dir;
+        
+        /* The only directory without a parent is the root directory, which we
+         * can't remove. */
+        if (!dir->parent)
+                return -EPERM;
+                
+        ListRemove(&entry->next);
+        
+        ListForEachEntry(entry,&dir->entries,next)
+        {
+                /* Remove. */
+//              KePrint("Remove %s\n", entry->name);
+        }
+        
+        return 0;
+}