X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=AcessNative%2Facesskernel_src%2Fnativefs.c;h=0e791b8fe49167cf6154d4ceb8cb5839758f2bef;hb=9b61291b136d9fdc196ddab582cdb6cff8b70b09;hp=9de8ae2d280e9f845bd93116d66d89f9cde4c647;hpb=a4d8188f730bcc25cd4a6f4799ac7d65eb707cf2;p=tpg%2Facess2.git

diff --git a/AcessNative/acesskernel_src/nativefs.c b/AcessNative/acesskernel_src/nativefs.c
index 9de8ae2d..0e791b8f 100644
--- a/AcessNative/acesskernel_src/nativefs.c
+++ b/AcessNative/acesskernel_src/nativefs.c
@@ -5,9 +5,11 @@
  * nativefs.c
  * - Host filesystem access
  */
-#define DEBUG	1
+#define DEBUG	0
+#define off_t	_acess_off_t
 #include <acess.h>	// Acess
 #include <vfs.h>	// Acess
+#undef off_t
 #include <dirent.h>	// Posix
 #include <sys/stat.h>	// Posix
 #include <stdio.h>	// Posix
@@ -29,14 +31,26 @@ typedef struct
 tVFS_Node	*NativeFS_Mount(const char *Device, const char **Arguments);
 void	NativeFS_Unmount(tVFS_Node *Node);
 tVFS_Node	*NativeFS_FindDir(tVFS_Node *Node, const char *Name);
-char	*NativeFS_ReadDir(tVFS_Node *Node, int Position);
-Uint64	NativeFS_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
+ int	NativeFS_ReadDir(tVFS_Node *Node, int Position, char Dest[FILENAME_MAX]);
+size_t	NativeFS_Read(tVFS_Node *Node, _acess_off_t Offset, size_t Length, void *Buffer);
+size_t	NativeFS_Write(tVFS_Node *Node, _acess_off_t Offset, size_t Length, const void *Buffer);
+void	NativeFS_Close(tVFS_Node *Node);
 
 // === GLOBALS ===
+tVFS_NodeType	gNativeFS_FileNodeType = {
+	.Read = NativeFS_Read,
+	.Write = NativeFS_Write,
+	.Close = NativeFS_Close
+};
+tVFS_NodeType	gNativeFS_DirNodeType = {
+	.FindDir = NativeFS_FindDir,
+	.ReadDir = NativeFS_ReadDir,
+	.Close = NativeFS_Close
+};
 tVFS_Driver	gNativeFS_Driver = {
-	"nativefs", 0,
-	NativeFS_Mount,	NativeFS_Unmount,
-	NULL,
+	.Name = "nativefs",
+	.InitDevice = NativeFS_Mount,
+	.Unmount = NativeFS_Unmount
 };
 
 // === CODE ===
@@ -54,7 +68,7 @@ tVFS_Node *NativeFS_Mount(const char *Device, const char **Arguments)
 	
 	dp = opendir(Device);
 	if(!dp) {
-		Log_Warning("NativeFS", "ERRO: Unable to open device root '%s'", Device);
+		Log_Warning("NativeFS", "ERROR: Unable to open device root '%s'", Device);
 		return NULL;
 	}
 	
@@ -69,11 +83,11 @@ tVFS_Node *NativeFS_Mount(const char *Device, const char **Arguments)
 	ret->Data = strdup(Device);
 	ret->ImplInt = strlen(ret->Data);
 	ret->ImplPtr = info;
-	ret->Inode = (Uint64)dp;
-	
-	ret->FindDir = NativeFS_FindDir;
-	ret->ReadDir = NativeFS_ReadDir;
-	
+	ret->Inode = (Uint64)(tVAddr)dp;
+	ret->Flags = VFS_FFLAG_DIRECTORY;
+
+	ret->Type = &gNativeFS_DirNodeType;	
+
 	return ret;
 }
 
