X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FFilesystems%2FInitRD%2Fmain.c;h=96f783e391fb9010af448d5de5ad7a45fe7c0af4;hb=e0f0c2384cc7e45b43c2c483913142943abd91f9;hp=02af043689c2f10af19a2aa1a8965bd3973c3741;hpb=cb414d6f5f9730d64b4914e45c14d9c16aea0b6c;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/Filesystems/InitRD/main.c b/KernelLand/Modules/Filesystems/InitRD/main.c
index 02af0436..96f783e3 100644
--- a/KernelLand/Modules/Filesystems/InitRD/main.c
+++ b/KernelLand/Modules/Filesystems/InitRD/main.c
@@ -18,7 +18,7 @@ tVFS_Node	*InitRD_InitDevice(const char *Device, const char **Arguments);
 void	InitRD_Unmount(tVFS_Node *Node);
 tVFS_Node	*InitRD_GetNodeFromINode(tVFS_Node *Root, Uint64 Inode);
 size_t	InitRD_ReadFile(tVFS_Node *Node, off_t Offset, size_t Size, void *Buffer);
-char	*InitRD_ReadDir(tVFS_Node *Node, int ID);
+ int	InitRD_ReadDir(tVFS_Node *Node, int ID, char Dest[FILENAME_MAX]);
 tVFS_Node	*InitRD_FindDir(tVFS_Node *Node, const char *Name);
 void	InitRD_DumpDir(tVFS_Node *Node, int Indent);
 
@@ -43,7 +43,6 @@ tVFS_NodeType	gInitRD_FileType = {
  */
 int InitRD_Install(char **Arguments)
 {
-	Log_Notice("InitRD", "Installed");
 	VFS_AddDriver( &gInitRD_FSInfo );
 	
 	return MODULE_ERR_OK;
@@ -57,7 +56,6 @@ tVFS_Node *InitRD_InitDevice(const char *Device, const char **Arguments)
 	#if DUMP_ON_MOUNT
 	InitRD_DumpDir( &gInitRD_RootNode, 0 );
 	#endif
-	Log_Notice("InitRD", "Mounted (%i files)", giInitRD_NumFiles);
 	return &gInitRD_RootNode;
 }
 
@@ -94,14 +92,15 @@ size_t InitRD_ReadFile(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffe
 /**
  * \brief Read from a directory
  */
-char *InitRD_ReadDir(tVFS_Node *Node, int ID)
+int InitRD_ReadDir(tVFS_Node *Node, int ID, char Dest[FILENAME_MAX])
 {
 	tInitRD_File	*dir = Node->ImplPtr;
 	
 	if(ID >= Node->Size)
-		return NULL;
+		return -EINVAL;
 	
-	return strdup(dir[ID].Name);
+	strncpy(Dest, dir[ID].Name, FILENAME_MAX);
+	return 0;
 }
 
 /**