Exverge/suyu
3
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

vfs_real: Add CreateFullPath to CreateFile

Browse source 
Fixes bugs with calling CreateFile when the immediate directory does not exist.
This commit is contained in:
Zach Hilman 2018-08-09 20:50:50 -04:00
parent c0257cf52f
commit 9b0e3556ed
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/core/file_sys/vfs_real.cpp
View file

@ -83,7 +83,10 @@ VirtualFile RealVfsFilesystem::OpenFile(std::string_view path_, Mode perms) {
VirtualFile RealVfsFilesystem::CreateFile(std::string_view path_, Mode perms) {
const auto path = FileUtil::SanitizePath(path_, FileUtil::DirectorySeparator::PlatformDefault);
if (!FileUtil::Exists(path) && !FileUtil::CreateEmptyFile(path))
if (!FileUtil::Exists(path) &&
!FileUtil::CreateFullPath(
FileUtil::SanitizePath(path, FileUtil::DirectorySeparator::ForwardSlash)) &&
!FileUtil::CreateEmptyFile(path))
return nullptr;
return OpenFile(path, perms);
}
@ -306,14 +309,14 @@ RealVfsDirectory::RealVfsDirectory(RealVfsFilesystem& base_, const std::string&
std::shared_ptr<VfsFile> RealVfsDirectory::GetFileRelative(std::string_view path) const {
const auto full_path = FileUtil::SanitizePath(this->path + DIR_SEP + std::string(path));
if (!FileUtil::Exists(full_path))
if (!FileUtil::Exists(full_path) || FileUtil::IsDirectory(full_path))
return nullptr;
return base.OpenFile(full_path, perms);
}
std::shared_ptr<VfsDirectory> RealVfsDirectory::GetDirectoryRelative(std::string_view path) const {
const auto full_path = FileUtil::SanitizePath(this->path + DIR_SEP + std::string(path));
if (!FileUtil::Exists(full_path))
if (!FileUtil::Exists(full_path) || !FileUtil::IsDirectory(full_path))
return nullptr;
return base.OpenDirectory(full_path, perms);
}