* - 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 *cwd = CFGPTR(CFG_VFS_CWD);
int cwdLen;
-
ENTER("sPath", Path);
// Memory File
return ret;
}
+ // - Fetch ChRoot
if( chroot == NULL ) {
chroot = "";
chrootLen = 0;
// Check if the path is already absolute
if(Path[0] == '/') {
- ret = malloc(chrootLen + pathLen + 1);
+ ret = malloc(pathLen + 1);
if(!ret) {
Warning("VFS_GetAbsPath - malloc() returned NULL");
return NULL;
}
- strcpy(ret, chroot);
- strcpy(ret+chrootLen, Path);
+ strcpy(ret, Path);
} else {
if(cwd == NULL) {
cwd = "/";
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;
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)
{
}
/**
- * \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;
if(h->Node == NULL) return NULL;
return h;
}
+
+// === EXPORTS ===
+EXPORT(VFS_Open);
+EXPORT(VFS_Close);