mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-22 13:02:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed romfs_dir struct for the parent field and fixed romfs_dev.h formatting.

Browse Source
This commit is contained in:
yellows8 2018-02-13 17:50:21 -05:00
parent f5606bfb8a
commit 67af341594
2 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nx/include/switch/runtime/devices/romfs_dev.h
View File

@ -31,6 +31,7 @@ typedef struct
/// RomFS directory. /// RomFS directory.
typedef struct typedef struct
{ {
u32 parent; ///< Offset of the parent directory.
u32 sibling; ///< Offset of the next sibling directory. u32 sibling; ///< Offset of the next sibling directory.
u32 childDir; ///< Offset of the first child directory. u32 childDir; ///< Offset of the first child directory.
u32 childFile; ///< Offset of the first file. u32 childFile; ///< Offset of the first file.

10
nx/source/runtime/devices/romfs_dev.c
View File

@ -294,7 +294,7 @@ Result romfsMountCommon(romfs_mount *mount)
mount->dirTable = malloc(mount->header.dirTableSize); mount->dirTable = malloc(mount->header.dirTableSize);
if (!mount->dirTable) if (!mount->dirTable)
goto fail; goto fail;
if (!_romfs_read_chk(mount, mount->header.dirTableOff + 4, mount->dirTable, mount->header.dirTableSize)) if (!_romfs_read_chk(mount, mount->header.dirTableOff, mount->dirTable, mount->header.dirTableSize))
goto fail; goto fail;
mount->fileHashTable = (u32*)malloc(mount->header.fileHashTableSize); mount->fileHashTable = (u32*)malloc(mount->header.fileHashTableSize);
@ -411,7 +411,7 @@ static romfs_dir* searchForDir(romfs_mount *mount, romfs_dir* parent, const uint
for (curOff = mount->dirHashTable[hash]; curOff != romFS_none; curOff = curDir->nextHash) for (curOff = mount->dirHashTable[hash]; curOff != romFS_none; curOff = curDir->nextHash)
{ {
curDir = romFS_dir(mount, curOff); curDir = romFS_dir(mount, curOff);
//if (curDir->parent != parentOff) continue;//TODO: How to handle parent here? if (curDir->parent != parentOff) continue;
if (curDir->nameLen != namelen) continue; if (curDir->nameLen != namelen) continue;
if (memcmp(curDir->name, name, namelen) != 0) continue; if (memcmp(curDir->name, name, namelen) != 0) continue;
return curDir; return curDir;
@ -478,7 +478,7 @@ static int navigateToDir(romfs_mount *mount, romfs_dir** ppDir, const char** pPa
if (!component[1]) continue; if (!component[1]) continue;
if (component[1]=='.' && !component[2]) if (component[1]=='.' && !component[2])
{ {
//*ppDir = romFS_dir(mount, (*ppDir)->parent);//TODO: How to handle parent here? *ppDir = romFS_dir(mount, (*ppDir)->parent);
continue; continue;
} }
} }
@ -762,10 +762,10 @@ int romfs_dirnext(struct _reent *r, DIR_ITER *dirState, char *filename, struct s
else if(iter->state == 1) else if(iter->state == 1)
{ {
/* '..' entry */ /* '..' entry */
//romfs_dir* dir = romFS_dir(iter->mount, iter->dir->parent);//TODO: How to handle parent here? romfs_dir* dir = romFS_dir(iter->mount, iter->dir->parent);
memset(filestat, 0, sizeof(*filestat)); memset(filestat, 0, sizeof(*filestat));
//filestat->st_ino = dir_inode(iter->mount, dir); filestat->st_ino = dir_inode(iter->mount, dir);
filestat->st_mode = romFS_dir_mode; filestat->st_mode = romFS_dir_mode;
strcpy(filename, ".."); strcpy(filename, "..");