diff options
Diffstat (limited to 'src/core/file_sys/vfs.cpp')
| -rw-r--r-- | src/core/file_sys/vfs.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/file_sys/vfs.cpp b/src/core/file_sys/vfs.cpp index f497e9396..215e1cb1a 100644 --- a/src/core/file_sys/vfs.cpp +++ b/src/core/file_sys/vfs.cpp | |||
| @@ -5,8 +5,7 @@ | |||
| 5 | #include <algorithm> | 5 | #include <algorithm> |
| 6 | #include <numeric> | 6 | #include <numeric> |
| 7 | #include <string> | 7 | #include <string> |
| 8 | #include "common/common_paths.h" | 8 | #include "common/fs/path_util.h" |
| 9 | #include "common/file_util.h" | ||
| 10 | #include "common/logging/backend.h" | 9 | #include "common/logging/backend.h" |
| 11 | #include "core/file_sys/mode.h" | 10 | #include "core/file_sys/mode.h" |
| 12 | #include "core/file_sys/vfs.h" | 11 | #include "core/file_sys/vfs.h" |
| @@ -122,15 +121,14 @@ VirtualDir VfsFilesystem::CopyDirectory(std::string_view old_path_, std::string_ | |||
| 122 | return nullptr; | 121 | return nullptr; |
| 123 | 122 | ||
| 124 | for (const auto& file : old_dir->GetFiles()) { | 123 | for (const auto& file : old_dir->GetFiles()) { |
| 125 | const auto x = | 124 | const auto x = CopyFile(old_path + '/' + file->GetName(), new_path + '/' + file->GetName()); |
| 126 | CopyFile(old_path + DIR_SEP + file->GetName(), new_path + DIR_SEP + file->GetName()); | ||
| 127 | if (x == nullptr) | 125 | if (x == nullptr) |
| 128 | return nullptr; | 126 | return nullptr; |
| 129 | } | 127 | } |
| 130 | 128 | ||
| 131 | for (const auto& dir : old_dir->GetSubdirectories()) { | 129 | for (const auto& dir : old_dir->GetSubdirectories()) { |
| 132 | const auto x = | 130 | const auto x = |
| 133 | CopyDirectory(old_path + DIR_SEP + dir->GetName(), new_path + DIR_SEP + dir->GetName()); | 131 | CopyDirectory(old_path + '/' + dir->GetName(), new_path + '/' + dir->GetName()); |
| 134 | if (x == nullptr) | 132 | if (x == nullptr) |
| 135 | return nullptr; | 133 | return nullptr; |
| 136 | } | 134 | } |