git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed the x86 architecture to have tPAddr be 64-bits always
[tpg/acess2.git]
/
Kernel
/
vfs
/
open.c
diff --git
a/Kernel/vfs/open.c
b/Kernel/vfs/open.c
index
7382a0c
..
655272e
100644
(file)
--- a/
Kernel/vfs/open.c
+++ b/
Kernel/vfs/open.c
@@
-15,7
+15,7
@@
// === IMPORTS ===
extern tVFS_Node gVFS_MemRoot;
// === IMPORTS ===
extern tVFS_Node gVFS_MemRoot;
-extern tVFS_Mount *gRootMount;
+extern tVFS_Mount *g
VFS_
RootMount;
// === GLOBALS ===
tVFS_Handle *gaUserHandles = (void*)MM_PPD_VFS;
// === GLOBALS ===
tVFS_Handle *gaUserHandles = (void*)MM_PPD_VFS;
@@
-39,7
+39,6
@@
char *VFS_GetAbsPath(char *Path)
char *cwd = CFGPTR(CFG_VFS_CWD);
int cwdLen;
char *cwd = CFGPTR(CFG_VFS_CWD);
int cwdLen;
-
ENTER("sPath", Path);
// Memory File
ENTER("sPath", Path);
// Memory File
@@
-54,6
+53,7
@@
char *VFS_GetAbsPath(char *Path)
return ret;
}
return ret;
}
+ // - Fetch ChRoot
if( chroot == NULL ) {
chroot = "";
chrootLen = 0;
if( chroot == NULL ) {
chroot = "";
chrootLen = 0;
@@
-63,13
+63,12
@@
char *VFS_GetAbsPath(char *Path)
// Check if the path is already absolute
if(Path[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;
}
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 {
if(cwd == NULL) {
cwd = "/";
@@
-153,6
+152,14
@@
char *VFS_GetAbsPath(char *Path)
else
ret[iPos2] = 0;
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;
LEAVE('s', ret);
//Log("VFS_GetAbsPath: RETURN '%s'", ret);
return ret;
@@
-165,7
+172,7
@@
char *VFS_GetAbsPath(char *Path)
tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
{
tVFS_Mount *mnt;
tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
{
tVFS_Mount *mnt;
- tVFS_Mount *longestMount = g
RootMount;
// Root is first
+ tVFS_Mount *longestMount = g
VFS_RootMount;
// Root is first
int cmp, retLength = 0;
int ofs, nextSlash;
tVFS_Node *curNode, *tmpNode;
int cmp, retLength = 0;
int ofs, nextSlash;
tVFS_Node *curNode, *tmpNode;
@@
-187,21
+194,21
@@
tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
if(Path[0] == '/' && Path[1] == '\0') {
if(TruePath) {
if(Path[0] == '/' && Path[1] == '\0') {
if(TruePath) {
- *TruePath = malloc( gRootMount->MountPointLen+1 );
- strcpy(*TruePath, gRootMount->MountPoint);
+ *TruePath = malloc( g
VFS_
RootMount->MountPointLen+1 );
+ strcpy(*TruePath, g
VFS_
RootMount->MountPoint);
}
}
- LEAVE('p', gRootMount->RootNode);
- return gRootMount->RootNode;
+ LEAVE('p', g
VFS_
RootMount->RootNode);
+ return g
VFS_
RootMount->RootNode;
}
// Check if there is anything mounted
}
// Check if there is anything mounted
- if(!gMounts) {
+ if(!g
VFS_
Mounts) {
Warning("WTF! There's nothing mounted?");
return NULL;
}
// Find Mountpoint
Warning("WTF! There's nothing mounted?");
return NULL;
}
// Find Mountpoint
- for(mnt = gMounts;
+ for(mnt = g
VFS_
Mounts;
mnt;
mnt = mnt->Next)
{
mnt;
mnt = mnt->Next)
{
@@
-543,17
+550,16
@@
void VFS_Close(int FD)
}
/**
}
/**
- * \fn int VFS_ChDir(char *New)
* \brief Change current working directory
*/
* \brief Change current working directory
*/
-int VFS_ChDir(char *
New
)
+int VFS_ChDir(char *
Dest
)
{
char *buf;
int fd;
tVFS_Handle *h;
// Create Absolute
{
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(buf == NULL) {
Log("VFS_ChDir: Path expansion failed");
return -1;
@@
-659,3
+665,7
@@
tVFS_Handle *VFS_GetHandle(int FD)
if(h->Node == NULL) return NULL;
return h;
}
if(h->Node == NULL) return NULL;
return h;
}
+
+// === EXPORTS ===
+EXPORT(VFS_Open);
+EXPORT(VFS_Close);
UCC
git Repository :: git.ucc.asn.au