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
Kernel/VFS - Fixed bug with setting flags on FD0
[tpg/acess2.git]
/
AcessNative
/
acesskernel_src
/
nativefs.c
diff --git
a/AcessNative/acesskernel_src/nativefs.c
b/AcessNative/acesskernel_src/nativefs.c
index
af25e3c
..
65e874d
100644
(file)
--- a/
AcessNative/acesskernel_src/nativefs.c
+++ b/
AcessNative/acesskernel_src/nativefs.c
@@
-5,7
+5,7
@@
* nativefs.c
\r
* - Host filesystem access
\r
*/
\r
* nativefs.c
\r
* - Host filesystem access
\r
*/
\r
-#define DEBUG
1
\r
+#define DEBUG
0
\r
#define off_t _acess_off_t
\r
#define sprintf _acess_sprintf
\r
#include <acess.h> // Acess
\r
#define off_t _acess_off_t
\r
#define sprintf _acess_sprintf
\r
#include <acess.h> // Acess
\r
@@
-154,11
+154,18
@@
tVFS_Node *NativeFS_FindDir(tVFS_Node *Node, const char *Name)
else
\r
{
\r
LOG("File");
\r
else
\r
{
\r
LOG("File");
\r
- baseRet.Inode = (Uint64)(tVAddr) fopen(path, "r+");
\r
+ FILE *fp = fopen(path, "r+");
\r
+ if( !fp ) {
\r
+ Log_Error("NativeFS", "fopen of '%s' failed: %s", path, strerror(errno));
\r
+ free(path);
\r
+ LEAVE('n');
\r
+ return NULL;
\r
+ }
\r
+ baseRet.Inode = (Uint64)(tVAddr) fp;
\r
baseRet.Type = &gNativeFS_FileNodeType;
\r
\r
baseRet.Type = &gNativeFS_FileNodeType;
\r
\r
- fseek(
(FILE*)(tVAddr)baseRet.Inode
, 0, SEEK_END );
\r
- baseRet.Size = ftell(
(FILE*)(tVAddr)baseRet.Inode
);
\r
+ fseek(
fp
, 0, SEEK_END );
\r
+ baseRet.Size = ftell(
fp
);
\r
}
\r
\r
// Create new node
\r
}
\r
\r
// Create new node
\r
@@
-205,8
+212,9
@@
size_t NativeFS_Read(tVFS_Node *Node, _acess_off_t Offset, size_t Length, void *
LEAVE('i', 0);
\r
return 0;
\r
}
\r
LEAVE('i', 0);
\r
return 0;
\r
}
\r
- LEAVE('-');
\r
- return fread( Buffer, 1, Length, (FILE *)(tVAddr)Node->Inode );
\r
+ size_t ret = fread( Buffer, 1, Length, (FILE *)(tVAddr)Node->Inode );
\r
+ LEAVE('x', ret);
\r
+ return ret;
\r
}
\r
\r
size_t NativeFS_Write(tVFS_Node *Node, _acess_off_t Offset, size_t Length, const void *Buffer)
\r
}
\r
\r
size_t NativeFS_Write(tVFS_Node *Node, _acess_off_t Offset, size_t Length, const void *Buffer)
\r
UCC
git Repository :: git.ucc.asn.au