* 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;
int pathLen = strlen(Path);
int read, write;
int pos, slashNum=0, baseLen;
- Uint slashOffsets[256];
+ Uint slashOffsets[MAX_PATH_SLASHES];
char *cwd = CFGPTR(CFG_VFS_CWD);
int cwdLen;
strcpy(&ret[cwdLen+1], Path);
// Pre-fill the slash positions
- pos = 0;
- while( (pos = strpos( &ret[pos+1], '/' )) != -1 )
- slashOffsets[slashNum++] = pos;
+ read = 1; slashNum = 0;
+ while( (pos = strpos( &ret[read], '/' )) != -1 && slashNum < MAX_PATH_SLASHES )
+ {
+ read += pos+1;
+ slashOffsets[slashNum++] = read;
+ }
- baseLen = cwdLen;
+ baseLen = cwdLen+1;
}
// Remove . and ..
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 ".."
// 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)
+ if(slashNum < MAX_PATH_SLASHES)
slashOffsets[ slashNum++ ] = pos;
else {
LOG("Path '%s' has too many elements", Path);
// `ret` should now be the absolute path
LEAVE('s', ret);
+ Log("VFS_GetAbsPath: RETURN '%s'", ret);
return ret;
}