X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fopen.c;h=600cedc60e2364df622e8c334802e0cb1a6b283a;hb=54bf151b1a05b74debdb5f3baec02c18406b74d1;hp=a396465b538b5aad44f99586db7c87d38734e375;hpb=6a945643557084578509e149c84cf5dde3c59c3c;p=tpg%2Facess2.git diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c index a396465b..600cedc6 100644 --- a/Kernel/vfs/open.c +++ b/Kernel/vfs/open.c @@ -1,26 +1,21 @@ /* - * AcessMicro VFS + * Acess2 VFS * - Open, Close and ChDir */ #define DEBUG 0 #include -#include #include "vfs.h" #include "vfs_int.h" #include "vfs_ext.h" // === CONSTANTS === #define OPEN_MOUNT_ROOT 1 -#define MAX_KERNEL_FILES 128 #define MAX_PATH_SLASHES 256 // === IMPORTS === extern tVFS_Node gVFS_MemRoot; extern tVFS_Mount *gVFS_RootMount; - -// === GLOBALS === -tVFS_Handle *gaUserHandles = (void*)MM_PPD_VFS; -tVFS_Handle *gaKernelHandles = (void*)MM_KERNEL_VFS; +extern int VFS_AllocHandle(int bIsUser, tVFS_Node *Node, int Mode); // === CODE === /** @@ -35,9 +30,9 @@ char *VFS_GetAbsPath(const char *Path) char *tmpStr; int iPos = 0; int iPos2 = 0; - char *chroot = CFGPTR(CFG_VFS_CHROOT); + const char *chroot = CFGPTR(CFG_VFS_CHROOT); int chrootLen; - char *cwd = CFGPTR(CFG_VFS_CWD); + const char *cwd = CFGPTR(CFG_VFS_CWD); int cwdLen; ENTER("sPath", Path); @@ -46,7 +41,7 @@ char *VFS_GetAbsPath(const char *Path) if(Path[0] == '$') { ret = malloc(strlen(Path)+1); if(!ret) { - Warning("VFS_GetAbsPath - malloc() returned NULL"); + Log_Warning("VFS", "VFS_GetAbsPath: malloc() returned NULL"); return NULL; } strcpy(ret, Path); @@ -66,7 +61,7 @@ char *VFS_GetAbsPath(const char *Path) if(Path[0] == '/') { ret = malloc(pathLen + 1); if(!ret) { - Warning("VFS_GetAbsPath - malloc() returned NULL"); + Log_Warning("VFS", "VFS_GetAbsPath: malloc() returned NULL"); return NULL; } strcpy(ret, Path); @@ -83,7 +78,7 @@ char *VFS_GetAbsPath(const char *Path) strcpy(ret, cwd); ret[cwdLen] = '/'; strcpy(&ret[cwdLen+1], Path); - //Log("ret = '%s'\n", ret); + //Log("ret = '%s'", ret); } // Parse Path @@ -167,7 +162,7 @@ char *VFS_GetAbsPath(const char *Path) } /** - * \fn char *VFS_ParsePath(char *Path, char **TruePath) + * \fn char *VFS_ParsePath(const char *Path, char **TruePath) * \brief Parses a path, resolving sysmlinks and applying permissions */ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath) @@ -191,8 +186,8 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath) LEAVE('p', curNode); return curNode; } - // For root we always fast return + // For root we always fast return if(Path[0] == '/' && Path[1] == '\0') { if(TruePath) { *TruePath = malloc( gVFS_RootMount->MountPointLen+1 ); @@ -202,7 +197,7 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath) return gVFS_RootMount->RootNode; } - // Check if there is anything mounted + // Check if there is an`ything mounted if(!gVFS_Mounts) { Warning("WTF! There's nothing mounted?"); return NULL; @@ -237,12 +232,6 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath) longestMount = mnt; } - // Sanity Check - /*if(!longestMount) { - Log("VFS_ParsePath - ERROR: No Root Node\n"); - return NULL; - }*/ - // Save to shorter variable mnt = longestMount; @@ -260,7 +249,7 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath) curNode->ReferenceCount ++; // Parse Path ofs = mnt->MountPointLen+1; - for(; (nextSlash = strpos(&Path[ofs], '/')) != -1; ofs = nextSlash + 1) + for(; (nextSlash = strpos(&Path[ofs], '/')) != -1; ofs += nextSlash + 1) { char pathEle[nextSlash+1]; @@ -294,11 +283,14 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath) LEAVE('n'); return NULL; } - LOG("FindDir(%p, '%s')", curNode, pathEle); + LOG("FindDir{=%p}(%p, '%s')", curNode->FindDir, curNode, pathEle); // Get Child Node tmpNode = curNode->FindDir(curNode, pathEle); LOG("tmpNode = %p", tmpNode); - if(curNode->Close) curNode->Close(curNode); + if(curNode->Close) { + //LOG2("curNode->Close = %p", curNode->Close); + curNode->Close(curNode); + } curNode = tmpNode; // Error Check @@ -319,11 +311,19 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath) free(*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); + // No need to free *TruePath, see above + LEAVE('n'); + return NULL; + } + + tmp = malloc( curNode->Size + 1 ); + if(!tmp) { + Log_Warning("VFS", "VFS_ParsePath - Malloc failure"); + // No need to free *TruePath, see above LEAVE('n'); return NULL; } @@ -333,12 +333,13 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath) // Parse Symlink Path curNode = VFS_ParsePath(tmp, TruePath); if(TruePath) - Log_Debug("VFS", "*TruePath='%s'", *TruePath); + LOG("VFS", "*TruePath='%s'", *TruePath); // Error Check if(!curNode) { - Log("Symlink fail '%s'", tmp); + Log_Debug("VFS", "Symlink fail '%s'", tmp); free(tmp); // Free temp string + if(TruePath) free(TruePath); LEAVE('n'); return NULL; } @@ -367,11 +368,12 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath) if(!TruePath) continue; // Increase buffer space - tmp = realloc( *TruePath, retLength + strlen(&Path[ofs]) + 1 + 1 ); + tmp = realloc( *TruePath, retLength + strlen(pathEle) + 1 + 1 ); // Check if allocation succeeded if(!tmp) { Warning("VFS_ParsePath - Unable to reallocate true path buffer"); free(*TruePath); + *TruePath = NULL; if(curNode->Close) curNode->Close(curNode); LEAVE('n'); return NULL; @@ -380,8 +382,22 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath) // Append to path (*TruePath)[retLength] = '/'; strcpy(*TruePath+retLength+1, pathEle); + + LOG("*TruePath = '%s'", *TruePath); + // - Extend Path - retLength += nextSlash; + retLength += nextSlash + 1; + } + + if( !curNode->FindDir ) { + if(curNode->Close) curNode->Close(curNode); + if(TruePath) { + free(*TruePath); + *TruePath = NULL; + } + Log("FindDir fail on '%s'", Path); + LEAVE('n'); + return NULL; } // Get last node @@ -424,10 +440,10 @@ tVFS_Node *VFS_ParsePath(const char *Path, char **TruePath) } /** - * \fn int VFS_Open(char *Path, Uint Mode) + * \fn int VFS_Open(const char *Path, Uint Mode) * \brief Open a file */ -int VFS_Open(char *Path, Uint Mode) +int VFS_Open(const char *Path, Uint Mode) { tVFS_Node *node; char *absPath; @@ -437,6 +453,10 @@ int VFS_Open(char *Path, Uint Mode) // Get absolute path absPath = VFS_GetAbsPath(Path); + if(absPath == NULL) { + Log_Warning("VFS", "VFS_Open: Path expansion failed '%s'", Path); + return -1; + } LOG("absPath = \"%s\"", absPath); // Parse path and get mount point node = VFS_ParsePath(absPath, NULL); @@ -487,50 +507,10 @@ int VFS_Open(char *Path, Uint Mode) 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= 0 ) { + LEAVE('x', i); + return i; } Log("VFS_Open: Out of handles"); @@ -542,7 +522,7 @@ int VFS_Open(char *Path, Uint Mode) /** * \brief Open a file from an open directory */ -int VFS_OpenChild(Uint *Errno, int FD, char *Name, Uint Mode) +int VFS_OpenChild(Uint *Errno, int FD, const char *Name, Uint Mode) { tVFS_Handle *h; tVFS_Node *node; @@ -587,50 +567,10 @@ int VFS_OpenChild(Uint *Errno, int FD, char *Name, Uint Mode) 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= 0 ) { + LEAVE('x', i); + return i; } Log_Error("VFS", "VFS_OpenChild - Out of handles"); @@ -650,7 +590,7 @@ void VFS_Close(int FD) // Get handle h = VFS_GetHandle(FD); if(h == NULL) { - Log_Warning("VFS", "Invalid file handle passed to VFS_Close, 0x%x\n", FD); + Log_Warning("VFS", "Invalid file handle passed to VFS_Close, 0x%x", FD); return; } @@ -762,32 +702,6 @@ int VFS_ChRoot(char *New) return 1; } -/** - * \fn tVFS_Handle *VFS_GetHandle(int FD) - * \brief Gets a pointer to the handle information structure - */ -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) { - FD &= (VFS_KERNEL_FLAG - 1); - if(FD >= MAX_KERNEL_FILES) return NULL; - h = &gaKernelHandles[ FD ]; - } else { - if(FD >= CFGINT(CFG_VFS_MAXFILES)) return NULL; - h = &gaUserHandles[ FD ]; - } - - if(h->Node == NULL) return NULL; - //Log_Debug("VFS", "VFS_GetHandle: RETURN %p", h); - return h; -} - // === EXPORTS === EXPORT(VFS_Open); EXPORT(VFS_Close);