X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2Fnativefs.c;h=864a24bc07622f734780d61fa2f70a754ead0916;hb=a448627c1d3d7bd7ad98c1d1251dc46492a6ef43;hp=71774e23f41c1b91e9f80fd892704e2dbec73c96;hpb=45672f51180f1f0af73c2ba75723eca8f8bb8e89;p=tpg%2Facess2.git

diff --git a/AcessNative/acesskernel_src/nativefs.c b/AcessNative/acesskernel_src/nativefs.c
index 71774e23..864a24bc 100644
--- a/AcessNative/acesskernel_src/nativefs.c
+++ b/AcessNative/acesskernel_src/nativefs.c
@@ -5,13 +5,192 @@
  * nativefs.c
  * - Host filesystem access
  */
-#include <acess.h>
-#include <vfs.h>
+#define DEBUG	1
+#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
+
+//NOTES:
+// tVFS_Node->ImplPtr is a pointer to the filesystem flags (tNativeFS)
+// tVFS_Node->Data is the path string (heap string)
+// tVFS_Node->ImplInt is the path length
+
+// === STRUCTURES ===
+typedef struct
+{
+	 int	InodeHandle;
+	 int	bReadOnly;
+}	tNativeFS;
+
+// === PROTOTYPES ===
+ 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);
+Uint64	NativeFS_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
 
 // === GLOBALS ===
+tVFS_NodeType	gNativeFS_FileNodeType = {
+	.Read = NativeFS_Read
+};
+tVFS_NodeType	gNativeFS_DirNodeType = {
+	.FindDir = NativeFS_FindDir,
+	.ReadDir = NativeFS_ReadDir,
+};
+tVFS_Driver	gNativeFS_Driver = {
+	"nativefs", 0,
+	NativeFS_Mount,	NativeFS_Unmount,
+	NULL,
+};
 
 // === CODE ===
-tVFS_Node *Native_Mount(const char *Device, const char **Arguments)
+int NativeFS_Install(char **Arguments)
+{
+	VFS_AddDriver(&gNativeFS_Driver);
+	return 0;
+}
+
+tVFS_Node *NativeFS_Mount(const char *Device, const char **Arguments)
+{
+	tVFS_Node	*ret;
+	tNativeFS	*info;
+	DIR	*dp;
+	
+	dp = opendir(Device);
+	if(!dp) {
+		Log_Warning("NativeFS", "ERRO: Unable to open device root '%s'", Device);
+		return NULL;
+	}
+	
+	// Check if directory exists
+	// Parse flags from arguments
+	info = malloc(sizeof(tNativeFS));
+	info->InodeHandle = Inode_GetHandle();
+	info->bReadOnly = 0;
+	// Create node
+	ret = malloc(sizeof(tVFS_Node));
+	memset(ret, 0, sizeof(tVFS_Node));
+	ret->Data = strdup(Device);
+	ret->ImplInt = strlen(ret->Data);
+	ret->ImplPtr = info;
+	ret->Inode = (Uint64)dp;
+
+	ret->Type = &gNativeFS_DirNodeType;	
+	
+	return ret;
+}
+
+void NativeFS_Unmount(tVFS_Node *Node)
+{
+	tNativeFS	*info = Node->ImplPtr;
+	Inode_ClearCache( info->InodeHandle );
+	closedir( (void *)Node->Inode );
+	free(Node->Data);
+	free(Node);
+	free(info);
+}
+
+void NativeFS_Close(tVFS_Node *Node)
+{
+	tNativeFS	*info = Node->ImplPtr;
+	Inode_UncacheNode( info->InodeHandle, Node->Inode );
+}
+
+tVFS_Node *NativeFS_FindDir(tVFS_Node *Node, const char *Name)
+{
+	char	*path = malloc(Node->ImplInt + 1 + strlen(Name) + 1);
+	tNativeFS	*info = Node->ImplPtr;
+	tVFS_Node	baseRet;
+	struct stat statbuf;
+
+	ENTER("pNode sName", Node, Name);
+	
+	// Create path
+	strcpy(path, Node->Data);
+	path[Node->ImplInt] = '/';
+	strcpy(path + Node->ImplInt + 1, Name);
+	
+	LOG("path = '%s'", path);
+	
+	// Check if file exists
+	if( stat(path, &statbuf) ) {
+		free(path);
+		LOG("Doesn't exist");
+		LEAVE('n');
+		return NULL;
+	}
+	
+	memset(&baseRet, 0, sizeof(tVFS_Node));
+	
+	// Check file type
+	if( S_ISDIR(statbuf.st_mode) )
+	{
+		LOG("Directory");
+		baseRet.Inode = (Uint64) opendir(path);
+		baseRet.Type = &gNativeFS_DirNodeType;
+		baseRet.Flags |= VFS_FFLAG_DIRECTORY;
+		baseRet.Size = -1;
+	}
+	else
+	{
+		LOG("File");
+		baseRet.Inode = (Uint64) 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
+	baseRet.ImplPtr = info;
+	baseRet.ImplInt = strlen(path);
+	baseRet.Data = path;
+	
+	LEAVE('-');
+	return Inode_CacheNode(info->InodeHandle, &baseRet);
+}
+
+char *NativeFS_ReadDir(tVFS_Node *Node, int Position)
+{
+	struct dirent	*ent;
+	DIR	*dp = (void*)(tVAddr)Node->Inode;
+	char	*ret;
+
+	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('n');
+		return NULL;
+	}
+	
+	ret = strdup(ent->d_name);
+
+	// TODO: Unlock node	
+
+	LEAVE('s', ret);
+	return ret;
+}
+
+Uint64 NativeFS_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 {
-	return NULL;
+	ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Buffer);
+	if( fseek( (void *)Node->Inode, Offset, SEEK_SET ) != 0 )
+	{
+		LEAVE('i', 0);
+		return 0;
+	}
+	LEAVE('-');
+	return fread( Buffer, 1, Length, (void *)Node->Inode );
 }