Kernel - Cleaning up unneeded malloc() calls

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

diff --git a/Kernel/vfs/fs/root.c b/Kernel/vfs/fs/root.c
index d966041..22e60d4 100644 (file)
--- a/Kernel/vfs/fs/root.c
+++ b/Kernel/vfs/fs/root.c
@@ -10,7 +10,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 +36,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) {
@@ -78,6 +77,9 @@ int Root_MkNod(tVFS_Node *Node, const char *Name, Uint Flags)
        
        ENTER("pNode sName xFlags", Node, Name, Flags);
        
+       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 )
        {
@@ -90,7 +92,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 +157,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;
 }