Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-06-04 09:43:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Improve close

Browse source 
Removes the EPERM return, as it makes no sense, and swaps sceKernelClose with posix_close to properly emulate errno behavior.
This commit is contained in:
Stephen Miller 2025-02-17 15:05:45 -06:00
parent 281a07e911
commit fb8883dcea
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/core/libraries/kernel/file_system.cpp
View file

@ -180,14 +180,12 @@ s32 PS4_SYSV_ABI sceKernelOpen(const char* path, s32 flags, /* SceKernelMode*/ u
return result; return result;
} }
int PS4_SYSV_ABI sceKernelClose(int d) { s32 PS4_SYSV_ABI posix_close(s32 fd) {
if (d < 3) { // d probably hold an error code
return ORBIS_KERNEL_ERROR_EPERM;
}
auto* h = Common::Singleton<Core::FileSys::HandleTable>::Instance(); auto* h = Common::Singleton<Core::FileSys::HandleTable>::Instance();
auto* file = h->GetFile(d); auto* file = h->GetFile(fd);
if (file == nullptr) { if (file == nullptr) {
return ORBIS_KERNEL_ERROR_EBADF; *__Error() = POSIX_EBADF;
return -1;
} }
if (file->type == Core::FileSys::FileType::Regular) { if (file->type == Core::FileSys::FileType::Regular) {
file->f.Close(); file->f.Close();
@ -195,16 +193,15 @@ int PS4_SYSV_ABI sceKernelClose(int d) {
file->is_opened = false; file->is_opened = false;
LOG_INFO(Kernel_Fs, "Closing {}", file->m_guest_name); LOG_INFO(Kernel_Fs, "Closing {}", file->m_guest_name);
// FIXME: Lock file mutex before deleting it? // FIXME: Lock file mutex before deleting it?
h->DeleteHandle(d); h->DeleteHandle(fd);
return ORBIS_OK; return ORBIS_OK;
} }
int PS4_SYSV_ABI posix_close(int d) { s32 PS4_SYSV_ABI sceKernelClose(s32 fd) {
int result = sceKernelClose(d); s32 result = posix_close(fd);
if (result < 0) { if (result < 0) {
LOG_ERROR(Kernel_Pthread, "posix_close: error = {}", result); LOG_ERROR(Kernel_Pthread, "posix_close: error = {}", result);
ErrSceToPosix(result); return ErrnoToSceKernelError(*__Error());
return -1;
} }
return result; return result;
} }