mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-30 22:14:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Proper directory flag handling.

Browse Source 
Even when directory is specified, it will still succeed to open non-directories.
This commit is contained in:
Stephen Miller 2025-04-28 12:25:20 -05:00
parent 9081778f9b
commit 7ab496b435
1 changed files with 22 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/core/libraries/kernel/file_system.cpp
View File

@ -99,28 +99,23 @@ s32 PS4_SYSV_ABI open(const char* raw_path, s32 flags, u16 mode) {
bool exists = std::filesystem::exists(file->m_host_name);
s32 e = 0;
if (directory) {
file->type = Core::FileSys::FileType::Directory;
if (create) {
if (excl && exists) {
// Error if file exists
h->DeleteHandle(handle);
*__Error() = POSIX_EEXIST;
return -1;
}
if (!std::filesystem::create_directory(file->m_host_name)) {
// Directory creation failed
*__Error() = POSIX_EIO;
return -1;
}
} else if (!exists) {
// File to open doesn't exist, return ENOENT
if (create) {
if (excl && exists) {
// Error if file exists
h->DeleteHandle(handle);
*__Error() = POSIX_ENOENT;
*__Error() = POSIX_EEXIST;
return -1;
}
// Create file if it doesn't exist
Common::FS::IOFile out(file->m_host_name, Common::FS::FileAccessMode::Write);
} else if (!exists) {
// File to open doesn't exist, return ENOENT
h->DeleteHandle(handle);
*__Error() = POSIX_ENOENT;
return -1;
}
if (directory) {
if (read) {
e = file->f.Open(file->m_host_name, Common::FS::FileAccessMode::Read);
} else if (write || rdwr || append || truncate) {
@ -134,8 +129,15 @@ s32 PS4_SYSV_ABI open(const char* raw_path, s32 flags, u16 mode) {
return -1;
}
// If opening is a success, iterate through contents
if (e == 0) {
// Non-directories can be opened when the directory flag is specified
if (std::filesystem::is_directory(file->m_host_name)) {
file->type = Core::FileSys::FileType::Directory;
} else {
file->type = Core::FileSys::FileType::Regular;
}
// If opening is a success, and the file is a directory, iterate through contents
if (e == 0 && file->type == Core::FileSys::FileType::Directory) {
mnt->IterateDirectory(file->m_guest_name,
[&file](const auto& ent_path, const auto ent_is_file) {
auto& dir_entry = file->dirents.emplace_back();
@ -145,22 +147,6 @@ s32 PS4_SYSV_ABI open(const char* raw_path, s32 flags, u16 mode) {
file->dirents_index = 0;
}
} else {
if (create) {
if (excl && exists) {
// Error if file exists
h->DeleteHandle(handle);
*__Error() = POSIX_EEXIST;
return -1;
}
// Create file if it doesn't exist
Common::FS::IOFile out(file->m_host_name, Common::FS::FileAccessMode::Write);
} else if (!exists) {
// File to open doesn't exist, return ENOENT
h->DeleteHandle(handle);
*__Error() = POSIX_ENOENT;
return -1;
}
if (read) {
// Read only
e = file->f.Open(file->m_host_name, Common::FS::FileAccessMode::Read);