@@ -81,7 +95,7 @@ void NativeFS_Unmount(tVFS_Node *Node)
 {
 	tNativeFS	*info = Node->ImplPtr;
 	Inode_ClearCache( info->InodeHandle );
-	closedir( (void *)Node->Inode );
+	closedir( (void *)(tVAddr)Node->Inode );
 	free(Node->Data);
 	free(Node);
 	free(info);
@@ -90,12 +104,18 @@ void NativeFS_Unmount(tVFS_Node *Node)
 void NativeFS_Close(tVFS_Node *Node)
 {
 	tNativeFS	*info = Node->ImplPtr;
-	Inode_UncacheNode( info->InodeHandle, Node->Inode );
+	DIR	*dp = (Node->Flags & VFS_FFLAG_DIRECTORY) ? (DIR*)(tVAddr)Node->Inode : 0;
+	FILE	*fp = (Node->Flags & VFS_FFLAG_DIRECTORY) ? 0 : (FILE*)(tVAddr)Node->Inode;
+	
+	if( Inode_UncacheNode( info->InodeHandle, Node->Inode ) == 1 ) {
+		if(dp)	closedir(dp);
+		if(fp)	fclose(fp);
+	}
 }
 
 tVFS_Node *NativeFS_FindDir(tVFS_Node *Node, const char *Name)
 {
-	char	*path = malloc(Node->ImplInt + 1 + strlen(Name) + 1);
+	char	*path;
 	tNativeFS	*info = Node->ImplPtr;
 	tVFS_Node	baseRet;
 	struct stat statbuf;
@@ -103,6 +123,7 @@ tVFS_Node *NativeFS_FindDir(tVFS_Node *Node, const char *Name)
 	ENTER("pNode sName", Node, Name);
 	
 	// Create path
+	path = malloc(Node->ImplInt + 1 + strlen(Name) + 1);
 	strcpy(path, Node->Data);
 	path[Node->ImplInt] = '/';
 	strcpy(path + Node->ImplInt + 1, Name);
@@ -123,16 +144,19 @@ tVFS_Node *NativeFS_FindDir(tVFS_Node *Node, const char *Name)
 	if( S_ISDIR(statbuf.st_mode) )
 	{
 		LOG("Directory");
-		baseRet.Inode = (Uint64) opendir(path);
-		baseRet.FindDir = NativeFS_FindDir;
-		baseRet.ReadDir = NativeFS_ReadDir;
+		baseRet.Inode = (Uint64)(tVAddr) opendir(path);
+		baseRet.Type = &gNativeFS_DirNodeType;
 		baseRet.Flags |= VFS_FFLAG_DIRECTORY;
+		baseRet.Size = -1;
 	}
 	else
 	{
 		LOG("File");
-		baseRet.Inode = (Uint64) fopen(path, "r+");
-		baseRet.Read = NativeFS_Read;
+		baseRet.Inode = (Uint64)(tVAddr) fopen(path, "r+");
+		baseRet.Type = &gNativeFS_FileNodeType;
+		
+		fseek( (FILE*)(tVAddr)baseRet.Inode, 0, SEEK_END );
+		baseRet.Size = ftell( (FILE*)(tVAddr)baseRet.Inode );
 	}
 	
 	// Create new node
@@ -144,21 +168,57 @@ tVFS_Node *NativeFS_FindDir(tVFS_Node *Node, const char *Name)
 	return Inode_CacheNode(info->InodeHandle, &baseRet);
 }
 
-char *NativeFS_ReadDir(tVFS_Node *Node, int Position)
+int NativeFS_ReadDir(tVFS_Node *Node, int Position, char Dest[FILENAME_MAX])
 {
-	// Keep track of the current directory position
-	// TODO: Implement NativeFS_ReadDir
-	return NULL;
+	struct dirent	*ent;
+	DIR	*dp = (void*)(tVAddr)Node->Inode;
+
+	ENTER("pNode iPosition", Node, Position);
+
+	// TODO: Keep track of current position in the directory
+	// TODO: Lock node during this
+	rewinddir(dp);
+	do {
+		ent = readdir(dp);
+	} while(Position-- && ent);
+
+	if( !ent ) {
+		LEAVE('i', -ENOENT);
+		return -ENOENT;
+	}
+	
+	strncpy(Dest, ent->d_name, FILENAME_MAX);
+
+	// TODO: Unlock node	
+
+	LEAVE('i', 0);
+	return 0;
 }
 
-Uint64 NativeFS_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
+size_t NativeFS_Read(tVFS_Node *Node, _acess_off_t Offset, size_t Length, void *Buffer)
 {
-	ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Buffer);
-	if( fseek( (void *)Node->Inode, Offset, SEEK_SET ) != 0 )
+	ENTER("pNode XOffset xLength pBuffer", Node, Offset, Length, Buffer);
+	if( fseek( (FILE *)(tVAddr)Node->Inode, Offset, SEEK_SET ) != 0 )
 	{
 		LEAVE('i', 0);
 		return 0;
 	}
 	LEAVE('-');
-	return fread( Buffer, 1, Length, (void *)Node->Inode );
+	return fread( Buffer, 1, Length, (FILE *)(tVAddr)Node->Inode );
+}
+
+size_t NativeFS_Write(tVFS_Node *Node, _acess_off_t Offset, size_t Length, const void *Buffer)
+{
+	FILE	*fp = (FILE *)(tVAddr)Node->Inode;
+	ENTER("pNode XOffset xLength pBuffer", Node, Offset, Length, Buffer);
+	if( fseek( fp, Offset, SEEK_SET ) != 0 )
+	{
+		LEAVE('i', 0);
+		return 0;
+	}
+	size_t ret = fwrite( Buffer, 1, Length, fp );
+	fflush( fp );
+	LEAVE('i', ret);
+	return ret;
+
 }