Updated Usermode FInfo structure to match the kernel's copy

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

diff --git a/Kernel/vfs/fs/root.c b/Kernel/vfs/fs/root.c
index d966041..12417f2 100644 (file)
--- a/Kernel/vfs/fs/root.c
+++ b/Kernel/vfs/fs/root.c
@@ -2,6 +2,7 @@
  * AcessMicro VFS
  * - Root Filesystem Driver
  */
+#define DEBUG  0
 #include <acess.h>
 #include <vfs.h>
 #include <vfs_ramfs.h>
@@ -10,7 +11,7 @@
 #define MAX_FILES      64
 
 // === PROTOTYPES ===
-tVFS_Node      *Root_InitDevice(char *Device, char **Options);
+tVFS_Node      *Root_InitDevice(const char *Device, const char **Options);
  int   Root_MkNod(tVFS_Node *Node, const char *Name, Uint Flags);
 tVFS_Node      *Root_FindDir(tVFS_Node *Node, const char *Name);
 char   *Root_ReadDir(tVFS_Node *Node, int Pos);
@@ -36,10 +37,9 @@ tVFS_ACL     RootFS_FileACLs[3] = {
 
 // === CODE ===
 /**
- * \fn tVFS_Node *Root_InitDevice(char *Device, char **Options)
  * \brief Initialise the root filesystem
  */
-tVFS_Node *Root_InitDevice(char *Device, char **Options)
+tVFS_Node *Root_InitDevice(const char *Device, const char **Options)
 {
        tRamFS_File     *root;
        if(strcmp(Device, "root") != 0) {
@@ -73,13 +73,17 @@ tVFS_Node *Root_InitDevice(char *Device, 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);
        
+       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);
@@ -90,7 +94,6 @@ int Root_MkNod(tVFS_Node *Node, const char *Name, Uint Flags)
        child = Root_int_AllocFile();
        memset(child, 0, sizeof(tRamFS_File));
        
-       child->Name = malloc(strlen(Name)+1);
        strcpy(child->Name, Name);
        
        child->Parent = parent;
@@ -156,7 +159,7 @@ char *Root_ReadDir(tVFS_Node *Node, int Pos)
        
        for( ; child && Pos--; child = child->Next ) ;
        
-       if(Pos) return strdup(child->Name);
+       if(child)       return strdup(child->Name);
        
        return NULL;
 }
@@ -215,7 +218,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];
                }