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 and Bugfixes
[tpg/acess2.git]
/
Kernel
/
vfs
/
open.c
diff --git
a/Kernel/vfs/open.c
b/Kernel/vfs/open.c
index
f827473
..
3a68703
100644
(file)
--- a/
Kernel/vfs/open.c
+++ b/
Kernel/vfs/open.c
@@
-30,10
+30,12
@@
char *VFS_GetAbsPath(char *Path)
{
char *ret;
int pathLen = strlen(Path);
- int read, write;
- int pos, endLen;
- int slashNum = 0;
- Uint slashOffsets[MAX_PATH_SLASHES];
+ char *pathComps[MAX_PATH_SLASHES];
+ char *tmpStr;
+ int iPos = 0;
+ int iPos2 = 0;
+ char *chroot = CFGPTR(CFG_VFS_CHROOT);
+ int chrootLen;
char *cwd = CFGPTR(CFG_VFS_CWD);
int cwdLen;
@@
-51,9
+53,16
@@
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] == '/') {
- endLen = pathLen + 1;
ret = malloc(pathLen + 1);
if(!ret) {
Warning("VFS_GetAbsPath - malloc() returned NULL");
@@
-61,67
+70,98
@@
char *VFS_GetAbsPath(char *Path)
}
strcpy(ret, Path);
} else {
- cwdLen = strlen(cwd);
- endLen = cwdLen + pathLen + 2;
+ if(cwd == NULL) {
+ cwd = "/";
+ cwdLen = 1;
+ }
+ else {
+ cwdLen = strlen(cwd);
+ }
// Prepend the current directory
- ret = malloc(
endLen
);
+ ret = malloc(
cwdLen + 1 + pathLen + 1
);
strcpy(ret, cwd);
ret[cwdLen] = '/';
strcpy(&ret[cwdLen+1], Path);
+ //Log("ret = '%s'\n", ret);
}
- //
Remove . and ..
- read = write = 1; // Cwd has already been parsed
-
for(; read < endLen; read = pos+1
)
+ //
Parse Path
+ pathComps[iPos++] = tmpStr = ret+1;
+
while(*tmpStr
)
{
- pos = strpos( &ret[read], '/' );
- // If we are in the last section, force a break at the end of the itteration
- if(pos == -1) pos = endLen;
- else pos += read; // Else, Adjust to absolute
-
- // Check Length
- if(pos - read <= 2)
+ if(*tmpStr++ == '/')
{
- // Current Dir "."
- if(strncmp(&ret[read], ".", pos-read) == 0) continue;
- // Parent ".."
- if(strncmp(&ret[read], "..", pos-read) == 0)
- {
- // If there is no higher, silently ignore
- if(slashNum < 1) {
- write = 1;
- continue;
- }
- // Reverse write pointer
- write = slashOffsets[ --slashNum ];
- continue;
+ pathComps[iPos++] = tmpStr;
+ if(iPos == MAX_PATH_SLASHES) {
+ LOG("Path '%s' has too many elements", Path);
+ free(ret);
+ LEAVE('n');
+ return NULL;
}
}
-
-
- // Only copy if the positions differ
- if(read != write) {
- //Log("write = %i, read = %i, pos-read+1 = %i", write, read, pos-read+1);
- memcpy( &ret[write], &ret[read], pos-read+1 );
- //Log("ret = '%s'", ret);
+ }
+ pathComps[iPos] = NULL;
+
+ // Cleanup
+ iPos2 = iPos = 0;
+ while(pathComps[iPos])
+ {
+ tmpStr = pathComps[iPos];
+ // Always Increment iPos
+ iPos++;
+ // ..
+ if(tmpStr[0] == '.' && tmpStr[1] == '.' && (tmpStr[2] == '/' || tmpStr[2] == '\0') )
+ {
+ if(iPos2 != 0)
+ iPos2 --;
+ continue;
}
-
- if(slashNum < MAX_PATH_SLASHES)
- slashOffsets[ slashNum++ ] = write;
- else {
- LOG("Path '%s' has too many elements", Path);
- free(ret);
- LEAVE('n');
- return NULL;
+ // .
+ if(tmpStr[0] == '.' && (tmpStr[1] == '/' || tmpStr[1] == '\0') )
+ {
+ continue;
+ }
+ // Empty
+ if(tmpStr[0] == '/' || tmpStr[0] == '\0')
+ {
+ continue;
}
- // Increment write pointer
- write += (pos-read)+1;
+ // Set New Position
+ pathComps[iPos2] = tmpStr;
+ iPos2++;
}
+ pathComps[iPos2] = NULL;
+
+ // Build New Path
+ iPos2 = 1; iPos = 0;
+ ret[0] = '/';
+ while(pathComps[iPos])
+ {
+ tmpStr = pathComps[iPos];
+ while(*tmpStr && *tmpStr != '/')
+ {
+ ret[iPos2++] = *tmpStr;
+ tmpStr++;
+ }
+ ret[iPos2++] = '/';
+ iPos++;
+ }
+ if(iPos2 > 1)
+ ret[iPos2-1] = 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;
- // `ret` should now be the absolute path
LEAVE('s', ret);
- Log("VFS_GetAbsPath: RETURN '%s'", ret);
+
//
Log("VFS_GetAbsPath: RETURN '%s'", ret);
return ret;
}
@@
-162,7
+202,10
@@
tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
}
// Check if there is anything mounted
- if(!gMounts) return NULL;
+ if(!gMounts) {
+ Warning("WTF! There's nothing mounted?");
+ return NULL;
+ }
// Find Mountpoint
for(mnt = gMounts;
@@
-195,7
+238,7
@@
tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
// Sanity Check
/*if(!longestMount) {
- Log("VFS_
GetTru
ePath - ERROR: No Root Node\n");
+ Log("VFS_
Pars
ePath - ERROR: No Root Node\n");
return NULL;
}*/
@@
-231,6
+274,7
@@
tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
free(*TruePath);
*TruePath = NULL;
}
+ //Log("Permissions fail on '%s'", Path);
LEAVE('n');
return NULL;
}
@@
-243,6
+287,7
@@
tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
*TruePath = NULL;
}
Path[nextSlash] = '/';
+ //Log("FindDir fail on '%s'", Path);
LEAVE('n');
return NULL;
}
@@
-261,6
+306,7
@@
tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
free(*TruePath);
*TruePath = NULL;
}
+ //Log("Child fail on '%s' ('%s)", Path, &Path[ofs]);
Path[nextSlash] = '/';
LEAVE('n');
return NULL;
@@
-281,6
+327,7
@@
tVFS_Node *VFS_ParsePath(char *Path, char **TruePath)
// Error Check
if(!curNode) {
+ Log("Symlink fail '%s'", tmp);
free(tmp); // Free temp string
LEAVE('n');
return NULL;
@@
-335,6
+382,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]);
if(TruePath) free(*TruePath);
if(curNode->Close) curNode->Close(curNode);
LEAVE('n');
@@
-409,6
+457,7
@@
int VFS_Open(char *Path, Uint Mode)
}
if(!node) {
+ LOG("Cannot find node");
LEAVE('i', -1);
return -1;
}
@@
-423,6
+472,7
@@
int VFS_Open(char *Path, Uint Mode)
// Permissions Check
if( !VFS_CheckACL(node, i) ) {
node->Close( node );
+ Log("VFS_Open: Permissions Failed");
LEAVE('i', -1);
return -1;
}
@@
-473,6
+523,7
@@
int VFS_Open(char *Path, Uint Mode)
}
}
+ Log("VFS_Open: Out of handles");
LEAVE('i', -1);
return -1;
}
@@
-534,7
+585,8
@@
int VFS_ChDir(char *New)
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;
@@
-543,6
+595,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
@@
-565,3
+666,7
@@
tVFS_Handle *VFS_GetHandle(int FD)
if(h->Node == NULL) return NULL;
return h;
}
+
+// === EXPORTS ===
+EXPORT(VFS_Open);
+EXPORT(VFS_Close);
UCC
git Repository :: git.ucc.asn.au