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
Cleanup
[tpg/acess2.git]
/
Kernel
/
vfs
/
open.c
diff --git
a/Kernel/vfs/open.c
b/Kernel/vfs/open.c
index
4327a6c
..
6f03417
100644
(file)
--- a/
Kernel/vfs/open.c
+++ b/
Kernel/vfs/open.c
@@
-31,7
+31,7
@@
char *VFS_GetAbsPath(char *Path)
char *ret;
int pathLen = strlen(Path);
int read, write;
char *ret;
int pathLen = strlen(Path);
int read, write;
- int pos,
base
Len;
+ int pos,
end
Len;
int slashNum = 0;
Uint slashOffsets[MAX_PATH_SLASHES];
char *cwd = CFGPTR(CFG_VFS_CWD);
int slashNum = 0;
Uint slashOffsets[MAX_PATH_SLASHES];
char *cwd = CFGPTR(CFG_VFS_CWD);
@@
-53,17
+53,24
@@
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] == '/') {
+ endLen = pathLen + 1;
ret = malloc(pathLen + 1);
if(!ret) {
Warning("VFS_GetAbsPath - malloc() returned NULL");
return NULL;
}
strcpy(ret, Path);
ret = malloc(pathLen + 1);
if(!ret) {
Warning("VFS_GetAbsPath - malloc() returned NULL");
return NULL;
}
strcpy(ret, Path);
- baseLen = 1;
} else {
} else {
- cwdLen = strlen(cwd);
+ if(cwd == NULL) {
+ cwd = "/";
+ cwdLen = 1;
+ }
+ else {
+ cwdLen = strlen(cwd);
+ }
+ endLen = cwdLen + pathLen + 2;
// Prepend the current directory
// Prepend the current directory
- ret = malloc(
cwdLen+pathLen+2
);
+ ret = malloc(
endLen
);
strcpy(ret, cwd);
ret[cwdLen] = '/';
strcpy(&ret[cwdLen+1], Path);
strcpy(ret, cwd);
ret[cwdLen] = '/';
strcpy(&ret[cwdLen+1], Path);
@@
-71,19
+78,16
@@
char *VFS_GetAbsPath(char *Path)
// Remove . and ..
read = write = 1; // Cwd has already been parsed
// Remove . and ..
read = write = 1; // Cwd has already been parsed
- for(; read <
baseLen+path
Len; read = pos+1)
+ for(; read <
end
Len; read = pos+1)
{
pos = strpos( &ret[read], '/' );
// If we are in the last section, force a break at the end of the itteration
{
pos = strpos( &ret[read], '/' );
// If we are in the last section, force a break at the end of the itteration
- if(pos == -1) pos =
baseLen+path
Len;
+ if(pos == -1) pos =
end
Len;
else pos += read; // Else, Adjust to absolute
else pos += read; // Else, Adjust to absolute
- //Log("pos-read = %i", pos-read);
-
// Check Length
if(pos - read <= 2)
{
// Check Length
if(pos - read <= 2)
{
- //Log("&ret[read] = '%s'", &ret[read]);
// Current Dir "."
if(strncmp(&ret[read], ".", pos-read) == 0) continue;
// Parent ".."
// Current Dir "."
if(strncmp(&ret[read], ".", pos-read) == 0) continue;
// Parent ".."
@@
-103,8
+107,9
@@
char *VFS_GetAbsPath(char *Path)
// Only copy if the positions differ
if(read != write) {
// Only copy if the positions differ
if(read != write) {
-
Log("write = %i, read = %i", write, read
);
+
//Log("write = %i, read = %i, pos-read+1 = %i", write, read, pos-read+1
);
memcpy( &ret[write], &ret[read], pos-read+1 );
memcpy( &ret[write], &ret[read], pos-read+1 );
+ //Log("ret = '%s'", ret);
}
if(slashNum < MAX_PATH_SLASHES)
}
if(slashNum < MAX_PATH_SLASHES)
@@
-120,9
+125,10
@@
char *VFS_GetAbsPath(char *Path)
write += (pos-read)+1;
}
write += (pos-read)+1;
}
+ ret[write] = '\0'; // Cap string (to deal with . or .. being the last terms)
// `ret` should now be the absolute path
LEAVE('s', ret);
// `ret` should now be the absolute path
LEAVE('s', ret);
- Log("VFS_GetAbsPath: RETURN '%s'", ret);
+
//
Log("VFS_GetAbsPath: RETURN '%s'", ret);
return ret;
}
return ret;
}
@@
-535,7
+541,8
@@
int VFS_ChDir(char *New)
VFS_Close(fd);
// Free old working directory
VFS_Close(fd);
// Free old working directory
- if( CFGPTR(CFG_VFS_CWD) ) free( CFGPTR(CFG_VFS_CWD) );
+ if( CFGPTR(CFG_VFS_CWD) )
+ free( CFGPTR(CFG_VFS_CWD) );
// Set new
CFGPTR(CFG_VFS_CWD) = buf;
// Set new
CFGPTR(CFG_VFS_CWD) = buf;
UCC
git Repository :: git.ucc.asn.au