Browse Source
Merge pull request #6974 from ogniK5377/fs-recursive-createdir
FS: Recursively create directories for CreateDirectory
pull/15/merge
Morph
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
13 additions and
8 deletions
-
src/core/hle/service/filesystem/filesystem.cpp
|
|
|
@ -97,15 +97,20 @@ ResultCode VfsDirectoryServiceWrapper::DeleteFile(const std::string& path_) cons |
|
|
|
|
|
|
|
ResultCode VfsDirectoryServiceWrapper::CreateDirectory(const std::string& path_) const { |
|
|
|
std::string path(Common::FS::SanitizePath(path_)); |
|
|
|
auto dir = GetDirectoryRelativeWrapped(backing, Common::FS::GetParentPath(path)); |
|
|
|
if (dir == nullptr || Common::FS::GetFilename(Common::FS::GetParentPath(path)).empty()) { |
|
|
|
dir = backing; |
|
|
|
} |
|
|
|
auto new_dir = dir->CreateSubdirectory(Common::FS::GetFilename(path)); |
|
|
|
const auto components = Common::FS::SplitPathComponents(path); |
|
|
|
std::string relative_path; |
|
|
|
for (const auto& component : components) { |
|
|
|
// Skip empty path components
|
|
|
|
if (component.empty()) { |
|
|
|
continue; |
|
|
|
} |
|
|
|
relative_path = Common::FS::SanitizePath(relative_path + '/' + component); |
|
|
|
auto new_dir = backing->CreateSubdirectory(relative_path); |
|
|
|
if (new_dir == nullptr) { |
|
|
|
// TODO(DarkLordZach): Find a better error code for this
|
|
|
|
return ResultUnknown; |
|
|
|
} |
|
|
|
} |
|
|
|
return ResultSuccess; |
|
|
|
} |
|
|
|
|
|
|
|
|