Changeset 866

Timestamp:

09/01/08 18:29:41 (3 years ago)

Author:

mwhitworth

Message:

Move icfs functions to info.c

Files:

• Whitix/trunk/fs/infofs/infofs.c (modified) (4 diffs)

Whitix/trunk/fs/infofs/infofs.c

@@ -21 +21 @@
 }
 
+int IcFsFollowLink(struct VNode** ret, struct VNode* vNode)
+{
+        char buf[2048];
+        struct KeFsEntry* entry;
+        int err;
+        
+        entry=(struct KeFsEntry*)(vNode->id);
+        
+        entry->followLink(buf, 2048);
+        
+        err=NameToVNode(ret, buf, FILE_FORCE_OPEN);
+        
+        return err;
+}
+
 struct VNodeOps infoFsVOps=
 {
         .lookup=InfoLookup,
+        .followLink = IcFsFollowLink,
 };
 
-int InfoReadInt(struct File* file, struct IcFsEntry* iEnt, char* data, DWORD size)
-{
-        int copied;
-        
-        copied=MIN(size-file->position, sizeof(int)-file->position);
-        
-        memcpy(data, iEnt->iVal+file->position, copied);
-        
-        file->position+=copied;
-        
-        return copied;
-}
-
-int InfoReadStr(struct File* file, struct IcFsEntry* iEnt, char* data, DWORD size)
-{
-        int copied;
-        
-        copied=MIN(size-file->position, strlen(iEnt->sVal)-file->position);
-        
-        memcpy(data, iEnt->sVal+file->position, copied);
-        
-        file->position+=copied;
-        
-        return copied;
-}
-
-int InfoRead(struct File* file, char* data, DWORD size)
+int IcFsRead(struct File* file, char* data, DWORD size)
 {
         struct KeFsEntry* entry=(struct KeFsEntry*)(file->vNode->id);
         struct IcFsEntry* iEnt=(struct IcFsEntry*)(entry->file);
         
-        switch (iEnt->type)
-        {
-                case ICFS_TYPE_INT:
-                        return InfoReadInt(file, iEnt, data, size);
-                        
-                case ICFS_TYPE_STR:
-                        return InfoReadStr(file, iEnt, data, size);
-                        
-                default:
-                        KePrint("TODO: %d\n", iEnt->type);
-        }
-        
-        return 0;
+        return IcRead(&file->position, iEnt, data, size);
 }
 
-int InfoReadDir(struct File* file, void* dirEntries)
+int IcFsReadDir(struct File* file, void* dirEntries)
 {
         return KeFsReadDir(file, FillDir, dirEntries);
@@ -79 +57 @@
 struct FileOps infoFsFileOps=
 {
-        .read = InfoRead,
-        .readDir=InfoReadDir,
+        .read = IcFsRead,
+        .readDir=IcFsReadDir,
 };
 
-int InfoReadVNode(struct VNode* vNode)
+void IcFsReadVNode(struct VNode* vNode)
 {
         struct KeFsEntry* entry=(struct KeFsEntry*)(vNode->id);
@@ -89 +67 @@
         
         vNode->mode=entry->type;
-        vNode->vNodeOps=&infoFsVOps;
-        vNode->fileOps=&infoFsFileOps;
         
         if (vNode->mode & VFS_ATTR_DIR)
                 vNode->size=KeFsDirSize(&entry->dir);
-        else{
+        else if (vNode->mode & VFS_ATTR_FILE)
+        {
                 /* Fill in size. */
                 iEnt=entry->file;
@@ -108 +85 @@
                                 break;
                                 
+                        case ICFS_TYPE_BYTE:
+                                vNode->size=iEnt->size;
+                                break;
+                                
                         default:
                                 KePrint("TODO: %d\n", iEnt->type);
                 }
         }
+}
+
+int InfoReadVNode(struct VNode* vNode)
+{
+        IcFsReadVNode(vNode);
+        
+        vNode->vNodeOps=&infoFsVOps;
+        vNode->fileOps=&infoFsFileOps;
+        
+        vNode->mode &= ~VFS_ATTR_WRITE; /* Info entries are read-only. */
         
         return 0;