VFS - Rework to remove function pointers from tVFS_Node

[tpg/acess2.git] / Kernel / vfs / fs / root.c

diff --git a/Kernel/vfs/fs/root.c b/Kernel/vfs/fs/root.c
index 22e60d4..9fa1732 100644 (file)
--- a/Kernel/vfs/fs/root.c
+++ b/Kernel/vfs/fs/root.c
@@ -2,12 +2,14 @@
  * AcessMicro VFS
  * - Root Filesystem Driver
  */
+#define DEBUG  0
 #include <acess.h>
 #include <vfs.h>
 #include <vfs_ramfs.h>
 
 // === CONSTANTS ===
 #define MAX_FILES      64
+#define        MAX_FILE_SIZE   1024
 
 // === PROTOTYPES ===
 tVFS_Node      *Root_InitDevice(const char *Device, const char **Options);
@@ -15,7 +17,7 @@ tVFS_Node     *Root_InitDevice(const char *Device, const char **Options);
 tVFS_Node      *Root_FindDir(tVFS_Node *Node, const char *Name);
 char   *Root_ReadDir(tVFS_Node *Node, int Pos);
 Uint64 Root_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
-Uint64 Root_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
+Uint64 Root_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, const void *Buffer);
 tRamFS_File    *Root_int_AllocFile(void);
 
 // === GLOBALS ===
@@ -33,6 +35,17 @@ tVFS_ACL     RootFS_FileACLs[3] = {
        {{1,0}, {0,VFS_PERM_ALL^VFS_PERM_EXECUTE}},     // Group (Root)
        {{0,-1}, {0,VFS_PERM_READ}}     // World (Nobody)
 };
+tVFS_NodeType  gRootFS_DirType = {
+       .TypeName = "RootFS-Dir",
+       .ReadDir = Root_ReadDir,
+       .FindDir = Root_FindDir,
+       .MkNod = Root_MkNod
+};
+tVFS_NodeType  gRootFS_FileType = {
+       .TypeName = "RootFS-File",
+       .Read = Root_Read,
+       .Write = Root_Write,
+};
 
 // === CODE ===
 /**
@@ -55,12 +68,8 @@ tVFS_Node *Root_InitDevice(const char *Device, const char **Options)
                = root->Node.ATime = now();
        root->Node.NumACLs = 3;
        root->Node.ACLs = RootFS_DirACLs;
-       
-       //root->Node.Close = Root_CloseFile;    // Not Needed (It's a RAM Disk!)
-       //root->Node.Relink = Root_RelinkRoot;  // Not Needed (Why relink the root of the tree)
-       root->Node.FindDir = Root_FindDir;
-       root->Node.ReadDir = Root_ReadDir;
-       root->Node.MkNod = Root_MkNod;
+
+       root->Node.Type = &gRootFS_DirType;
        
        return &root->Node;
 }
@@ -72,16 +81,17 @@ tVFS_Node *Root_InitDevice(const char *Device, const char **Options)
 int Root_MkNod(tVFS_Node *Node, const char *Name, Uint Flags)
 {
        tRamFS_File     *parent = Node->ImplPtr;
-       tRamFS_File     *child = parent->Data.FirstChild;
+       tRamFS_File     *child;
        tRamFS_File     *prev = (tRamFS_File *) &parent->Data.FirstChild;
        
        ENTER("pNode sName xFlags", Node, Name, Flags);
        
-       if(strlen(Name) + 1 > sizeof(child->Name));
+       LOG("%i > %i", strlen(Name)+1, sizeof(child->Name));
+       if(strlen(Name) + 1 > sizeof(child->Name))
                LEAVE_RET('i', 0);
        
        // Find last child, while we're at it, check for duplication
-       for( ; child; prev = child, child = child->Next )
+       for( child = parent->Data.FirstChild; child; prev = child, child = child->Next )
        {
                if(strcmp(child->Name, Name) == 0) {
                        LEAVE('i', 0);
@@ -106,16 +116,13 @@ int Root_MkNod(tVFS_Node *Node, const char *Name, Uint Flags)
        if(Flags & VFS_FFLAG_DIRECTORY)
        {
                child->Node.ACLs = RootFS_DirACLs;
-               child->Node.ReadDir = Root_ReadDir;
-               child->Node.FindDir = Root_FindDir;
-               child->Node.MkNod = Root_MkNod;
+               child->Node.Type = &gRootFS_DirType;
        } else {
                if(Flags & VFS_FFLAG_SYMLINK)
                        child->Node.ACLs = RootFS_DirACLs;
                else
                        child->Node.ACLs = RootFS_FileACLs;
-               child->Node.Read = Root_Read;
-               child->Node.Write = Root_Write;
+               child->Node.Type = &gRootFS_FileType;
        }
        
        prev->Next = child;
@@ -169,15 +176,21 @@ char *Root_ReadDir(tVFS_Node *Node, int Pos)
 Uint64 Root_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 {
        tRamFS_File     *file = Node->ImplPtr;
+       ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Buffer);
        
-       if(Offset > Node->Size) return 0;
-       if(Length > Node->Size) return 0;
+       if(Offset > Node->Size) {
+               LEAVE('i', 0);
+               return 0;
+       }
+       if(Length > Node->Size) Length = Node->Size;
        
        if(Offset+Length > Node->Size)
                Length = Node->Size - Offset;
        
        memcpy(Buffer, file->Data.Bytes+Offset, Length);
-       
+       LOG("Buffer = '%.*s'", (int)Length, Buffer);
+
+       LEAVE('i', Length);
        return Length;
 }
 
@@ -185,9 +198,23 @@ Uint64 Root_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
  * \fn Uint64 Root_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
  * \brief Write to a file in the root directory
  */
-Uint64 Root_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
+Uint64 Root_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, const void *Buffer)
 {
        tRamFS_File     *file = Node->ImplPtr;
+
+       ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Buffer);
+
+       if(Offset > Node->Size) {
+               LEAVE('i', -1);
+               return -1;
+       }       
+
+       if(Offset + Length > MAX_FILE_SIZE)
+       {
+               Length = MAX_FILE_SIZE - Offset;
+       }
+
+       LOG("Buffer = '%.*s'", (int)Length, Buffer);
        
        // Check if buffer needs to be expanded
        if(Offset + Length > Node->Size)
@@ -195,15 +222,18 @@ Uint64 Root_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
                void *tmp = realloc( file->Data.Bytes, Offset + Length );
                if(tmp == NULL) {
                        Warning("Root_Write - Increasing buffer size failed");
+                       LEAVE('i', -1);
                        return -1;
                }
                file->Data.Bytes = tmp;
                Node->Size = Offset + Length;
-               //LOG("Expanded buffer to %i bytes", Node->Size);
+               LOG("Expanded buffer to %i bytes", (int)Node->Size);
        }
        
        memcpy(file->Data.Bytes+Offset, Buffer, Length);
+       LOG("File - '%.*s'", Node->Size, file->Data.Bytes);
        
+       LEAVE('i', Length);
        return Length;
 }
 
@@ -216,7 +246,7 @@ tRamFS_File *Root_int_AllocFile(void)
         int    i;
        for( i = 0; i < MAX_FILES; i ++ )
        {
-               if( RootFS_Files[i].Name == NULL )
+               if( RootFS_Files[i].Name[0] == '\0' )
                {
                        return &RootFS_Files[i];
                }