* AcessMicro VFS
* - Open, Close and ChDir
*/
+#define DEBUG 0
#include <common.h>
#include "vfs.h"
#include "vfs_int.h"
#include "vfs_ext.h"
-#define DEBUG 0
-
-#if DEBUG
-#else
-# undef ENTER
-# undef LOG
-# undef LEAVE
-# define ENTER(...)
-# define LOG(...)
-# define LEAVE(...)
-#endif
-
// === CONSTANTS ===
#define OPEN_MOUNT_ROOT 1
#define MAX_KERNEL_FILES 128
+#define MAX_PATH_SLASHES 256
// === IMPORTS ===
extern tVFS_Node gVFS_MemRoot;
char *ret;
int pathLen = strlen(Path);
int read, write;
- int pos, slashNum=0, baseLen;
- Uint slashOffsets[256];
+ int pos, slashNum=1, baseLen;
+ Uint slashOffsets[MAX_PATH_SLASHES] = {1};
char *cwd = CFGPTR(CFG_VFS_CWD);
int cwdLen;
// Memory File
if(Path[0] == '$') {
ret = malloc(strlen(Path)+1);
+ if(!ret) {
+ Warning("VFS_GetAbsPath - malloc() returned NULL");
+ return NULL;
+ }
strcpy(ret, Path);
LEAVE('p', ret);
return ret;
// Check if the path is already absolute
if(Path[0] == '/') {
ret = malloc(pathLen + 1);
+ if(!ret) {
+ Warning("VFS_GetAbsPath - malloc() returned NULL");
+ return NULL;
+ }
strcpy(ret, Path);
baseLen = 1;
} else {
cwdLen = strlen(cwd);
// Prepend the current directory
- ret = malloc(cwdLen+pathLen+1);
+ ret = malloc(cwdLen+pathLen+2);
strcpy(ret, cwd);
- strcpy(&ret[cwdLen], Path);
-
- // Pre-fill the slash positions
- pos = 0;
- while( (pos = strpos( &ret[pos+1], '/' )) != -1 )
- slashOffsets[slashNum++] = pos;
-
- baseLen = cwdLen;
+ ret[cwdLen] = '/';
+ strcpy(&ret[cwdLen+1], Path);
}
// Remove . and ..
- read = write = baseLen; // Cwd has already been parsed
+ read = write = 1; // Cwd has already been parsed
for(; read < baseLen+pathLen; read = pos+1)
{
pos = strpos( &ret[read], '/' );
if(pos == -1) pos = baseLen+pathLen;
else pos += read; // Else, Adjust to absolute
+ //Log("pos-read = %i", pos-read);
+
// Check Length
if(pos - read <= 2)
{
+ //Log("&ret[read] = '%s'", &ret[read]);
// 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) continue;
+ if(slashNum < 2) continue;
// Reverse write pointer
- write = slashOffsets[ slashNum-- ];
+ write = slashOffsets[ --slashNum - 1 ];
continue;
}
}
// Only copy if the positions differ
if(read != write) {
+ Log("write = %i, read = %i", write, read);
memcpy( &ret[write], &ret[read], pos-read+1 );
}
- write = pos+1;
- if(slashNum < 256)
- slashOffsets[ slashNum++ ] = pos;
+ write += (pos-read)+1;
+
+ if(slashNum < MAX_PATH_SLASHES)
+ slashOffsets[ slashNum++ ] = write;
else {
LOG("Path '%s' has too many elements", Path);
free(ret);
// `ret` should now be the absolute path
LEAVE('s', ret);
+ Log("VFS_GetAbsPath: RETURN '%s'", ret);
return ret;
}
// Check permissions on root of filesystem
if( !VFS_CheckACL(curNode, VFS_PERM_EXECUTE) ) {
curNode->Close( curNode );
- if(TruePath) free(*TruePath);
+ if(TruePath) {
+ free(*TruePath);
+ *TruePath = NULL;
+ }
LEAVE('n');
return NULL;
}
// Check if the node has a FindDir method
if(!curNode->FindDir) {
if(curNode->Close) curNode->Close(curNode);
- if(TruePath) free(*TruePath);
+ if(TruePath) {
+ free(*TruePath);
+ *TruePath = NULL;
+ }
Path[nextSlash] = '/';
LEAVE('n');
return NULL;
// Error Check
if(!curNode) {
LOG("Node '%s' not found in dir '%s'", &Path[ofs], Path);
- if(TruePath)
+ if(TruePath) {
free(*TruePath);
+ *TruePath = NULL;
+ }
Path[nextSlash] = '/';
LEAVE('n');
return NULL;
// Handle Symbolic Links
if(curNode->Flags & VFS_FFLAG_SYMLINK) {
- if(TruePath)
+ if(TruePath) {
free(*TruePath);
+ *TruePath = NULL;
+ }
tmp = malloc( curNode->Size + 1 );
curNode->Read( curNode, 0, curNode->Size, tmp );
tmp[ curNode->Size ] = '\0';
// Parse Symlink Path
curNode = VFS_ParsePath(tmp, TruePath);
- free(tmp); // Free temp string
// Error Check
if(!curNode) {
+ free(tmp); // Free temp string
LEAVE('n');
return NULL;
}
if(TruePath) {
*TruePath = tmp;
retLength = strlen(tmp);
+ } else {
+ free(tmp); // Free temp string
}
continue;
if( !(Mode & VFS_OPENFLAG_NOLINK) && (node->Flags & VFS_FFLAG_SYMLINK) )
{
if( !node->Read ) {
- LOG("No read method on symlink");
+ Warning("No read method on symlink");
LEAVE('i', -1);
return -1;
}
h->Node = NULL;
}
+/**
+ * \fn int VFS_ChDir(char *New)
+ * \brief Change current working directory
+ */
+int VFS_ChDir(char *New)
+{
+ char *buf;
+ int fd;
+ tVFS_Handle *h;
+
+ // Create Absolute
+ buf = VFS_GetAbsPath(New);
+ if(buf == NULL) {
+ Log("VFS_ChDir: Path expansion failed");
+ return -1;
+ }
+
+ // Check if path exists
+ fd = VFS_Open(buf, VFS_OPENFLAG_EXEC);
+ if(fd == -1) {
+ Log("VFS_ChDir: 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("VFS_ChDir: Path is not a directory");
+ VFS_Close(fd);
+ return -1;
+ }
+
+ // Close file
+ VFS_Close(fd);
+
+ // Free old working directory
+ if( CFGPTR(CFG_VFS_CWD) ) free( CFGPTR(CFG_VFS_CWD) );
+ // Set new
+ CFGPTR(CFG_VFS_CWD) = buf;
+
+ Log("Updated CWD to '%s'", buf);
+
+ return 1;
+}
+
/**
* \fn tVFS_Handle *VFS_GetHandle(int FD)
* \brief Gets a pointer to the handle information structure
*/
tVFS_Handle *VFS_GetHandle(int FD)
{
+ tVFS_Handle *h;
+
if(FD < 0) return NULL;
if(FD & VFS_KERNEL_FLAG) {
FD &= (VFS_KERNEL_FLAG - 1);
if(FD >= MAX_KERNEL_FILES) return NULL;
- return &gaKernelHandles[ FD ];
+ h = &gaKernelHandles[ FD ];
} else {
if(FD >= CFGINT(CFG_VFS_MAXFILES)) return NULL;
- return &gaUserHandles[ FD ];
+ h = &gaUserHandles[ FD ];
}
+
+ if(h->Node == NULL) return NULL;
+ return h;
}
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au