X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fopen.c;h=ac47683f0631bf201991aae00531cdc19dd7fba2;hb=156885e938b60fee9d061d989ae7711c9aeea493;hp=a1245f3bf25f837e83614f48a02312ef21f8f86a;hpb=466eda7c917791866a29c253c6c22197faf41bf7;p=tpg%2Facess2.git diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c index a1245f3b..ac47683f 100644 --- a/Kernel/vfs/open.c +++ b/Kernel/vfs/open.c @@ -3,7 +3,7 @@ * - Open, Close and ChDir */ #define DEBUG 0 -#include +#include #include "vfs.h" #include "vfs_int.h" #include "vfs_ext.h" @@ -15,7 +15,7 @@ // === IMPORTS === extern tVFS_Node gVFS_MemRoot; -extern tVFS_Mount *gRootMount; +extern tVFS_Mount *gVFS_RootMount; // === GLOBALS === tVFS_Handle *gaUserHandles = (void*)MM_PPD_VFS; @@ -34,10 +34,11 @@ char *VFS_GetAbsPath(char *Path) char *tmpStr; int iPos = 0; int iPos2 = 0; + char *chroot = CFGPTR(CFG_VFS_CHROOT); + int chrootLen; char *cwd = CFGPTR(CFG_VFS_CWD); int cwdLen; - ENTER("sPath", Path); // Memory File @@ -52,6 +53,14 @@ char *VFS_GetAbsPath(char *Path) return ret; } + // - Fetch ChRoot + if( chroot == NULL ) { + chroot = ""; + chrootLen = 0; + } else { + chrootLen = strlen(chroot); + } + // Check if the path is already absolute if(Path[0] == '/') { ret = malloc(pathLen + 1); @@ -143,6 +152,14 @@ char *VFS_GetAbsPath(char *Path) else ret[iPos2] = 0; + + // Prepend the chroot + tmpStr = malloc(chrootLen + strlen(ret) + 1); + strcpy( tmpStr, chroot ); + strcpy( tmpStr+chrootLen, ret ); + free(ret); + ret = tmpStr; + LEAVE('s', ret); //Log("VFS_GetAbsPath: RETURN '%s'", ret); return ret; @@ -155,7 +172,7 @@ char *VFS_GetAbsPath(char *Path) tVFS_Node *VFS_ParsePath(char *Path, char **TruePath) { tVFS_Mount *mnt; - tVFS_Mount *longestMount = gRootMount; // Root is first + tVFS_Mount *longestMount = gVFS_RootMount; // Root is first int cmp, retLength = 0; int ofs, nextSlash; tVFS_Node *curNode, *tmpNode; @@ -177,21 +194,21 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath) if(Path[0] == '/' && Path[1] == '\0') { if(TruePath) { - *TruePath = malloc( gRootMount->MountPointLen+1 ); - strcpy(*TruePath, gRootMount->MountPoint); + *TruePath = malloc( gVFS_RootMount->MountPointLen+1 ); + strcpy(*TruePath, gVFS_RootMount->MountPoint); } - LEAVE('p', gRootMount->RootNode); - return gRootMount->RootNode; + LEAVE('p', gVFS_RootMount->RootNode); + return gVFS_RootMount->RootNode; } // Check if there is anything mounted - if(!gMounts) { + if(!gVFS_Mounts) { Warning("WTF! There's nothing mounted?"); return NULL; } // Find Mountpoint - for(mnt = gMounts; + for(mnt = gVFS_Mounts; mnt; mnt = mnt->Next) { @@ -252,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; @@ -263,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); @@ -278,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 @@ -302,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'; @@ -365,7 +389,7 @@ tVFS_Node *VFS_ParsePath(char *Path, char **TruePath) // Check if file was found if(!tmpNode) { LOG("Node '%s' not found in dir '%s'", &Path[ofs], Path); - Log("Child fail '%s' ('%s')", Path, &Path[ofs]); + //Log("Child fail '%s' ('%s')", Path, &Path[ofs]); if(TruePath) free(*TruePath); if(curNode->Close) curNode->Close(curNode); LEAVE('n'); @@ -454,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; @@ -533,17 +557,16 @@ void VFS_Close(int FD) } /** - * \fn int VFS_ChDir(char *New) * \brief Change current working directory */ -int VFS_ChDir(char *New) +int VFS_ChDir(char *Dest) { char *buf; int fd; tVFS_Handle *h; // Create Absolute - buf = VFS_GetAbsPath(New); + buf = VFS_GetAbsPath(Dest); if(buf == NULL) { Log("VFS_ChDir: Path expansion failed"); return -1; @@ -578,6 +601,55 @@ int VFS_ChDir(char *New) return 1; } +/** + * \fn int VFS_ChRoot(char *New) + * \brief Change current root directory + */ +int VFS_ChRoot(char *New) +{ + char *buf; + int fd; + tVFS_Handle *h; + + if(New[0] == '/' && New[1] == '\0') + return 1; // What a useless thing to ask! + + // Create Absolute + buf = VFS_GetAbsPath(New); + if(buf == NULL) { + LOG("Path expansion failed"); + return -1; + } + + // Check if path exists + fd = VFS_Open(buf, VFS_OPENFLAG_EXEC); + if(fd == -1) { + LOG("Path is invalid"); + return -1; + } + + // Get node so we can check for directory + h = VFS_GetHandle(fd); + if( !(h->Node->Flags & VFS_FFLAG_DIRECTORY) ) { + LOG("Path is not a directory"); + VFS_Close(fd); + return -1; + } + + // Close file + VFS_Close(fd); + + // Free old working directory + if( CFGPTR(CFG_VFS_CHROOT) ) + free( CFGPTR(CFG_VFS_CHROOT) ); + // Set new + CFGPTR(CFG_VFS_CHROOT) = buf; + + LOG("Updated Root to '%s'", buf); + + return 1; +} + /** * \fn tVFS_Handle *VFS_GetHandle(int FD) * \brief Gets a pointer to the handle information structure @@ -600,3 +672,7 @@ tVFS_Handle *VFS_GetHandle(int FD) if(h->Node == NULL) return NULL; return h; } + +// === EXPORTS === +EXPORT(VFS_Open); +EXPORT(VFS_Close);