Make sure that PathFromHandle don't hide true error when throwing exceptions (#600)

* Make sure that PathFromHandle don't hide true error when throwing exceptions

* changelog

* return error info in PathFromHandle if path fails to resolve

3 files changed, 31 insertions, 16 deletions

diff --git a/src/zencore/filesystem.cpp b/src/zencore/filesystem.cpp
index e9b147be5..29ec14e0c 100644
--- a/src/zencore/filesystem.cpp
+++ b/src/zencore/filesystem.cpp
@@ -1288,12 +1288,12 @@ PathFromHandle(void* NativeHandle, std::error_code& Ec)
 {
 	if (NativeHandle == nullptr)
 	{
-		return std::filesystem::path();
+		return "<error handle 'nullptr'>";
 	}
 #if ZEN_PLATFORM_WINDOWS
 	if (NativeHandle == INVALID_HANDLE_VALUE)
 	{
-		return std::filesystem::path();
+		return "<error handle 'invalid handle'>";
 	}
 
 	auto GetFinalPathNameByHandleWRetry =
@@ -1330,7 +1330,7 @@ PathFromHandle(void* NativeHandle, std::error_code& Ec)
 	if (Error != ERROR_SUCCESS)
 	{
 		Ec = MakeErrorCodeFromLastError();
-		return std::filesystem::path();
+		return fmt::format("<error handle '{}'>", Ec.message());
 	}
 
 	if (RequiredLengthIncludingNul < PathDataSize)
@@ -1347,7 +1347,7 @@ PathFromHandle(void* NativeHandle, std::error_code& Ec)
 	if (Error != ERROR_SUCCESS)
 	{
 		Ec = MakeErrorCodeFromLastError();
-		return std::filesystem::path();
+		return fmt::format("<error handle '{}'>", Ec.message());
 	}
 	ZEN_UNUSED(FinalLength);
 	return FullPath;
@@ -1361,7 +1361,7 @@ PathFromHandle(void* NativeHandle, std::error_code& Ec)
 	if (BytesRead <= 0)
 	{
 		Ec = MakeErrorCodeFromLastError();
-		return {};
+		return fmt::format("<error handle '{}'>", Ec.message());
 	}
 
 	Link[BytesRead] = '\0';
@@ -1372,7 +1372,7 @@ PathFromHandle(void* NativeHandle, std::error_code& Ec)
 	if (fcntl(Fd, F_GETPATH, Path) < 0)
 	{
 		Ec = MakeErrorCodeFromLastError();
-		return {};
+		return fmt::format("<error handle '{}'>", Ec.message());
 	}
 
 	return Path;
diff --git a/src/zenstore/caslog.cpp b/src/zenstore/caslog.cpp
index cf3bd76da..2c26e522f 100644
--- a/src/zenstore/caslog.cpp
+++ b/src/zenstore/caslog.cpp
@@ -229,7 +229,8 @@ CasLogFile::Append(const void* DataPointer, uint64_t DataSize)
 
 	if (Ec)
 	{
-		throw std::system_error(Ec, fmt::format("Failed to write to log file '{}'", PathFromHandle(m_File.Handle())));
+		std::error_code Dummy;
+		throw std::system_error(Ec, fmt::format("Failed to write to log file '{}'", PathFromHandle(m_File.Handle(), Dummy)));
 	}
 }
 
diff --git a/src/zenutil/basicfile.cpp b/src/zenutil/basicfile.cpp
index 7d0edaa5d..819d0805d 100644
--- a/src/zenutil/basicfile.cpp
+++ b/src/zenutil/basicfile.cpp
@@ -191,7 +191,8 @@ BasicFile::Read(void* Data, uint64_t BytesToRead, uint64_t FileOffset)
 
 		if (!Success)
 		{
-			ThrowLastError(fmt::format("Failed to read from file '{}'", zen::PathFromHandle(m_FileHandle)));
+			std::error_code Dummy;
+			ThrowLastError(fmt::format("Failed to read from file '{}'", zen::PathFromHandle(m_FileHandle, Dummy)));
 		}
 
 		BytesToRead -= NumberOfBytesToRead;
