archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-15 19:28:43 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

sys_fs: fix CELL_FS_O_APPEND emulation

Browse source 
Don't use fs::append (not capable of).
Fix sys_fs_ftruncate (remove wrong workaround).
This commit is contained in:
Nekotekina 2020-01-05 18:14:07 +03:00
parent 9fc0aec066
commit 4450ae0c7a
1 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
rpcs3/Emu/Cell/lv2/sys_fs.cpp
View file

@ -264,11 +264,6 @@ error_code sys_fs_open(ppu_thread& ppu, vm::cptr<char> path, s32 flags, vm::ptr<
open_mode += fs::trunc; open_mode += fs::trunc;
} }
if (flags & CELL_FS_O_APPEND)
{
open_mode += fs::append;
}
if (flags & CELL_FS_O_MSELF) if (flags & CELL_FS_O_MSELF)
{ {
open_mode = fs::read; open_mode = fs::read;
@ -494,6 +489,11 @@ error_code sys_fs_write(ppu_thread& ppu, u32 fd, vm::cptr<void> buf, u64 nbytes,
return CELL_EBUSY; return CELL_EBUSY;
} }
if (file->flags & CELL_FS_O_APPEND)
{
file->file.seek(0, fs::seek_end);
}
*nwrite = file->op_write(buf, nbytes); *nwrite = file->op_write(buf, nbytes);
return CELL_OK; return CELL_OK;
@ -1081,6 +1081,11 @@ error_code sys_fs_fcntl(ppu_thread& ppu, u32 fd, u32 op, vm::ptr<void> _arg, u32
return CELL_EBADF; return CELL_EBADF;
} }
if (op == 0x8000000b && file->flags & CELL_FS_O_APPEND)
{
return CELL_EBADF;
}
if (op == 0x8000000b && file->mp->flags & lv2_mp_flag::read_only) if (op == 0x8000000b && file->mp->flags & lv2_mp_flag::read_only)
{ {
return CELL_EROFS; return CELL_EROFS;
@ -1612,16 +1617,7 @@ error_code sys_fs_ftruncate(ppu_thread& ppu, u32 fd, u64 size)
return CELL_EBUSY; return CELL_EBUSY;
} }
if (file->flags & CELL_FS_O_APPEND) if (!file->file.trunc(size))
{
const u64 fsize = file->file.size();
if (size > fsize && !file->file.write(std::vector<u8>(size - fsize)))
{
return CELL_ENOSPC;
}
}
else if (!file->file.trunc(size))
{ {
switch (auto error = fs::g_tls_error) switch (auto error = fs::g_tls_error)
{ {