diff options
| author | 2020-12-09 19:25:00 -0500 | |
|---|---|---|
| committer | 2020-12-09 19:28:11 -0500 | |
| commit | ec8548b414d39bf389ca55154e383ca5574344e7 (patch) | |
| tree | c92c7d2cbbd1cb5aad1b8ee3ecba654bd657a19a /src/common/file_util.cpp | |
| parent | Merge pull request #5179 from ReinUsesLisp/fs-path (diff) | |
| download | yuzu-ec8548b414d39bf389ca55154e383ca5574344e7.tar.gz yuzu-ec8548b414d39bf389ca55154e383ca5574344e7.tar.xz yuzu-ec8548b414d39bf389ca55154e383ca5574344e7.zip | |
common/file_util: Simplify the behavior of CreateFullPath
Diffstat (limited to 'src/common/file_util.cpp')
| -rw-r--r-- | src/common/file_util.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index a286b9341..8e061ff6c 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp | |||
| @@ -136,16 +136,10 @@ bool CreateDirs(const fs::path& path) { | |||
| 136 | bool CreateFullPath(const fs::path& path) { | 136 | bool CreateFullPath(const fs::path& path) { |
| 137 | LOG_TRACE(Common_Filesystem, "path {}", path); | 137 | LOG_TRACE(Common_Filesystem, "path {}", path); |
| 138 | 138 | ||
| 139 | // Removes trailing slashes and turns any '\' into '/' | 139 | if (path.has_extension()) { |
| 140 | const auto new_path = SanitizePath(path.string(), DirectorySeparator::ForwardSlash); | 140 | return CreateDirs(path.parent_path()); |
| 141 | |||
| 142 | if (new_path.rfind('.') == std::string::npos) { | ||
| 143 | // The path is a directory | ||
| 144 | return CreateDirs(new_path); | ||
| 145 | } else { | 141 | } else { |
| 146 | // The path is a file | 142 | return CreateDirs(path); |
| 147 | // Creates directory preceding the last '/' | ||
| 148 | return CreateDirs(new_path.substr(0, new_path.rfind('/'))); | ||
| 149 | } | 143 | } |
| 150 | } | 144 | } |
| 151 | 145 | ||