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

romfs_dev: fix reading into buffers with device mappable attribute

Browse Source
This commit is contained in:
fincs 2020-01-22 00:56:34 +01:00
parent 5a751ea0c3
commit 04214ea441
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,6 +62,43 @@ static romfs_file *romFS_file(romfs_mount *mount, u32 off)
return curFile; return curFile;
} }
static ssize_t _romfs_read_safe(romfs_mount *mount, u64 pos, void* buffer, u64 size)
{
u8 tmp_buffer[0x1000];
u64 total_read = 0;
while (size)
{
u64 cur_size = size > sizeof(tmp_buffer) ? sizeof(tmp_buffer) : size;
u64 cur_read = 0;
Result rc = 0;
if (mount->fd_type == RomfsSource_FsFile)
{
rc = fsFileRead(&mount->fd, pos, tmp_buffer, cur_size, FsReadOption_None, &cur_read);
}
else if (mount->fd_type == RomfsSource_FsStorage)
{
rc = fsStorageRead(&mount->fd_storage, pos, tmp_buffer, cur_size);
cur_read = cur_size;
}
if (R_FAILED(rc))
return -1;
memcpy(buffer, tmp_buffer, cur_read);
buffer = (u8*)buffer + cur_read;
pos += cur_read;
total_read += cur_read;
size -= cur_read;
if (cur_read != cur_size)
break;
}
return total_read;
}
static ssize_t _romfs_read(romfs_mount *mount, u64 offset, void* buffer, u64 size) static ssize_t _romfs_read(romfs_mount *mount, u64 offset, void* buffer, u64 size)
{ {
s64 pos = mount->offset + offset; s64 pos = mount->offset + offset;
@ -76,6 +113,7 @@ static ssize_t _romfs_read(romfs_mount *mount, u64 offset, void* buffer, u64 siz
rc = fsStorageRead(&mount->fd_storage, pos, buffer, size); rc = fsStorageRead(&mount->fd_storage, pos, buffer, size);
read = size; read = size;
} }
if (rc == 0xD401) return _romfs_read_safe(mount, pos, buffer, size);
if (R_FAILED(rc)) return -1; if (R_FAILED(rc)) return -1;
return read; return read;
} }