From 8941cdb7d2355ba0f3084b306165923520f9db65 Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Fri, 11 Dec 2020 20:22:01 -0500
Subject: Revert "Merge pull request #5174 from ReinUsesLisp/fs-fix"
This reverts commit 5fe55b16a11d9ec607fb8a3fdddc77a4393cd96a, reversing
changes made to e94dd7e2c4fc3f7ca2c15c01bdc301be2b8a4c1b.
---
src/common/file_util.cpp | 30 ++----------------------------
1 file changed, 2 insertions(+), 28 deletions(-)
(limited to 'src/common/file_util.cpp')
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 7752c04213..d5f6ea2ee8 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -98,11 +98,6 @@ bool Delete(const fs::path& path) {
bool CreateDir(const fs::path& path) {
LOG_TRACE(Common_Filesystem, "directory {}", path.string());
- if (Exists(path)) {
- LOG_DEBUG(Common_Filesystem, "path exists {}", path.string());
- return true;
- }
-
std::error_code ec;
const bool success = fs::create_directory(path, ec);
@@ -114,41 +109,20 @@ bool CreateDir(const fs::path& path) {
return true;
}
-bool CreateDirs(const fs::path& path) {
+bool CreateFullPath(const fs::path& path) {
LOG_TRACE(Common_Filesystem, "path {}", path.string());
- if (Exists(path)) {
- LOG_DEBUG(Common_Filesystem, "path exists {}", path.string());
- return true;
- }
-
std::error_code ec;
const bool success = fs::create_directories(path, ec);
if (!success) {
- LOG_ERROR(Common_Filesystem, "Unable to create directories: {}", ec.message());
+ LOG_ERROR(Common_Filesystem, "Unable to create full path: {}", ec.message());
return false;
}
return true;
}
-bool CreateFullPath(const fs::path& path) {
- LOG_TRACE(Common_Filesystem, "path {}", path);
-
- // Removes trailing slashes and turns any '\' into '/'
- const auto new_path = SanitizePath(path.string(), DirectorySeparator::ForwardSlash);
-
- if (new_path.rfind('.') == std::string::npos) {
- // The path is a directory
- return CreateDirs(new_path);
- } else {
- // The path is a file
- // Creates directory preceding the last '/'
- return CreateDirs(new_path.substr(0, new_path.rfind('/')));
- }
-}
-
bool Rename(const fs::path& src, const fs::path& dst) {
LOG_TRACE(Common_Filesystem, "{} --> {}", src.string(), dst.string());
--
cgit v1.2.3-70-g09d2