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

Fixed fs::file::open

Browse source
This commit is contained in:
Nekotekina 2017-01-28 13:11:06 +03:00
parent 44b2df27ea
commit 307da1fe39
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Utilities/File.cpp
View file

@ -665,17 +665,17 @@ void fs::file::xfail() const
fmt::throw_exception("Unexpected fs::error %s", g_tls_error); fmt::throw_exception("Unexpected fs::error %s", g_tls_error);
} }
bool fs::file::open(const std::string& path, bs_t<open_mode> mode) fs::file::file(const std::string& path, bs_t<open_mode> mode)
{ {
if (auto device = get_virtual_device(path)) if (auto device = get_virtual_device(path))
{ {
if (auto&& _file = device->open(path, mode)) if (auto&& _file = device->open(path, mode))
{ {
m_file = std::move(_file); m_file = std::move(_file);
return true; return;
} }
return false; return;
} }
#ifdef _WIN32 #ifdef _WIN32
@ -695,7 +695,7 @@ bool fs::file::open(const std::string& path, bs_t<open_mode> mode)
if (test(mode & fs::excl)) if (test(mode & fs::excl))
{ {
g_tls_error = error::inval; g_tls_error = error::inval;
return false; return;
} }
disp = test(mode & fs::trunc) ? TRUNCATE_EXISTING : OPEN_EXISTING; disp = test(mode & fs::trunc) ? TRUNCATE_EXISTING : OPEN_EXISTING;
@ -706,7 +706,7 @@ bool fs::file::open(const std::string& path, bs_t<open_mode> mode)
if (handle == INVALID_HANDLE_VALUE) if (handle == INVALID_HANDLE_VALUE)
{ {
g_tls_error = to_error(GetLastError()); g_tls_error = to_error(GetLastError());
return false; return;
} }
class windows_file final : public file_base class windows_file final : public file_base
@ -827,7 +827,7 @@ bool fs::file::open(const std::string& path, bs_t<open_mode> mode)
if (fd == -1) if (fd == -1)
{ {
g_tls_error = to_error(errno); g_tls_error = to_error(errno);
return false; return;
} }
class unix_file final : public file_base class unix_file final : public file_base
@ -913,8 +913,6 @@ bool fs::file::open(const std::string& path, bs_t<open_mode> mode)
m_file = std::make_unique<unix_file>(fd); m_file = std::make_unique<unix_file>(fd);
#endif #endif
return true;
} }
fs::file::file(const void* ptr, std::size_t size) fs::file::file(const void* ptr, std::size_t size)

16
Utilities/File.h
View file

@ -156,17 +156,19 @@ namespace fs
file() = default; file() = default;
// Open file with specified mode // Open file with specified mode
explicit file(const std::string& path, bs_t<open_mode> mode = ::fs::read) explicit file(const std::string& path, bs_t<open_mode> mode = ::fs::read);
{
open(path, mode);
}
// Open file with specified mode
bool open(const std::string& path, bs_t<open_mode> mode = ::fs::read);
// Open memory for read // Open memory for read
explicit file(const void* ptr, std::size_t size); explicit file(const void* ptr, std::size_t size);
// Open file with specified args (forward to constructor)
template <typename... Args>
bool open(Args&&... args)
{
*this = fs::file(std::forward<Args>(args)...);
return m_file.operator bool();
}
// Check whether the handle is valid (opened file) // Check whether the handle is valid (opened file)
explicit operator bool() const explicit operator bool() const
{ {