mirrors/nxdumptool
1
0
Fork 0
mirror of https://github.com/DarkMatterCore/nxdumptool.git synced 2024-11-22 18:26:39 +00:00
Code Issues Releases Activity

Custom devoptab wrappers (part 4).

Browse source 
Improve dirnext() calls in both PFS and HFS devoptab wrappers to make them also return bogus "." and ".." directory entries.

The "st_ino" field is now also being filled for all file entries.

Other changes include:

* libs: update libusbhsfs.
This commit is contained in:
Pablo Curiel 2023-12-21 13:29:53 +01:00
parent e6caff3b17
commit 091747d197
3 changed files with 71 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/libusbhsfs

@ -1 +1 @@
Subproject commit 2a6092059b6271a89aa31e40a16f090d212b6b92 Subproject commit 30f521cc9536473f8a05d5a792d986f3d2c6af98

47
source/devoptab/hfs_dev.c
View file

@ -35,12 +35,14 @@
/* Type definitions. */ /* Type definitions. */
typedef struct { typedef struct {
u32 index; ///< Hash FS entry index.
HashFileSystemEntry *hfs_entry; ///< Hash FS entry metadata. HashFileSystemEntry *hfs_entry; ///< Hash FS entry metadata.
const char *name; ///< Entry name. const char *name; ///< Entry name.
u64 offset; ///< Current offset within Hash FS entry data. u64 offset; ///< Current offset within Hash FS entry data.
} HashFileSystemFileState; } HashFileSystemFileState;
typedef struct { typedef struct {
u8 state; ///< 0: "." entry; 1: ".." entry; 2: actual Hash FS entry.
u32 index; ///< Current Hash FS entry index. u32 index; ///< Current Hash FS entry index.
} HashFileSystemDirectoryState; } HashFileSystemDirectoryState;
@ -60,7 +62,7 @@ static int hfsdev_statvfs(struct _reent *r, const char *path, struct statv
static const char *hfsdev_get_truncated_path(struct _reent *r, const char *path); static const char *hfsdev_get_truncated_path(struct _reent *r, const char *path);
static void hfsdev_fill_stat(struct stat *st, const HashFileSystemEntry *hfs_entry, time_t mount_time); static void hfsdev_fill_stat(struct stat *st, u32 index, const HashFileSystemEntry *hfs_entry, time_t mount_time);
/* Global variables. */ /* Global variables. */
@ -122,8 +124,9 @@ static int hfsdev_open(struct _reent *r, void *fd, const char *path, int flags,
/* Reset file descriptor. */ /* Reset file descriptor. */
memset(file, 0, sizeof(HashFileSystemFileState)); memset(file, 0, sizeof(HashFileSystemFileState));
/* Get Hash FS entry. */ /* Get information about the requested Partition FS entry. */
if (!(file->hfs_entry = hfsGetEntryByName(fs_ctx, path)) || !(file->name = hfsGetEntryName(fs_ctx, file->hfs_entry))) DEVOPTAB_SET_ERROR(ENOENT); if (!hfsGetEntryIndexByName(fs_ctx, path, &(file->index)) || !(file->hfs_entry = hfsGetEntryByIndex(fs_ctx, file->index)) || \
!(file->name = hfsGetEntryNameByIndex(fs_ctx, file->index))) DEVOPTAB_SET_ERROR(ENOENT);
end: end:
DEVOPTAB_DEINIT_VARS; DEVOPTAB_DEINIT_VARS;
@ -221,7 +224,7 @@ static int hfsdev_fstat(struct _reent *r, void *fd, struct stat *st)
LOG_MSG_DEBUG("Getting file stats for \"%s:/%s\".", dev_ctx->name, file->name); LOG_MSG_DEBUG("Getting file stats for \"%s:/%s\".", dev_ctx->name, file->name);
/* Fill stat info. */ /* Fill stat info. */
hfsdev_fill_stat(st, file->hfs_entry, dev_ctx->mount_time); hfsdev_fill_stat(st, file->index, file->hfs_entry, dev_ctx->mount_time);
end: end:
DEVOPTAB_DEINIT_VARS; DEVOPTAB_DEINIT_VARS;
@ -230,6 +233,7 @@ end:
static int hfsdev_stat(struct _reent *r, const char *file, struct stat *st) static int hfsdev_stat(struct _reent *r, const char *file, struct stat *st)
{ {
u32 index = 0;
HashFileSystemEntry *hfs_entry = NULL; HashFileSystemEntry *hfs_entry = NULL;
HFS_DEV_INIT_VARS; HFS_DEV_INIT_VARS;
@ -243,11 +247,11 @@ static int hfsdev_stat(struct _reent *r, const char *file, struct stat *st)
LOG_MSG_DEBUG("Getting file stats for \"%s:/%s\".", dev_ctx->name, file); LOG_MSG_DEBUG("Getting file stats for \"%s:/%s\".", dev_ctx->name, file);
/* Get Hash FS entry. */ /* Get information about the requested Partition FS entry. */
if (!(hfs_entry = hfsGetEntryByName(fs_ctx, file))) DEVOPTAB_SET_ERROR_AND_EXIT(EINVAL); if (!hfsGetEntryIndexByName(fs_ctx, file, &index) || !(hfs_entry = hfsGetEntryByIndex(fs_ctx, index))) DEVOPTAB_SET_ERROR(ENOENT);
/* Fill stat info. */ /* Fill stat info. */
hfsdev_fill_stat(st, hfs_entry, dev_ctx->mount_time); hfsdev_fill_stat(st, index, hfs_entry, dev_ctx->mount_time);
end: end:
DEVOPTAB_DEINIT_VARS; DEVOPTAB_DEINIT_VARS;
@ -263,7 +267,7 @@ static DIR_ITER *hfsdev_diropen(struct _reent *r, DIR_ITER *dirState, const char
/* Get truncated path. */ /* Get truncated path. */
/* We can only work with the FS root here, so we won't accept anything else. */ /* We can only work with the FS root here, so we won't accept anything else. */
if (!(path = hfsdev_get_truncated_path(r, path))) DEVOPTAB_EXIT; if (!(path = hfsdev_get_truncated_path(r, path))) DEVOPTAB_EXIT;
if (*path) DEVOPTAB_SET_ERROR_AND_EXIT(EINVAL); if (*path) DEVOPTAB_SET_ERROR_AND_EXIT(ENOENT);
LOG_MSG_DEBUG("Opening directory \"%s:/\".", dev_ctx->name); LOG_MSG_DEBUG("Opening directory \"%s:/\".", dev_ctx->name);
@ -285,6 +289,7 @@ static int hfsdev_dirreset(struct _reent *r, DIR_ITER *dirState)
LOG_MSG_DEBUG("Resetting directory state for \"%s:/\".", dev_ctx->name); LOG_MSG_DEBUG("Resetting directory state for \"%s:/\".", dev_ctx->name);
/* Reset directory state. */ /* Reset directory state. */
dir->state = 0;
dir->index = 0; dir->index = 0;
end: end:
@ -303,7 +308,24 @@ static int hfsdev_dirnext(struct _reent *r, DIR_ITER *dirState, char *filename,
/* Sanity check. */ /* Sanity check. */
if (!filename || !filestat) DEVOPTAB_SET_ERROR_AND_EXIT(EINVAL); if (!filename || !filestat) DEVOPTAB_SET_ERROR_AND_EXIT(EINVAL);
LOG_MSG_DEBUG("Getting info for next directory entry in \"%s:/\" (index %u).", dev_ctx->name, dir->index); LOG_MSG_DEBUG("Getting info for next directory entry in \"%s:/\" (state %u, index %u).", dev_ctx->name, dir->state, dir->index);
if (dir->state < 2)
{
/* Fill bogus directory entry. */
memset(filestat, 0, sizeof(struct stat));
filestat->st_nlink = 1;
filestat->st_mode = (S_IFDIR | S_IRUSR | S_IRGRP | S_IROTH);
filestat->st_atime = filestat->st_mtime = filestat->st_ctime = dev_ctx->mount_time;
strcpy(filename, dir->state == 0 ? "." : "..");
/* Update state. */
dir->state++;
DEVOPTAB_EXIT;
}
/* Check if we haven't reached EOD. */ /* Check if we haven't reached EOD. */
if (dir->index >= hfsGetEntryCount(fs_ctx)) DEVOPTAB_SET_ERROR_AND_EXIT(ENOENT); if (dir->index >= hfsGetEntryCount(fs_ctx)) DEVOPTAB_SET_ERROR_AND_EXIT(ENOENT);
@ -315,7 +337,7 @@ static int hfsdev_dirnext(struct _reent *r, DIR_ITER *dirState, char *filename,
strcpy(filename, fname); strcpy(filename, fname);
/* Fill stat info. */ /* Fill stat info. */
hfsdev_fill_stat(filestat, hfs_entry, dev_ctx->mount_time); hfsdev_fill_stat(filestat, dir->index, hfs_entry, dev_ctx->mount_time);
/* Adjust index. */ /* Adjust index. */
dir->index++; dir->index++;
@ -428,15 +450,16 @@ end:
DEVOPTAB_RETURN_PTR(path); DEVOPTAB_RETURN_PTR(path);
} }
static void hfsdev_fill_stat(struct stat *st, const HashFileSystemEntry *hfs_entry, time_t mount_time) static void hfsdev_fill_stat(struct stat *st, u32 index, const HashFileSystemEntry *hfs_entry, time_t mount_time)
{ {
/* Clear stat struct. */ /* Clear stat struct. */
memset(st, 0, sizeof(struct stat)); memset(st, 0, sizeof(struct stat));
/* Fill stat struct. */ /* Fill stat struct. */
/* We're always dealing with a file entry. */ /* We're always dealing with a file entry. */
st->st_ino = index;
st->st_mode = (S_IFREG | S_IRUSR | S_IRGRP | S_IROTH);
st->st_nlink = 1; st->st_nlink = 1;
st->st_size = (off_t)hfs_entry->size; st->st_size = (off_t)hfs_entry->size;
st->st_mode = (S_IFREG | S_IRUSR | S_IRGRP | S_IROTH);
st->st_atime = st->st_mtime = st->st_ctime = mount_time; st->st_atime = st->st_mtime = st->st_ctime = mount_time;
} }

47
source/devoptab/pfs_dev.c
View file

@ -35,12 +35,14 @@
/* Type definitions. */ /* Type definitions. */
typedef struct { typedef struct {
u32 index; ///< Partition FS entry index.
PartitionFileSystemEntry *pfs_entry; ///< Partition FS entry metadata. PartitionFileSystemEntry *pfs_entry; ///< Partition FS entry metadata.
const char *name; ///< Entry name. const char *name; ///< Entry name.
u64 offset; ///< Current offset within Partition FS entry data. u64 offset; ///< Current offset within Partition FS entry data.
} PartitionFileSystemFileState; } PartitionFileSystemFileState;
typedef struct { typedef struct {
u8 state; ///< 0: "." entry; 1: ".." entry; 2: actual Partition FS entry.
u32 index; ///< Current Partition FS entry index. u32 index; ///< Current Partition FS entry index.
} PartitionFileSystemDirectoryState; } PartitionFileSystemDirectoryState;
@ -60,7 +62,7 @@ static int pfsdev_statvfs(struct _reent *r, const char *path, struct statv
static const char *pfsdev_get_truncated_path(struct _reent *r, const char *path); static const char *pfsdev_get_truncated_path(struct _reent *r, const char *path);
static void pfsdev_fill_stat(struct stat *st, const PartitionFileSystemEntry *pfs_entry, time_t mount_time); static void pfsdev_fill_stat(struct stat *st, u32 index, const PartitionFileSystemEntry *pfs_entry, time_t mount_time);
/* Global variables. */ /* Global variables. */
@ -122,8 +124,9 @@ static int pfsdev_open(struct _reent *r, void *fd, const char *path, int flags,
/* Reset file descriptor. */ /* Reset file descriptor. */
memset(file, 0, sizeof(PartitionFileSystemFileState)); memset(file, 0, sizeof(PartitionFileSystemFileState));
/* Get Partition FS entry. */ /* Get information about the requested Partition FS entry. */
if (!(file->pfs_entry = pfsGetEntryByName(fs_ctx, path)) || !(file->name = pfsGetEntryName(fs_ctx, file->pfs_entry))) DEVOPTAB_SET_ERROR(ENOENT); if (!pfsGetEntryIndexByName(fs_ctx, path, &(file->index)) || !(file->pfs_entry = pfsGetEntryByIndex(fs_ctx, file->index)) || \
!(file->name = pfsGetEntryNameByIndex(fs_ctx, file->index))) DEVOPTAB_SET_ERROR(ENOENT);
end: end:
DEVOPTAB_DEINIT_VARS; DEVOPTAB_DEINIT_VARS;
@ -221,7 +224,7 @@ static int pfsdev_fstat(struct _reent *r, void *fd, struct stat *st)
LOG_MSG_DEBUG("Getting file stats for \"%s:/%s\".", dev_ctx->name, file->name); LOG_MSG_DEBUG("Getting file stats for \"%s:/%s\".", dev_ctx->name, file->name);
/* Fill stat info. */ /* Fill stat info. */
pfsdev_fill_stat(st, file->pfs_entry, dev_ctx->mount_time); pfsdev_fill_stat(st, file->index, file->pfs_entry, dev_ctx->mount_time);
end: end:
DEVOPTAB_DEINIT_VARS; DEVOPTAB_DEINIT_VARS;
@ -230,6 +233,7 @@ end:
static int pfsdev_stat(struct _reent *r, const char *file, struct stat *st) static int pfsdev_stat(struct _reent *r, const char *file, struct stat *st)
{ {
u32 index = 0;
PartitionFileSystemEntry *pfs_entry = NULL; PartitionFileSystemEntry *pfs_entry = NULL;
PFS_DEV_INIT_VARS; PFS_DEV_INIT_VARS;
@ -243,11 +247,11 @@ static int pfsdev_stat(struct _reent *r, const char *file, struct stat *st)
LOG_MSG_DEBUG("Getting file stats for \"%s:/%s\".", dev_ctx->name, file); LOG_MSG_DEBUG("Getting file stats for \"%s:/%s\".", dev_ctx->name, file);
/* Get Partition FS entry. */ /* Get information about the requested Partition FS entry. */
if (!(pfs_entry = pfsGetEntryByName(fs_ctx, file))) DEVOPTAB_SET_ERROR_AND_EXIT(EINVAL); if (!pfsGetEntryIndexByName(fs_ctx, file, &index) || !(pfs_entry = pfsGetEntryByIndex(fs_ctx, index))) DEVOPTAB_SET_ERROR(ENOENT);
/* Fill stat info. */ /* Fill stat info. */
pfsdev_fill_stat(st, pfs_entry, dev_ctx->mount_time); pfsdev_fill_stat(st, index, pfs_entry, dev_ctx->mount_time);
end: end:
DEVOPTAB_DEINIT_VARS; DEVOPTAB_DEINIT_VARS;
@ -263,7 +267,7 @@ static DIR_ITER *pfsdev_diropen(struct _reent *r, DIR_ITER *dirState, const char
/* Get truncated path. */ /* Get truncated path. */
/* We can only work with the FS root here, so we won't accept anything else. */ /* We can only work with the FS root here, so we won't accept anything else. */
if (!(path = pfsdev_get_truncated_path(r, path))) DEVOPTAB_EXIT; if (!(path = pfsdev_get_truncated_path(r, path))) DEVOPTAB_EXIT;
if (*path) DEVOPTAB_SET_ERROR_AND_EXIT(EINVAL); if (*path) DEVOPTAB_SET_ERROR_AND_EXIT(ENOENT);
LOG_MSG_DEBUG("Opening directory \"%s:/\".", dev_ctx->name); LOG_MSG_DEBUG("Opening directory \"%s:/\".", dev_ctx->name);
@ -285,6 +289,7 @@ static int pfsdev_dirreset(struct _reent *r, DIR_ITER *dirState)
LOG_MSG_DEBUG("Resetting directory state for \"%s:/\".", dev_ctx->name); LOG_MSG_DEBUG("Resetting directory state for \"%s:/\".", dev_ctx->name);
/* Reset directory state. */ /* Reset directory state. */
dir->state = 0;
dir->index = 0; dir->index = 0;
end: end:
@ -303,7 +308,24 @@ static int pfsdev_dirnext(struct _reent *r, DIR_ITER *dirState, char *filename,
/* Sanity check. */ /* Sanity check. */
if (!filename || !filestat) DEVOPTAB_SET_ERROR_AND_EXIT(EINVAL); if (!filename || !filestat) DEVOPTAB_SET_ERROR_AND_EXIT(EINVAL);
LOG_MSG_DEBUG("Getting info for next directory entry in \"%s:/\" (index %u).", dev_ctx->name, dir->index); LOG_MSG_DEBUG("Getting info for next directory entry in \"%s:/\" (state %u, index %u).", dev_ctx->name, dir->state, dir->index);
if (dir->state < 2)
{
/* Fill bogus directory entry. */
memset(filestat, 0, sizeof(struct stat));
filestat->st_nlink = 1;
filestat->st_mode = (S_IFDIR | S_IRUSR | S_IRGRP | S_IROTH);
filestat->st_atime = filestat->st_mtime = filestat->st_ctime = dev_ctx->mount_time;
strcpy(filename, dir->state == 0 ? "." : "..");
/* Update state. */
dir->state++;
DEVOPTAB_EXIT;
}
/* Check if we haven't reached EOD. */ /* Check if we haven't reached EOD. */
if (dir->index >= pfsGetEntryCount(fs_ctx)) DEVOPTAB_SET_ERROR_AND_EXIT(ENOENT); if (dir->index >= pfsGetEntryCount(fs_ctx)) DEVOPTAB_SET_ERROR_AND_EXIT(ENOENT);
@ -315,7 +337,7 @@ static int pfsdev_dirnext(struct _reent *r, DIR_ITER *dirState, char *filename,
strcpy(filename, fname); strcpy(filename, fname);
/* Fill stat info. */ /* Fill stat info. */
pfsdev_fill_stat(filestat, pfs_entry, dev_ctx->mount_time); pfsdev_fill_stat(filestat, dir->index, pfs_entry, dev_ctx->mount_time);
/* Adjust index. */ /* Adjust index. */
dir->index++; dir->index++;
@ -428,15 +450,16 @@ end:
DEVOPTAB_RETURN_PTR(path); DEVOPTAB_RETURN_PTR(path);
} }
static void pfsdev_fill_stat(struct stat *st, const PartitionFileSystemEntry *pfs_entry, time_t mount_time) static void pfsdev_fill_stat(struct stat *st, u32 index, const PartitionFileSystemEntry *pfs_entry, time_t mount_time)
{ {
/* Clear stat struct. */ /* Clear stat struct. */
memset(st, 0, sizeof(struct stat)); memset(st, 0, sizeof(struct stat));
/* Fill stat struct. */ /* Fill stat struct. */
/* We're always dealing with a file entry. */ /* We're always dealing with a file entry. */
st->st_ino = index;
st->st_mode = (S_IFREG | S_IRUSR | S_IRGRP | S_IROTH);
st->st_nlink = 1; st->st_nlink = 1;
st->st_size = (off_t)pfs_entry->size; st->st_size = (off_t)pfs_entry->size;
st->st_mode = (S_IFREG | S_IRUSR | S_IRGRP | S_IROTH);
st->st_atime = st->st_mtime = st->st_ctime = mount_time; st->st_atime = st->st_mtime = st->st_ctime = mount_time;
} }