git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VFS - Rework to remove function pointers from tVFS_Node
[tpg/acess2.git]
/
Kernel
/
vfs
/
io.c
diff --git
a/Kernel/vfs/io.c
b/Kernel/vfs/io.c
index
f2d47ce
..
e7a2a06
100644
(file)
--- a/
Kernel/vfs/io.c
+++ b/
Kernel/vfs/io.c
@@
-2,22
+2,11
@@
* AcessMicro VFS
* - File IO Passthru's
*/
* AcessMicro VFS
* - File IO Passthru's
*/
+#define DEBUG 0
#include <acess.h>
#include "vfs.h"
#include "vfs_int.h"
#include <acess.h>
#include "vfs.h"
#include "vfs_int.h"
-#define DEBUG 0
-
-#if DEBUG
-#else
-# undef ENTER
-# undef LOG
-# undef LEAVE
-# define ENTER(...)
-# define LOG(...)
-# define LEAVE(...)
-#endif
-
// === CODE ===
/**
* \fn Uint64 VFS_Read(int FD, Uint64 Length, void *Buffer)
// === CODE ===
/**
* \fn Uint64 VFS_Read(int FD, Uint64 Length, void *Buffer)
@@
-31,23
+20,15
@@
Uint64 VFS_Read(int FD, Uint64 Length, void *Buffer)
ENTER("iFD XLength pBuffer", FD, Length, Buffer);
h = VFS_GetHandle(FD);
ENTER("iFD XLength pBuffer", FD, Length, Buffer);
h = VFS_GetHandle(FD);
- if(!h)
return -1
;
+ if(!h)
LEAVE_RET('i', -1)
;
- if( !(h->Mode & VFS_OPENFLAG_READ) || h->Node->Flags & VFS_FFLAG_DIRECTORY ) {
- LEAVE('i', -1);
- return -1;
- }
+ if( !(h->Mode & VFS_OPENFLAG_READ) || h->Node->Flags & VFS_FFLAG_DIRECTORY )
+ LEAVE_RET('i', -1);
- if(!h->Node->Read) {
- LEAVE('i', 0);
- return 0;
- }
+ if(!h->Node->Type || !h->Node->Type->Read) LEAVE_RET('i', 0);
- ret = h->Node->Read(h->Node, h->Position, Length, Buffer);
- if(ret == -1) {
- LEAVE('i', -1);
- return -1;
- }
+ ret = h->Node->Type->Read(h->Node, h->Position, Length, Buffer);
+ if(ret == -1) LEAVE_RET('i', -1);
h->Position += ret;
LEAVE('X', ret);
h->Position += ret;
LEAVE('X', ret);
@@
-69,20
+50,20
@@
Uint64 VFS_ReadAt(int FD, Uint64 Offset, Uint64 Length, void *Buffer)
if( !(h->Mode & VFS_OPENFLAG_READ) ) return -1;
if( h->Node->Flags & VFS_FFLAG_DIRECTORY ) return -1;
if( !(h->Mode & VFS_OPENFLAG_READ) ) return -1;
if( h->Node->Flags & VFS_FFLAG_DIRECTORY ) return -1;
- if(
!h->Nod
e->Read) {
+ if(
!h->Node->Type || !h->Node->Typ
e->Read) {
Warning("VFS_ReadAt - Node %p, does not have a read method", h->Node);
return 0;
}
Warning("VFS_ReadAt - Node %p, does not have a read method", h->Node);
return 0;
}
- ret = h->Node->Read(h->Node, Offset, Length, Buffer);
+ ret = h->Node->
Type->
Read(h->Node, Offset, Length, Buffer);
if(ret == -1) return -1;
return ret;
}
/**
if(ret == -1) return -1;
return ret;
}
/**
- * \fn Uint64 VFS_Write(int FD, Uint64 Length, void *Buffer)
+ * \fn Uint64 VFS_Write(int FD, Uint64 Length,
const
void *Buffer)
* \brief Read data from a node (file)
*/
* \brief Read data from a node (file)
*/
-Uint64 VFS_Write(int FD, Uint64 Length, void *Buffer)
+Uint64 VFS_Write(int FD, Uint64 Length,
const
void *Buffer)
{
tVFS_Handle *h;
Uint64 ret;
{
tVFS_Handle *h;
Uint64 ret;
@@
-93,19
+74,20
@@
Uint64 VFS_Write(int FD, Uint64 Length, void *Buffer)
if( !(h->Mode & VFS_OPENFLAG_WRITE) ) return -1;
if( h->Node->Flags & VFS_FFLAG_DIRECTORY ) return -1;
if( !(h->Mode & VFS_OPENFLAG_WRITE) ) return -1;
if( h->Node->Flags & VFS_FFLAG_DIRECTORY ) return -1;
- if(
!h->Node->Write)
return 0;
+ if(
!h->Node->Type || !h->Node->Type->Write )
return 0;
- ret = h->Node->Write(h->Node, h->Position, Length, Buffer);
+ ret = h->Node->
Type->
Write(h->Node, h->Position, Length, Buffer);
if(ret == -1) return -1;
if(ret == -1) return -1;
+
h->Position += ret;
return ret;
}
/**
h->Position += ret;
return ret;
}
/**
- * \fn Uint64 VFS_WriteAt(int FD, Uint64 Offset, Uint64 Length, void *Buffer)
+ * \fn Uint64 VFS_WriteAt(int FD, Uint64 Offset, Uint64 Length,
const
void *Buffer)
* \brief Write data to a file at a given offset
*/
* \brief Write data to a file at a given offset
*/
-Uint64 VFS_WriteAt(int FD, Uint64 Offset, Uint64 Length, void *Buffer)
+Uint64 VFS_WriteAt(int FD, Uint64 Offset, Uint64 Length,
const
void *Buffer)
{
tVFS_Handle *h;
Uint64 ret;
{
tVFS_Handle *h;
Uint64 ret;
@@
-116,8
+98,9
@@
Uint64 VFS_WriteAt(int FD, Uint64 Offset, Uint64 Length, void *Buffer)
if( !(h->Mode & VFS_OPENFLAG_WRITE) ) return -1;
if( h->Node->Flags & VFS_FFLAG_DIRECTORY ) return -1;
if( !(h->Mode & VFS_OPENFLAG_WRITE) ) return -1;
if( h->Node->Flags & VFS_FFLAG_DIRECTORY ) return -1;
- if(!h->Node->Write) return 0;
- ret = h->Node->Write(h->Node, Offset, Length, Buffer);
+ if(!h->Node->Type || !h->Node->Type->Write) return 0;
+ ret = h->Node->Type->Write(h->Node, Offset, Length, Buffer);
+
if(ret == -1) return -1;
return ret;
}
if(ret == -1) return -1;
return ret;
}
@@
-161,6
+144,8
@@
int VFS_Seek(int FD, Sint64 Offset, int Whence)
// Set relative to end of file
if(Whence < 0) {
// Set relative to end of file
if(Whence < 0) {
+ if( h->Node->Size == -1 ) return -1;
+
h->Position = h->Node->Size - Offset;
return 0;
}
h->Position = h->Node->Size - Offset;
return 0;
}
@@
-181,8
+166,8
@@
int VFS_IOCtl(int FD, int ID, void *Buffer)
h = VFS_GetHandle(FD);
if(!h) return -1;
h = VFS_GetHandle(FD);
if(!h) return -1;
- if(!h->Node->IOCtl) return -1;
- return h->Node->IOCtl(h->Node, ID, Buffer);
+ if(!h->Node->
Type || !h->Node->Type->
IOCtl) return -1;
+ return h->Node->
Type->
IOCtl(h->Node, ID, Buffer);
}
/**
}
/**
@@
-197,7
+182,12
@@
int VFS_FInfo(int FD, tFInfo *Dest, int MaxACLs)
h = VFS_GetHandle(FD);
if(!h) return -1;
h = VFS_GetHandle(FD);
if(!h) return -1;
-
+
+ if( h->Mount )
+ Dest->mount = h->Mount->Identifier;
+ else
+ Dest->mount = 0;
+ Dest->inode = h->Node->Inode;
Dest->uid = h->Node->UID;
Dest->gid = h->Node->GID;
Dest->size = h->Node->Size;
Dest->uid = h->Node->UID;
Dest->gid = h->Node->GID;
Dest->size = h->Node->Size;
UCC
git Repository :: git.ucc.asn.au