make sure to call MakeSafeAbsolutePathÍnPlace where appropriate (#363)

2 files changed, 16 insertions, 16 deletions

diff --git a/src/zen/cmds/builds_cmd.cpp b/src/zen/cmds/builds_cmd.cpp
index 6607fd6d2..43e0ed689 100644
--- a/src/zen/cmds/builds_cmd.cpp
+++ b/src/zen/cmds/builds_cmd.cpp
@@ -9183,7 +9183,7 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 		 {
 			 m_SystemRootDir = PickDefaultSystemRootDirectory();
 		 }
-		 MakeSafeAbsolutePath(m_SystemRootDir);
+		 MakeSafeAbsolutePathÍnPlace(m_SystemRootDir);
 	};
 
 	auto ParseStorageOptions = [&]() {
@@ -9203,7 +9203,7 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 		{
 			throw zen::OptionParseException(fmt::format("At least one storage option is required\n{}", m_UploadOptions.help()));
 		}
-		MakeSafeAbsolutePath(m_StoragePath);
+		MakeSafeAbsolutePathÍnPlace(m_StoragePath);
 	};
 
 	std::unique_ptr<AuthMgr> Auth;
@@ -9291,7 +9291,7 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 		}
 		else if (!m_AccessTokenPath.empty())
 		{
-			MakeSafeAbsolutePath(m_AccessTokenPath);
+			MakeSafeAbsolutePathÍnPlace(m_AccessTokenPath);
 			std::string ResolvedAccessToken = ReadAccessTokenFromFile(m_AccessTokenPath);
 			if (!ResolvedAccessToken.empty())
 			{
@@ -9585,7 +9585,7 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 		{
 			throw zen::OptionParseException(fmt::format("local-path is required\n{}", m_UploadOptions.help()));
 		}
-		MakeSafeAbsolutePath(m_Path);
+		MakeSafeAbsolutePathÍnPlace(m_Path);
 	};
 
 	auto ParseDiffPath = [&]() {
@@ -9593,7 +9593,7 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 		{
 			throw zen::OptionParseException(fmt::format("compare-path is required\n{}", m_DownloadOptions.help()));
 		}
-		MakeSafeAbsolutePath(m_DiffPath);
+		MakeSafeAbsolutePathÍnPlace(m_DiffPath);
 	};
 
 	auto ParseBlobHash = [&]() -> IoHash {
@@ -9668,7 +9668,7 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 
 			if (!m_BuildMetadataPath.empty())
 			{
-				MakeSafeAbsolutePath(m_BuildMetadataPath);
+				MakeSafeAbsolutePathÍnPlace(m_BuildMetadataPath);
 				IoBuffer		 MetaDataJson = ReadFile(m_BuildMetadataPath).Flatten();
 				std::string_view Json(reinterpret_cast<const char*>(MetaDataJson.GetData()), MetaDataJson.GetSize());
 				std::string		 JsonError;
@@ -9717,8 +9717,8 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 	{
 		if (SubOption == &m_ListOptions)
 		{
-			MakeSafeAbsolutePath(m_ListQueryPath);
-			MakeSafeAbsolutePath(m_ListResultPath);
+			MakeSafeAbsolutePathÍnPlace(m_ListQueryPath);
+			MakeSafeAbsolutePathÍnPlace(m_ListResultPath);
 
 			if (!m_ListResultPath.empty())
 			{
@@ -9759,7 +9759,7 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 			{
 				m_ZenFolderPath = std::filesystem::current_path() / ZenFolderName;
 			}
-			MakeSafeAbsolutePath(m_ZenFolderPath);
+			MakeSafeAbsolutePathÍnPlace(m_ZenFolderPath);
 
 			CreateDirectories(m_ZenFolderPath);
 			auto _ = MakeGuard([this]() {
@@ -9827,7 +9827,7 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 			{
 				m_ZenFolderPath = std::filesystem::current_path() / ZenFolderName;
 			}
-			MakeSafeAbsolutePath(m_ZenFolderPath);
+			MakeSafeAbsolutePathÍnPlace(m_ZenFolderPath);
 
 			CreateDirectories(m_ZenFolderPath);
 			auto _ = MakeGuard([this]() {
@@ -9910,7 +9910,7 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 			{
 				m_ZenFolderPath = m_Path / ZenFolderName;
 			}
-			MakeSafeAbsolutePath(m_ZenFolderPath);
+			MakeSafeAbsolutePathÍnPlace(m_ZenFolderPath);
 
 			BuildStorage::Statistics	  StorageStats;
 			BuildStorageCache::Statistics StorageCacheStats;
@@ -9956,7 +9956,7 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 			{
 				m_ZenFolderPath = std::filesystem::current_path() / ZenFolderName;
 			}
-			MakeSafeAbsolutePath(m_ZenFolderPath);
+			MakeSafeAbsolutePathÍnPlace(m_ZenFolderPath);
 
 			CreateDirectories(m_ZenFolderPath);
 			auto _ = MakeGuard([this]() {
@@ -10001,7 +10001,7 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 			{
 				m_ZenFolderPath = std::filesystem::current_path() / ZenFolderName;
 			}
-			MakeSafeAbsolutePath(m_ZenFolderPath);
+			MakeSafeAbsolutePathÍnPlace(m_ZenFolderPath);
 
 			CreateDirectories(m_ZenFolderPath);
 			auto _ = MakeGuard([this]() {
@@ -10036,7 +10036,7 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 			{
 				m_ZenFolderPath = m_Path / ZenFolderName;
 			}
-			MakeSafeAbsolutePath(m_ZenFolderPath);
+			MakeSafeAbsolutePathÍnPlace(m_ZenFolderPath);
 
 			BuildStorage::Statistics	  StorageStats;
 			BuildStorageCache::Statistics StorageCacheStats;
@@ -10124,7 +10124,7 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 			{
 				m_ZenFolderPath = m_Path / ZenFolderName;
 			}
-			MakeSafeAbsolutePath(m_ZenFolderPath);
+			MakeSafeAbsolutePathÍnPlace(m_ZenFolderPath);
 
 			StorageInstance Storage = CreateBuildStorage(StorageStats, StorageCacheStats, ZenTempFolderPath(m_ZenFolderPath));
 
diff --git a/src/zen/cmds/workspaces_cmd.cpp b/src/zen/cmds/workspaces_cmd.cpp
index 2ddd0c73a..773734f12 100644
--- a/src/zen/cmds/workspaces_cmd.cpp
+++ b/src/zen/cmds/workspaces_cmd.cpp
@@ -400,7 +400,7 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 	}
 	else
 	{
-		MakeSafeAbsolutePath(m_SystemRootDir);
+		MakeSafeAbsolutePathÍnPlace(m_SystemRootDir);
 	}
 
 	std::filesystem::path StatePath = m_SystemRootDir / "workspaces";