Kernel - VFS API Update - ReadDir caller provided buffer

[tpg/acess2.git] / KernelLand / Kernel / vfs / open.c

diff --git a/KernelLand/Kernel/vfs/open.c b/KernelLand/Kernel/vfs/open.c
index e4d2bb2..5ea67c1 100644 (file)
--- a/KernelLand/Kernel/vfs/open.c
+++ b/KernelLand/Kernel/vfs/open.c
@@ -292,7 +292,7 @@ restart_parse:
                }
                if( !curNode->Type->FindDir )
                {
-                       LOG("Finddir failure on '%s' - No FindDir method in %s", Path, curNode->Type->Name);
+                       LOG("Finddir failure on '%s' - No FindDir method in %s", Path, curNode->Type->TypeName);
                        goto _error;
                }
                LOG("FindDir{=%p}(%p, '%s')", curNode->Type->FindDir, curNode, pathEle);
@@ -391,7 +391,7 @@ restart_parse:
        LOG("tmpNode = %p", tmpNode);
        // Check if file was found
        if(!tmpNode) {
-               LOG("Node '%s' not found in dir '%s'", &Path[ofs], Path);
+               LOG("Node '%s' not found in dir '%.*s'", &Path[ofs], ofs, Path);
                goto _error;
        }
        _CloseNode( curNode );
@@ -504,12 +504,44 @@ int VFS_OpenEx(const char *Path, Uint Flags, Uint Mode)
        if( !node && (Flags & VFS_OPENFLAG_CREATE) )
        {
                // TODO: Translate `Mode` into ACL and node flags
-               // Get parent, create node
-               if( VFS_MkNod(absPath, 0) ) {
+               Uint    new_flags = 0;
+               
+               // Split path at final separator
+               char *file = strrchr(absPath, '/');
+               *file = '\0';
+               file ++;
+
+               // Get parent node
+               tVFS_Mount      *pmnt;
+               tVFS_Node *pnode = VFS_ParsePath(absPath, NULL, &pmnt);
+               if(!pnode) {
+                       LOG("Unable to open parent '%s'", absPath);
+                       free(absPath);
+                       errno = ENOENT;
+                       LEAVE_RET('i', -1);
+               }
+
+               // TODO: Check ACLs on the parent
+               if( !VFS_CheckACL(pnode, VFS_PERM_EXECUTE|VFS_PERM_WRITE) ) {
+                       _CloseNode(pnode);
+                       pmnt->OpenHandleCount --;
                        free(absPath);
+                       LEAVE('i', -1);
                        return -1;
                }
-               node = VFS_ParsePath(absPath, NULL, &mnt);
+
+               // Check that there's a MkNod method
+               if( !pnode->Type || !pnode->Type->MkNod ) {
+                       Log_Warning("VFS", "VFS_Open - Directory has no MkNod method");
+                       errno = EINVAL;
+                       LEAVE_RET('i', -1);
+               }
+               
+               node = pnode->Type->MkNod(pnode, file, new_flags);
+               // Fall through on error check
+               
+               _CloseNode(pnode);
+               pmnt->OpenHandleCount --;
        }
        
        // Free generated path