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

fs: improve handling root mountpoint

Browse source 
Path such as simply "/" falls into this category.
This commit is contained in:
Nekotekina 2020-10-02 14:37:58 +03:00
parent 9b22661c19
commit ee00fdb61b
2 changed files with 30 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,12 +11,12 @@
LOG_CHANNEL(sys_fs); LOG_CHANNEL(sys_fs);
lv2_fs_mount_point g_mp_sys_dev_root; lv2_fs_mount_point g_mp_sys_dev_root;
lv2_fs_mount_point g_mp_sys_dev_hdd0; lv2_fs_mount_point g_mp_sys_dev_hdd0{"/dev_hdd0"};
lv2_fs_mount_point g_mp_sys_dev_hdd1{512, 32768, lv2_mp_flag::no_uid_gid}; lv2_fs_mount_point g_mp_sys_dev_hdd1{"/dev_hdd1", 512, 32768, lv2_mp_flag::no_uid_gid};
lv2_fs_mount_point g_mp_sys_dev_usb{512, 4096, lv2_mp_flag::no_uid_gid}; lv2_fs_mount_point g_mp_sys_dev_usb{"", 512, 4096, lv2_mp_flag::no_uid_gid};
lv2_fs_mount_point g_mp_sys_dev_bdvd{2048, 65536, lv2_mp_flag::read_only + lv2_mp_flag::no_uid_gid}; lv2_fs_mount_point g_mp_sys_dev_bdvd{"", 2048, 65536, lv2_mp_flag::read_only + lv2_mp_flag::no_uid_gid};
lv2_fs_mount_point g_mp_sys_host_root{512, 512, lv2_mp_flag::strict_get_block_size + lv2_mp_flag::no_uid_gid}; lv2_fs_mount_point g_mp_sys_host_root{"", 512, 512, lv2_mp_flag::strict_get_block_size + lv2_mp_flag::no_uid_gid};
lv2_fs_mount_point g_mp_sys_dev_flash{512, 8192, lv2_mp_flag::read_only + lv2_mp_flag::no_uid_gid}; lv2_fs_mount_point g_mp_sys_dev_flash{"", 512, 8192, lv2_mp_flag::read_only + lv2_mp_flag::no_uid_gid};
bool verify_mself(const fs::file& mself_file) bool verify_mself(const fs::file& mself_file)
{ {
@ -494,7 +494,7 @@ lv2_file::open_result_t lv2_file::open(std::string_view vpath, s32 flags, s32 mo
const auto mp = lv2_fs_object::get_mp(path); const auto mp = lv2_fs_object::get_mp(path);
if (vpath.find_first_not_of('/') == umax) if (mp == &g_mp_sys_host_root)
{ {
return {CELL_EISDIR, path}; return {CELL_EISDIR, path};
} }
@ -504,7 +504,6 @@ lv2_file::open_result_t lv2_file::open(std::string_view vpath, s32 flags, s32 mo
return {CELL_ENOTMOUNTED, path}; return {CELL_ENOTMOUNTED, path};
} }
lv2_file_type type = lv2_file_type::regular; lv2_file_type type = lv2_file_type::regular;
if (size == 8) if (size == 8)
@ -869,7 +868,7 @@ error_code sys_fs_stat(ppu_thread& ppu, vm::cptr<char> path, vm::ptr<CellFsStat>
const auto mp = lv2_fs_object::get_mp(vpath); const auto mp = lv2_fs_object::get_mp(vpath);
if (vpath.find_first_not_of('/') == umax) if (mp == &g_mp_sys_dev_root)
{ {
sb->mode = CELL_FS_S_IFDIR | 0711; sb->mode = CELL_FS_S_IFDIR | 0711;
sb->uid = -1; sb->uid = -1;
@ -1010,7 +1009,9 @@ error_code sys_fs_mkdir(ppu_thread& ppu, vm::cptr<char> path, s32 mode)
const std::string_view vpath = path.get_ptr(); const std::string_view vpath = path.get_ptr();
const std::string local_path = vfs::get(vpath); const std::string local_path = vfs::get(vpath);
if (vpath.find_first_not_of('/') == umax) const auto mp = lv2_fs_object::get_mp(vpath);
if (mp == &g_mp_sys_dev_root)
{ {
return {CELL_EEXIST, path}; return {CELL_EEXIST, path};
} }
@ -1020,8 +1021,6 @@ error_code sys_fs_mkdir(ppu_thread& ppu, vm::cptr<char> path, s32 mode)
return {CELL_ENOTMOUNTED, path}; return {CELL_ENOTMOUNTED, path};
} }
const auto mp = lv2_fs_object::get_mp(vpath);
if (mp->flags & lv2_mp_flag::read_only) if (mp->flags & lv2_mp_flag::read_only)
{ {
return {CELL_EROFS, path}; return {CELL_EROFS, path};
@ -1057,7 +1056,10 @@ error_code sys_fs_rename(ppu_thread& ppu, vm::cptr<char> from, vm::cptr<char> to
const std::string_view vto = to.get_ptr(); const std::string_view vto = to.get_ptr();
const std::string local_to = vfs::get(vto); const std::string local_to = vfs::get(vto);
if (vfrom.find_first_not_of('/') == umax || vto.find_first_not_of('/') == umax) const auto mp = lv2_fs_object::get_mp(vfrom);
const auto mp_to = lv2_fs_object::get_mp(vto);
if (mp == &g_mp_sys_dev_root || mp_to == &g_mp_sys_dev_root)
{ {
return CELL_EPERM; return CELL_EPERM;
} }
@ -1067,9 +1069,7 @@ error_code sys_fs_rename(ppu_thread& ppu, vm::cptr<char> from, vm::cptr<char> to
return CELL_ENOTMOUNTED; return CELL_ENOTMOUNTED;
} }
const auto mp = lv2_fs_object::get_mp(vfrom); if (mp != mp_to)
if (mp != lv2_fs_object::get_mp(vto))
{ {
return CELL_EXDEV; return CELL_EXDEV;
} }
@ -1113,7 +1113,9 @@ error_code sys_fs_rmdir(ppu_thread& ppu, vm::cptr<char> path)
const std::string_view vpath = path.get_ptr(); const std::string_view vpath = path.get_ptr();
const std::string local_path = vfs::get(vpath); const std::string local_path = vfs::get(vpath);
if (vpath.find_first_not_of('/') == umax) const auto mp = lv2_fs_object::get_mp(vpath);
if (mp == &g_mp_sys_dev_root)
{ {
return {CELL_EPERM, path}; return {CELL_EPERM, path};
} }
@ -1123,8 +1125,6 @@ error_code sys_fs_rmdir(ppu_thread& ppu, vm::cptr<char> path)
return {CELL_ENOTMOUNTED, path}; return {CELL_ENOTMOUNTED, path};
} }
const auto mp = lv2_fs_object::get_mp(vpath);
if (mp->flags & lv2_mp_flag::read_only) if (mp->flags & lv2_mp_flag::read_only)
{ {
return {CELL_EROFS, path}; return {CELL_EROFS, path};
@ -1163,9 +1163,9 @@ error_code sys_fs_unlink(ppu_thread& ppu, vm::cptr<char> path)
const std::string_view vpath = path.get_ptr(); const std::string_view vpath = path.get_ptr();
const std::string local_path = vfs::get(vpath); const std::string local_path = vfs::get(vpath);
const std::size_t dev_start = vpath.find_first_not_of('/'); const auto mp = lv2_fs_object::get_mp(vpath);
if (dev_start == umax) if (mp == &g_mp_sys_dev_root)
{ {
return {CELL_EISDIR, path}; return {CELL_EISDIR, path};
} }
@ -1180,8 +1180,6 @@ error_code sys_fs_unlink(ppu_thread& ppu, vm::cptr<char> path)
return {CELL_EISDIR, path}; return {CELL_EISDIR, path};
} }
const auto mp = lv2_fs_object::get_mp(vpath);
if (mp->flags & lv2_mp_flag::read_only) if (mp->flags & lv2_mp_flag::read_only)
{ {
return {CELL_EROFS, path}; return {CELL_EROFS, path};
@ -1189,10 +1187,8 @@ error_code sys_fs_unlink(ppu_thread& ppu, vm::cptr<char> path)
std::lock_guard lock(mp->mutex); std::lock_guard lock(mp->mutex);
// Size of "/dev_hdd0"-alike substring // Provide default mp root or use parent directory if not available (such as host_root)
const std::size_t dev_size = vpath.find_first_of('/', dev_start); if (!vfs::host::unlink(local_path, vfs::get(mp->root.empty() ? vpath.substr(0, vpath.find_last_of('/')) : mp->root)))
if (!vfs::host::unlink(local_path, vfs::get(vpath.substr(0, dev_size))))
{ {
switch (auto error = fs::g_tls_error) switch (auto error = fs::g_tls_error)
{ {
@ -1788,7 +1784,9 @@ error_code sys_fs_truncate(ppu_thread& ppu, vm::cptr<char> path, u64 size)
const std::string_view vpath = path.get_ptr(); const std::string_view vpath = path.get_ptr();
const std::string local_path = vfs::get(vpath); const std::string local_path = vfs::get(vpath);
if (vpath.find_first_not_of('/') == umax) const auto mp = lv2_fs_object::get_mp(vpath);
if (mp == &g_mp_sys_dev_root)
{ {
return {CELL_EISDIR, path}; return {CELL_EISDIR, path};
} }
@ -1798,8 +1796,6 @@ error_code sys_fs_truncate(ppu_thread& ppu, vm::cptr<char> path, u64 size)
return {CELL_ENOTMOUNTED, path}; return {CELL_ENOTMOUNTED, path};
} }
const auto mp = lv2_fs_object::get_mp(vpath);
if (mp->flags & lv2_mp_flag::read_only) if (mp->flags & lv2_mp_flag::read_only)
{ {
return {CELL_EROFS, path}; return {CELL_EROFS, path};
@ -1973,7 +1969,9 @@ error_code sys_fs_utime(ppu_thread& ppu, vm::cptr<char> path, vm::cptr<CellFsUti
const std::string_view vpath = path.get_ptr(); const std::string_view vpath = path.get_ptr();
const std::string local_path = vfs::get(vpath); const std::string local_path = vfs::get(vpath);
if (vpath.find_first_not_of('/') == umax) const auto mp = lv2_fs_object::get_mp(vpath);
if (mp == &g_mp_sys_dev_root)
{ {
return {CELL_EISDIR, path}; return {CELL_EISDIR, path};
} }
@ -1983,8 +1981,6 @@ error_code sys_fs_utime(ppu_thread& ppu, vm::cptr<char> path, vm::cptr<CellFsUti
return {CELL_ENOTMOUNTED, path}; return {CELL_ENOTMOUNTED, path};
} }
const auto mp = lv2_fs_object::get_mp(vpath);
if (mp->flags & lv2_mp_flag::read_only) if (mp->flags & lv2_mp_flag::read_only)
{ {
return {CELL_EROFS, path}; return {CELL_EROFS, path};

1
rpcs3/Emu/Cell/lv2/sys_fs.h
View file

@ -140,6 +140,7 @@ enum class lv2_file_type
struct lv2_fs_mount_point struct lv2_fs_mount_point
{ {
const std::string_view root;
const u32 sector_size = 512; const u32 sector_size = 512;
const u32 block_size = 4096; const u32 block_size = 4096;
const bs_t<lv2_mp_flag> flags{}; const bs_t<lv2_mp_flag> flags{};