@@ -324,7 +325,8 @@ BasicFile::Write(const void* Data, uint64_t Size, uint64_t Offset)
 
 	if (Ec)
 	{
-		throw std::system_error(Ec, fmt::format("Failed to write to file '{}'", zen::PathFromHandle(m_FileHandle)));
+		std::error_code Dummy;
+		throw std::system_error(Ec, fmt::format("Failed to write to file '{}'", zen::PathFromHandle(m_FileHandle, Dummy)));
 	}
 }
 
@@ -356,7 +358,8 @@ BasicFile::FileSize()
 		int Error = zen::GetLastError();
 		if (Error)
 		{
-			ThrowSystemError(Error, fmt::format("Failed to get file size from file '{}'", PathFromHandle(m_FileHandle)));
+			std::error_code Dummy;
+			ThrowSystemError(Error, fmt::format("Failed to get file size from file '{}'", PathFromHandle(m_FileHandle, Dummy)));
 		}
 	}
 	return uint64_t(liFileSize.QuadPart);
@@ -366,7 +369,8 @@ BasicFile::FileSize()
 	struct stat Stat;
 	if (fstat(Fd, &Stat) == -1)
 	{
-		ThrowSystemError(GetLastError(), fmt::format("Failed to get file size from file '{}'", PathFromHandle(m_FileHandle)));
+		std::error_code Dummy;
+		ThrowSystemError(GetLastError(), fmt::format("Failed to get file size from file '{}'", PathFromHandle(m_FileHandle, Dummy)));
 	}
 	return uint64_t(Stat.st_size);
 #endif
@@ -413,7 +417,9 @@ BasicFile::SetFileSize(uint64_t FileSize)
 		int Error = zen::GetLastError();
 		if (Error)
 		{
-			ThrowSystemError(Error, fmt::format("Failed to set file pointer to {} for file {}", FileSize, PathFromHandle(m_FileHandle)));
+			std::error_code Dummy;
+			ThrowSystemError(Error,
+							 fmt::format("Failed to set file pointer to {} for file {}", FileSize, PathFromHandle(m_FileHandle, Dummy)));
 		}
 	}
 	OK = ::SetEndOfFile(m_FileHandle);
@@ -422,7 +428,9 @@ BasicFile::SetFileSize(uint64_t FileSize)
 		int Error = zen::GetLastError();
 		if (Error)
 		{
-			ThrowSystemError(Error, fmt::format("Failed to set end of file to {} for file {}", FileSize, PathFromHandle(m_FileHandle)));
+			std::error_code Dummy;
+			ThrowSystemError(Error,
+							 fmt::format("Failed to set end of file to {} for file {}", FileSize, PathFromHandle(m_FileHandle, Dummy)));
 		}
 	}
 #elif ZEN_PLATFORM_MAC
@@ -432,7 +440,9 @@ BasicFile::SetFileSize(uint64_t FileSize)
 		int Error = zen::GetLastError();
 		if (Error)
 		{
-			ThrowSystemError(Error, fmt::format("Failed to set truncate file to {} for file {}", FileSize, PathFromHandle(m_FileHandle)));
+			std::error_code Dummy;
+			ThrowSystemError(Error,
+							 fmt::format("Failed to set truncate file to {} for file {}", FileSize, PathFromHandle(m_FileHandle, Dummy)));
 		}
 	}
 #else
@@ -442,7 +452,9 @@ BasicFile::SetFileSize(uint64_t FileSize)
 		int Error = zen::GetLastError();
 		if (Error)
 		{
-			ThrowSystemError(Error, fmt::format("Failed to set truncate file to {} for file {}", FileSize, PathFromHandle(m_FileHandle)));
+			std::error_code Dummy;
+			ThrowSystemError(Error,
+							 fmt::format("Failed to set truncate file to {} for file {}", FileSize, PathFromHandle(m_FileHandle, Dummy)));
 		}
 	}
 	if (FileSize > 0)
@@ -450,7 +462,9 @@ BasicFile::SetFileSize(uint64_t FileSize)
 		int Error = posix_fallocate64(Fd, 0, (off64_t)FileSize);
 		if (Error)
 		{
-			ThrowSystemError(Error, fmt::format("Failed to allocate space of {} for file {}", FileSize, PathFromHandle(m_FileHandle)));
+			std::error_code Dummy;
+			ThrowSystemError(Error,
+							 fmt::format("Failed to allocate space of {} for file {}", FileSize, PathFromHandle(m_FileHandle, Dummy)));
 		}
 	}
 #endif