Fixed VESA scrolling bug

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

diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c
index 74427b5..d5e940e 100644 (file)
--- a/Kernel/vfs/open.c
+++ b/Kernel/vfs/open.c
@@ -269,7 +269,7 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
        
                // Check permissions on root of filesystem
                if( !VFS_CheckACL(curNode, VFS_PERM_EXECUTE) ) {
-                       curNode->Close( curNode );
+                       if(curNode->Close)      curNode->Close( curNode );
                        if(TruePath) {
                                free(*TruePath);
                                *TruePath = NULL;
@@ -280,7 +280,8 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
                }
                
                // Check if the node has a FindDir method
-               if(!curNode->FindDir) {
+               if( !curNode->FindDir )
+               {
                        if(curNode->Close)      curNode->Close(curNode);
                        if(TruePath) {
                                free(*TruePath);
@@ -295,8 +296,7 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
                // Get Child Node
                tmpNode = curNode->FindDir(curNode, &Path[ofs]);
                LOG("tmpNode = %p", tmpNode);
-               if(curNode->Close)
-                       curNode->Close(curNode);
+               if(curNode->Close)      curNode->Close(curNode);
                curNode = tmpNode;
                
                // Error Check
@@ -319,6 +319,13 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
                                *TruePath = NULL;
                        }
                        tmp = malloc( curNode->Size + 1 );
+                       if(!curNode->Read) {
+                               Warning("VFS_ParsePath - Read of node %p is NULL (%s)",
+                                       curNode, Path);
+                               if(curNode->Close)      curNode->Close(curNode);
+                               LEAVE('n');
+                               return NULL;
+                       }
                        curNode->Read( curNode, 0, curNode->Size, tmp );
                        tmp[ curNode->Size ] = '\0';
                        
@@ -471,7 +478,7 @@ int VFS_Open(char *Path, Uint Mode)
        
        // Permissions Check
        if( !VFS_CheckACL(node, i) ) {
-               node->Close( node );
+               if(node->Close) node->Close( node );
                Log("VFS_Open: Permissions Failed");
                LEAVE('i', -1);
                return -1;
@@ -528,6 +535,107 @@ int VFS_Open(char *Path, Uint Mode)
        return -1;
 }
 
+
+/**
+ * \brief Open a file from an open directory
+ */
+int VFS_OpenChild(Uint *Errno, int FD, char *Name, Uint Mode)
+{
+       tVFS_Handle     *h;
+       tVFS_Node       *node;
+        int    i;
+       
+       // Get handle
+       h = VFS_GetHandle(FD);
+       if(h == NULL) {
+               Log_Warning("VFS", "VFS_OpenChild - Invalid file handle 0x%x", FD);
+               if(Errno)       *Errno = EINVAL;
+               LEAVE('i', -1);
+               return -1;
+       }
+       
+       // Check for directory
+       if( !(h->Node->Flags & VFS_FFLAG_DIRECTORY) ) {
+               Log_Warning("VFS", "VFS_OpenChild - Passed handle is not a directory", FD);
+               if(Errno)       *Errno = ENOTDIR;
+               LEAVE('i', -1);
+               return -1;
+       }
+       
+       // Find Child
+       node = h->Node->FindDir(h->Node, Name);
+       if(!node) {
+               if(Errno)       *Errno = ENOENT;
+               LEAVE('i', -1);
+               return -1;
+       }
+       
+       i = 0;
+       i |= (Mode & VFS_OPENFLAG_EXEC) ? VFS_PERM_EXECUTE : 0;
+       i |= (Mode & VFS_OPENFLAG_READ) ? VFS_PERM_READ : 0;
+       i |= (Mode & VFS_OPENFLAG_WRITE) ? VFS_PERM_WRITE : 0;
+       
+       // Permissions Check
+       if( !VFS_CheckACL(node, i) ) {
+               if(node->Close) node->Close( node );
+               Log_Notice("VFS", "VFS_OpenChild - Permissions Failed");
+               if(Errno)       *Errno = EACCES;
+               LEAVE('i', -1);
+               return -1;
+       }
+       
+       // Check for a user open
+       if(Mode & VFS_OPENFLAG_USER)
+       {
+               // Allocate Buffer
+               if( MM_GetPhysAddr( (Uint)gaUserHandles ) == 0 )
+               {
+                       Uint    addr, size;
+                       size = CFGINT(CFG_VFS_MAXFILES) * sizeof(tVFS_Handle);
+                       for(addr = 0; addr < size; addr += 0x1000)
+                               MM_Allocate( (Uint)gaUserHandles + addr );
+                       memset( gaUserHandles, 0, size );
+               }
+               // Get a handle
+               for(i=0;i<CFGINT(CFG_VFS_MAXFILES);i++)
+               {
+                       if(gaUserHandles[i].Node)       continue;
+                       gaUserHandles[i].Node = node;
+                       gaUserHandles[i].Position = 0;
+                       gaUserHandles[i].Mode = Mode;
+                       LEAVE('i', i);
+                       return i;
+               }
+       }
+       else
+       {
+               // Allocate space if not already
+               if( MM_GetPhysAddr( (Uint)gaKernelHandles ) == 0 )
+               {
+                       Uint    addr, size;
+                       size = MAX_KERNEL_FILES * sizeof(tVFS_Handle);
+                       for(addr = 0; addr < size; addr += 0x1000)
+                               MM_Allocate( (Uint)gaKernelHandles + addr );
+                       memset( gaKernelHandles, 0, size );
+               }
+               // Get a handle
+               for(i=0;i<MAX_KERNEL_FILES;i++)
+               {
+                       if(gaKernelHandles[i].Node)     continue;
+                       gaKernelHandles[i].Node = node;
+                       gaKernelHandles[i].Position = 0;
+                       gaKernelHandles[i].Mode = Mode;
+                       LEAVE('x', i|VFS_KERNEL_FLAG);
+                       return i|VFS_KERNEL_FLAG;
+               }
+       }
+       
+       Log_Error("VFS", "VFS_OpenChild - Out of handles");
+       if(Errno)       *Errno = ENFILE;
+       LEAVE('i', -1);
+       return -1;
+}
+
 /**
  * \fn void VFS_Close(int FD)
  * \brief Closes an open file handle
@@ -539,7 +647,7 @@ void VFS_Close(int FD)
        // Get handle
        h = VFS_GetHandle(FD);
        if(h == NULL) {
-               Warning("Invalid file handle passed to VFS_Close, 0x%x\n", FD);
+               Log_Warning("VFS", "Invalid file handle passed to VFS_Close, 0x%x\n", FD);
                return;
        }
        
@@ -651,6 +759,8 @@ tVFS_Handle *VFS_GetHandle(int FD)
 {
        tVFS_Handle     *h;
        
+       //Log_Debug("VFS", "VFS_GetHandle: (FD=0x%x)", FD);
+       
        if(FD < 0)      return NULL;
        
        if(FD & VFS_KERNEL_FLAG) {
@@ -663,6 +773,7 @@ tVFS_Handle *VFS_GetHandle(int FD)
        }
        
        if(h->Node == NULL)     return NULL;
+       //Log_Debug("VFS", "VFS_GetHandle: RETURN %p", h);
        return h;
 }