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
Just a little cleanup
[tpg/acess2.git]
/
KernelLand
/
Kernel
/
vfs
/
dir.c
diff --git
a/KernelLand/Kernel/vfs/dir.c
b/KernelLand/Kernel/vfs/dir.c
index
e2b124d
..
26f6f0f
100644
(file)
--- a/
KernelLand/Kernel/vfs/dir.c
+++ b/
KernelLand/Kernel/vfs/dir.c
@@
-36,6
+36,7
@@
int VFS_MkDir(const char *Path)
*/
int VFS_MkNod(const char *Path, Uint Flags)
{
*/
int VFS_MkNod(const char *Path, Uint Flags)
{
+ tVFS_Mount *mountpt;
char *absPath, *name;
int pos = 0, oldpos = 0;
int next = 0;
char *absPath, *name;
int pos = 0, oldpos = 0;
int next = 0;
@@
-60,9
+61,9
@@
int VFS_MkNod(const char *Path, Uint Flags)
// Check for root
if(absPath[0] == '\0')
// Check for root
if(absPath[0] == '\0')
- parent = VFS_ParsePath("/", NULL,
NULL
);
+ parent = VFS_ParsePath("/", NULL,
&mountpt
);
else
else
- parent = VFS_ParsePath(absPath, NULL,
NULL
);
+ parent = VFS_ParsePath(absPath, NULL,
&mountpt
);
LOG("parent = %p", parent);
LOG("parent = %p", parent);
@@
-70,10
+71,11
@@
int VFS_MkNod(const char *Path, Uint Flags)
LEAVE('i', -1);
return -1; // Error Check
}
LEAVE('i', -1);
return -1; // Error Check
}
-
+
// Permissions Check
if( !VFS_CheckACL(parent, VFS_PERM_EXECUTE|VFS_PERM_WRITE) ) {
_CloseNode(parent);
// Permissions Check
if( !VFS_CheckACL(parent, VFS_PERM_EXECUTE|VFS_PERM_WRITE) ) {
_CloseNode(parent);
+ mountpt->OpenHandleCount --;
free(absPath);
LEAVE('i', -1);
return -1;
free(absPath);
LEAVE('i', -1);
return -1;
@@
-82,7
+84,8
@@
int VFS_MkNod(const char *Path, Uint Flags)
LOG("parent = %p", parent);
if(!parent->Type || !parent->Type->MkNod) {
LOG("parent = %p", parent);
if(!parent->Type || !parent->Type->MkNod) {
- Warning("VFS_MkNod - Directory has no MkNod method");
+ Log_Warning("VFS", "VFS_MkNod - Directory has no MkNod method");
+ mountpt->OpenHandleCount --;
LEAVE('i', -1);
return -1;
}
LEAVE('i', -1);
return -1;
}
@@
-94,16
+97,12
@@
int VFS_MkNod(const char *Path, Uint Flags)
free(absPath);
// Free Parent
free(absPath);
// Free Parent
+ mountpt->OpenHandleCount --;
_CloseNode(parent);
_CloseNode(parent);
-
- // Error Check
- if(ret != 0) {
- LEAVE('i', -1);
- return -1;
- }
-
- LEAVE('i', 0);
- return 0;
+
+ // Return whatever the driver said
+ LEAVE('i', ret);
+ return ret;
}
/**
}
/**
UCC
git Repository :: git.ucc.asn.au