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

Minor diagnostic added

This commit is contained in:
Nekotekina 2016-08-18 13:27:20 +03:00
parent 066e3006bf
commit c20756136a
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rpcs3/Emu/Cell/Modules/cellGame.cpp
View File

@ -93,9 +93,17 @@ struct content_permission final
~content_permission() ~content_permission()
{ {
if (is_temporary) try
{ {
fs::remove_all(vfs::get("/dev_hdd1/game/" + dir)); if (is_temporary)
{
fs::remove_all(vfs::get("/dev_hdd1/game/" + dir));
}
}
catch (...)
{
cellGame.fatal("Failed to clean directory '/dev_hdd1/game/%s'", dir);
catch_all_exceptions();
} }
} }
}; };
@ -345,7 +353,7 @@ error_code cellGameContentPermit(vm::ptr<char[CELL_GAME_PATH_MAX]> contentInfoPa
return CELL_GAME_ERROR_PARAM; return CELL_GAME_ERROR_PARAM;
} }
const auto prm = fxm::withdraw<content_permission>(); const auto prm = fxm::get<content_permission>();
if (!prm) if (!prm)
{ {
@ -382,6 +390,7 @@ error_code cellGameContentPermit(vm::ptr<char[CELL_GAME_PATH_MAX]> contentInfoPa
strcpy_trunc(*contentInfoPath, dir); strcpy_trunc(*contentInfoPath, dir);
strcpy_trunc(*usrdirPath, dir + "/USRDIR"); strcpy_trunc(*usrdirPath, dir + "/USRDIR");
verify(HERE), fxm::remove<content_permission>();
return CELL_OK; return CELL_OK;
} }

3
rpcs3/Emu/Cell/lv2/sys_fs.cpp
View File

@ -254,6 +254,7 @@ error_code sys_fs_opendir(vm::cptr<char> path, vm::ptr<u32> fd)
} }
*fd = _dir->id; *fd = _dir->id;
sys_fs.notice("sys_fs_opendir(%s) -> lv2_fs_id %d", path, _dir->id);
return CELL_OK; return CELL_OK;
} }
@ -288,7 +289,7 @@ error_code sys_fs_readdir(u32 fd, vm::ptr<CellFsDirent> dir, vm::ptr<u64> nread)
error_code sys_fs_closedir(u32 fd) error_code sys_fs_closedir(u32 fd)
{ {
sys_fs.trace("sys_fs_closedir(fd=%d)", fd); sys_fs.warning("sys_fs_closedir(fd=%d)", fd);
const auto directory = idm::get<lv2_dir>(fd); const auto directory = idm::get<lv2_dir>(fd);