* - Open, Close and ChDir
*/
#define DEBUG 0
-#include <common.h>
+#include <acess.h>
#include "vfs.h"
#include "vfs_int.h"
#include "vfs_ext.h"
// === IMPORTS ===
extern tVFS_Node gVFS_MemRoot;
-extern tVFS_Mount *gRootMount;
+extern tVFS_Mount *gVFS_RootMount;
// === GLOBALS ===
tVFS_Handle *gaUserHandles = (void*)MM_PPD_VFS;
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
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);
strcpy(ret, cwd);
ret[cwdLen] = '/';
strcpy(&ret[cwdLen+1], Path);
+ //Log("ret = '%s'\n", ret);
}
// Parse 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);
+ //Log("VFS_GetAbsPath: RETURN '%s'", ret);
return ret;
}
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;
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)
{
// Sanity Check
/*if(!longestMount) {
- Log("VFS_GetTruePath - ERROR: No Root Node\n");
+ Log("VFS_ParsePath - ERROR: No Root Node\n");
return NULL;
}*/
// 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;
}
- Log("Permissions fail on '%s'", Path);
+ //Log("Permissions fail on '%s'", Path);
LEAVE('n');
return NULL;
}
// Check if the node has a FindDir method
- if(!curNode->FindDir) {
+ if( !curNode->FindDir )
+ {
if(curNode->Close) curNode->Close(curNode);
if(TruePath) {
free(*TruePath);
*TruePath = NULL;
}
Path[nextSlash] = '/';
- Log("FindDir fail on '%s'", Path);
+ //Log("FindDir fail on '%s'", Path);
LEAVE('n');
return NULL;
}
// 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
free(*TruePath);
*TruePath = NULL;
}
- Log("Child fail on '%s' ('%s)", Path, &Path[ofs]);
+ //Log("Child fail on '%s' ('%s)", Path, &Path[ofs]);
Path[nextSlash] = '/';
LEAVE('n');
return NULL;
*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';
// 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');
// 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;
if( MM_GetPhysAddr( (Uint)gaUserHandles ) == 0 )
{
Uint addr, size;
- Log("Allocating %i user handles", CFGINT(CFG_VFS_MAXFILES));
size = CFGINT(CFG_VFS_MAXFILES) * sizeof(tVFS_Handle);
for(addr = 0; addr < size; addr += 0x1000)
MM_Allocate( (Uint)gaUserHandles + addr );
}
/**
- * \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;
// Set new
CFGPTR(CFG_VFS_CWD) = buf;
- //Log("Updated CWD to '%s'", buf);
+ Log("Updated CWD to '%s'", buf);
+
+ 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;
}
if(h->Node == NULL) return NULL;
return h;
}
+
+// === EXPORTS ===
+EXPORT(VFS_Open);
+EXPORT(VFS_Close);
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au