* - Host filesystem access\r
*/\r
#define DEBUG 1\r
+#define off_t _acess_off_t\r
#include <acess.h> // Acess\r
#include <vfs.h> // Acess\r
+#undef off_t\r
#include <dirent.h> // Posix\r
#include <sys/stat.h> // Posix\r
#include <stdio.h> // Posix\r
Uint64 NativeFS_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);\r
\r
// === GLOBALS ===\r
+tVFS_NodeType gNativeFS_FileNodeType = {\r
+ .Read = NativeFS_Read\r
+};\r
+tVFS_NodeType gNativeFS_DirNodeType = {\r
+ .FindDir = NativeFS_FindDir,\r
+ .ReadDir = NativeFS_ReadDir,\r
+};\r
tVFS_Driver gNativeFS_Driver = {\r
"nativefs", 0,\r
NativeFS_Mount, NativeFS_Unmount,\r
DIR *dp;\r
\r
dp = opendir(Device);\r
- if(!dp) return NULL;\r
+ if(!dp) {\r
+ Log_Warning("NativeFS", "ERRO: Unable to open device root '%s'", Device);\r
+ return NULL;\r
+ }\r
\r
// Check if directory exists\r
// Parse flags from arguments\r
ret->ImplInt = strlen(ret->Data);\r
ret->ImplPtr = info;\r
ret->Inode = (Uint64)dp;\r
- \r
- ret->FindDir = NativeFS_FindDir;\r
- ret->ReadDir = NativeFS_ReadDir;\r
+ ret->Flags = VFS_FFLAG_DIRECTORY;\r
+\r
+ ret->Type = &gNativeFS_DirNodeType; \r
\r
return ret;\r
}\r
{\r
LOG("Directory");\r
baseRet.Inode = (Uint64) opendir(path);\r
- baseRet.FindDir = NativeFS_FindDir;\r
- baseRet.ReadDir = NativeFS_ReadDir;\r
+ baseRet.Type = &gNativeFS_DirNodeType;\r
baseRet.Flags |= VFS_FFLAG_DIRECTORY;\r
+ baseRet.Size = -1;\r
}\r
else\r
{\r
LOG("File");\r
baseRet.Inode = (Uint64) fopen(path, "r+");\r
- baseRet.Read = NativeFS_Read;\r
+ baseRet.Type = &gNativeFS_FileNodeType;\r
+ \r
+ fseek( (FILE*)(tVAddr)baseRet.Inode, 0, SEEK_END );\r
+ baseRet.Size = ftell( (FILE*)(tVAddr)baseRet.Inode );\r
}\r
\r
// Create new node\r
\r
char *NativeFS_ReadDir(tVFS_Node *Node, int Position)\r
{\r
- // Keep track of the current directory position\r
- return NULL;\r
+ struct dirent *ent;\r
+ DIR *dp = (void*)(tVAddr)Node->Inode;\r
+ char *ret;\r
+\r
+ ENTER("pNode iPosition", Node, Position);\r
+\r
+ // TODO: Keep track of current position in the directory\r
+ // TODO: Lock node during this\r
+ rewinddir(dp);\r
+ do {\r
+ ent = readdir(dp);\r
+ } while(Position-- && ent);\r
+\r
+ if( !ent ) {\r
+ LEAVE('n');\r
+ return NULL;\r
+ }\r
+ \r
+ ret = strdup(ent->d_name);\r
+\r
+ // TODO: Unlock node \r
+\r
+ LEAVE('s', ret);\r
+ return ret;\r
}\r
\r
Uint64 NativeFS_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)\r