ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing root fs queries.

This commit is contained in:
Ben Vanik 2015-06-29 12:30:35 -07:00
parent 5b2f049d4c
commit 6ae46e1084
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/xenia/vfs/virtual_file_system.cc
View File

@ -159,15 +159,22 @@ X_STATUS VirtualFileSystem::OpenFile(KernelState* kernel_state,
// Lookup host device/parent path. // Lookup host device/parent path.
// If no device or parent, fail. // If no device or parent, fail.
auto parent_entry = ResolveBasePath(path); Entry* parent_entry = nullptr;
if (!parent_entry) { Entry* entry = nullptr;
*out_action = FileAction::kDoesNotExist; if (!xe::find_base_path(path).empty()) {
return X_STATUS_NO_SUCH_FILE; parent_entry = ResolveBasePath(path);
if (!parent_entry) {
*out_action = FileAction::kDoesNotExist;
return X_STATUS_NO_SUCH_FILE;
}
auto file_name = xe::find_name_from_path(path);
entry = parent_entry->GetChild(file_name);
} else {
entry = ResolvePath(path);
} }
// Check if exists (if we need it to), or that it doesn't (if it shouldn't). // Check if exists (if we need it to), or that it doesn't (if it shouldn't).
auto file_name = xe::find_name_from_path(path);
Entry* entry = parent_entry->GetChild(file_name);
switch (creation_disposition) { switch (creation_disposition) {
case FileDisposition::kOpen: case FileDisposition::kOpen:
case FileDisposition::kOverwrite: case FileDisposition::kOverwrite:
@ -192,7 +199,8 @@ X_STATUS VirtualFileSystem::OpenFile(KernelState* kernel_state,
// Verify permissions. // Verify permissions.
bool wants_write = desired_access & FileAccess::kFileWriteData || bool wants_write = desired_access & FileAccess::kFileWriteData ||
desired_access & FileAccess::kFileAppendData; desired_access & FileAccess::kFileAppendData;
if (wants_write && parent_entry->is_read_only()) { if (wants_write && ((parent_entry && parent_entry->is_read_only()) ||
(entry && entry->is_read_only()))) {
// Fail if read only device and wants write. // Fail if read only device and wants write.
// return X_STATUS_ACCESS_DENIED; // return X_STATUS_ACCESS_DENIED;
// TODO(benvanik): figure out why games are opening read-only files with // TODO(benvanik): figure out why games are opening read-only files with