X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2Fnativefs.c;h=1a0762745b21a7a822c7bf16c86a5a7a5aa7afdf;hb=b204bbefadbc511b2d9a5a17a099e75b46ebec6d;hp=cfdae750fc8f412904d444743da30ae4f84388cb;hpb=1beec799cb77981e14f0f7464a38a0f052129449;p=tpg%2Facess2.git

diff --git a/AcessNative/acesskernel_src/nativefs.c b/AcessNative/acesskernel_src/nativefs.c
index cfdae750..1a076274 100644
--- a/AcessNative/acesskernel_src/nativefs.c
+++ b/AcessNative/acesskernel_src/nativefs.c
@@ -7,9 +7,11 @@
  */
 #define DEBUG	0
 #define off_t	_acess_off_t
+#define sprintf _acess_sprintf
 #include <acess.h>	// Acess
 #include <vfs.h>	// Acess
 #undef off_t
+#undef sprintf
 #include <dirent.h>	// Posix
 #include <sys/stat.h>	// Posix
 #include <stdio.h>	// Posix
@@ -22,7 +24,7 @@
 // === STRUCTURES ===
 typedef struct
 {
-	 int	InodeHandle;
+	void	*InodeHandle;
 	 int	bReadOnly;
 }	tNativeFS;
 
@@ -30,22 +32,27 @@ typedef struct
  int	NativeFS_Install(char **Arguments);
 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);
-size_t	NativeFS_Read(tVFS_Node *Node, _acess_off_t Offset, size_t Length, void *Buffer);
+tVFS_Node	*NativeFS_FindDir(tVFS_Node *Node, const char *Name, Uint Flags);
+ 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, Uint Flags);
+size_t	NativeFS_Write(tVFS_Node *Node, _acess_off_t Offset, size_t Length, const void *Buffer, Uint Flags);
+void	NativeFS_Close(tVFS_Node *Node);
 
 // === GLOBALS ===
 tVFS_NodeType	gNativeFS_FileNodeType = {
-	.Read = NativeFS_Read
+	.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 ===
@@ -70,7 +77,7 @@ tVFS_Node *NativeFS_Mount(const char *Device, const char **Arguments)
 	// Check if directory exists
 	// Parse flags from arguments
 	info = malloc(sizeof(tNativeFS));
-	info->InodeHandle = Inode_GetHandle();
+	info->InodeHandle = Inode_GetHandle(NULL);
 	info->bReadOnly = 0;
 	// Create node
 	ret = malloc(sizeof(tVFS_Node));
@@ -99,12 +106,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)
+tVFS_Node *NativeFS_FindDir(tVFS_Node *Node, const char *Name, Uint Flags)
 {
-	char	*path = malloc(Node->ImplInt + 1 + strlen(Name) + 1);
+	char	*path;
 	tNativeFS	*info = Node->ImplPtr;
 	tVFS_Node	baseRet;
 	struct stat statbuf;
@@ -112,6 +125,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);
@@ -140,11 +154,18 @@ tVFS_Node *NativeFS_FindDir(tVFS_Node *Node, const char *Name)
 	else
 	{
 		LOG("File");
-		baseRet.Inode = (Uint64)(tVAddr) fopen(path, "r+");
+		FILE	*fp = fopen(path, "r+");
+		if( !fp ) {
+			Log_Error("NativeFS", "fopen of '%s' failed: %s", path, strerror(errno));
+			free(path);
+			LEAVE('n');
+			return NULL;
+		}
+		baseRet.Inode = (Uint64)(tVAddr) fp;
 		baseRet.Type = &gNativeFS_FileNodeType;
 		
-		fseek( (FILE*)(tVAddr)baseRet.Inode, 0, SEEK_END );
-		baseRet.Size = ftell( (FILE*)(tVAddr)baseRet.Inode );
+		fseek( fp, 0, SEEK_END );
+		baseRet.Size = ftell( fp );
 	}
 	
 	// Create new node
@@ -156,11 +177,10 @@ 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])
 {
 	struct dirent	*ent;
 	DIR	*dp = (void*)(tVAddr)Node->Inode;
-	char	*ret;
 
 	ENTER("pNode iPosition", Node, Position);
 
@@ -172,26 +192,43 @@ char *NativeFS_ReadDir(tVFS_Node *Node, int Position)
 	} while(Position-- && ent);
 
 	if( !ent ) {
-		LEAVE('n');
-		return NULL;
+		LEAVE('i', -ENOENT);
+		return -ENOENT;
 	}
 	
-	ret = strdup(ent->d_name);
+	strncpy(Dest, ent->d_name, FILENAME_MAX);
 
 	// TODO: Unlock node	
 
-	LEAVE('s', ret);
+	LEAVE('i', 0);
+	return 0;
+}
+
+size_t NativeFS_Read(tVFS_Node *Node, _acess_off_t Offset, size_t Length, void *Buffer, Uint Flags)
+{
+	ENTER("pNode XOffset xLength pBuffer", Node, Offset, Length, Buffer);
+	if( fseek( (FILE *)(tVAddr)Node->Inode, Offset, SEEK_SET ) != 0 )
+	{
+		LEAVE('i', 0);
+		return 0;
+	}
+	size_t ret = fread( Buffer, 1, Length, (FILE *)(tVAddr)Node->Inode );
+	LEAVE('x', ret);
 	return ret;
 }
 
-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, Uint Flags)
 {
+	FILE	*fp = (FILE *)(tVAddr)Node->Inode;
 	ENTER("pNode XOffset xLength pBuffer", Node, Offset, Length, Buffer);
-	if( fseek( (void *)(tVAddr)Node->Inode, Offset, SEEK_SET ) != 0 )
+	if( fseek( fp, Offset, SEEK_SET ) != 0 )
 	{
 		LEAVE('i', 0);
 		return 0;
 	}
-	LEAVE('-');
-	return fread( Buffer, 1, Length, (void *)(tVAddr)Node->Inode );
+	size_t ret = fwrite( Buffer, 1, Length, fp );
+	fflush( fp );
+	LEAVE('i', ret);
+	return ret;
+
 }