Changeset 1081 for Whitix/branches/keobject/fs/icfs/icfs.c

Timestamp:

10/04/08 14:15:35 (3 months ago)

Author:

mwhitworth

Message:

Use new softlink code for IcFs, which uses KeFsEntrys. Add extra checks elsewhere.

Files:

• Whitix/branches/keobject/fs/icfs/icfs.c (modified) (3 diffs)

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

@@ -8 +8 @@
 
 #include "icfs.h"
+
+struct VfsSuperBlock* icFsSuperBlock;
 
 int IcFsWrite(struct File* file, BYTE* data, DWORD size)
@@ -53 +55 @@
 int IcFsFollowLink(struct VNode** ret, struct VNode* vNode)
 {
-        char buf[2048];
-        struct KeFsEntry* entry;
+        struct KeFsEntry* src, *dest;
         int err;
         
-        entry=(struct KeFsEntry*)(vNode->id);
+        src=(struct KeFsEntry*)(vNode->id);
         
         /* FIXME: Optimize */
-        entry->followLink(buf, 2048);
+        err = src->followLink(&dest, src);
+
+        if (err)
+                return err;
+
+        *ret = VNodeGet(icFsSuperBlock, (DWORD)dest);
         
-        err=NameToVNode(ret, buf, FILE_FORCE_OPEN, NULL);
+        if (!*ret)
+                return -ENOENT;
         
-        return err;
+        return 0;
 }
 
@@ -134 +141 @@
         ret->mount=VNodeGet(ret, (DWORD)IcFsGetRootId());
 
+        icFsSuperBlock = ret;
+
 end:
         return ret;