1 files changed, 15 insertions, 21 deletions

diff --git a/src/zencore/filesystem.cpp b/src/zencore/filesystem.cpp
index 92a065707..8ed63565c 100644
--- a/src/zencore/filesystem.cpp
+++ b/src/zencore/filesystem.cpp
@@ -194,7 +194,7 @@ WipeDirectory(const wchar_t* DirPath, bool KeepDotFiles)
 		FindClose(hFind);
 	}
 
-	return true;
+	return Success;
 }
 
 bool
@@ -1022,7 +1022,7 @@ TryCloneFile(const std::filesystem::path& FromPath, const std::filesystem::path&
 		return false;
 	}
 	fchmod(ToFd, 0666);
-	ScopedFd $To = { FromFd };
+	ScopedFd $To = { ToFd };
 
 	ioctl(ToFd, FICLONE, FromFd);
 
@@ -1112,7 +1112,8 @@ CopyFile(const std::filesystem::path& FromPath, const std::filesystem::path& ToP
 
 	size_t FileSizeBytes = Stat.st_size;
 
-	fchown(ToFd, Stat.st_uid, Stat.st_gid);
+	int $Ignore = fchown(ToFd, Stat.st_uid, Stat.st_gid);
+	ZEN_UNUSED($Ignore);  // What's the appropriate error handling here?
 
 	// Copy impl
 	const size_t BufferSize = Min(FileSizeBytes, 64u << 10);
@@ -1326,11 +1327,6 @@ ReadFile(void* NativeHandle, void* Data, uint64_t Size, uint64_t FileOffset, uin
 		{
 			BytesRead = size_t(dwNumberOfBytesRead);
 		}
-		else if ((BytesRead != NumberOfBytesToRead))
-		{
-			Ec = MakeErrorCode(ERROR_HANDLE_EOF);
-			return;
-		}
 		else
 		{
 			Ec = MakeErrorCodeFromLastError();
@@ -1344,20 +1340,15 @@ ReadFile(void* NativeHandle, void* Data, uint64_t Size, uint64_t FileOffset, uin
 		{
 			BytesRead = size_t(ReadResult);
 		}
-		else if ((BytesRead != NumberOfBytesToRead))
-		{
-			Ec = MakeErrorCode(EIO);
-			return;
-		}
 		else
 		{
 			Ec = MakeErrorCodeFromLastError();
 			return;
 		}
 #endif
-		Size -= NumberOfBytesToRead;
-		FileOffset += NumberOfBytesToRead;
-		Data = reinterpret_cast<uint8_t*>(Data) + NumberOfBytesToRead;
+		Size -= BytesRead;
+		FileOffset += BytesRead;
+		Data = reinterpret_cast<uint8_t*>(Data) + BytesRead;
 	}
 }
 
@@ -1408,7 +1399,7 @@ WriteFile(std::filesystem::path Path, const IoBuffer* const* Data, size_t Buffer
 			const uint64_t ChunkSize = Min<uint64_t>(WriteSize, uint64_t(2) * 1024 * 1024 * 1024);
 
 #if ZEN_PLATFORM_WINDOWS
-			hRes = Outfile.Write(DataPtr, gsl::narrow_cast<uint32_t>(WriteSize));
+			hRes = Outfile.Write(DataPtr, gsl::narrow_cast<uint32_t>(ChunkSize));
 			if (FAILED(hRes))
 			{
 				Outfile.Close();
@@ -1417,7 +1408,7 @@ WriteFile(std::filesystem::path Path, const IoBuffer* const* Data, size_t Buffer
 				ThrowSystemException(hRes, fmt::format("File write failed for '{}'", Path).c_str());
 			}
 #else
-			if (write(Fd, DataPtr, WriteSize) != int64_t(WriteSize))
+			if (write(Fd, DataPtr, ChunkSize) != int64_t(ChunkSize))
 			{
 				close(Fd);
 				std::error_code DummyEc;
@@ -3069,7 +3060,7 @@ SetFileReadOnly(const std::filesystem::path& Filename, bool ReadOnly)
 }
 
 void
-MakeSafeAbsolutePathÍnPlace(std::filesystem::path& Path)
+MakeSafeAbsolutePathInPlace(std::filesystem::path& Path)
 {
 	if (!Path.empty())
 	{
@@ -3091,7 +3082,7 @@ std::filesystem::path
 MakeSafeAbsolutePath(const std::filesystem::path& Path)
 {
 	std::filesystem::path Tmp(Path);
-	MakeSafeAbsolutePathÍnPlace(Tmp);
+	MakeSafeAbsolutePathInPlace(Tmp);
 	return Tmp;
 }
 
@@ -3319,6 +3310,8 @@ filesystem_forcelink()
 {
 }
 
+TEST_SUITE_BEGIN("core.filesystem");
+
 TEST_CASE("filesystem")
 {
 	using namespace std::filesystem;
@@ -3543,7 +3536,6 @@ TEST_CASE("PathBuilder")
 	Path.Reset();
 	Path.Append(fspath(L"/\u0119oo/"));
 	Path /= L"bar";
-	printf("%ls\n", Path.ToPath().c_str());
 	CHECK(Path.ToView() == L"/\u0119oo/bar");
 	CHECK(Path.ToPath() == L"\\\u0119oo\\bar");
 #	endif
@@ -3614,6 +3606,8 @@ TEST_CASE("SharedMemory")
 	CHECK(!OpenSharedMemory("SharedMemoryTest0", 482, false));
 }
 
+TEST_SUITE_END();
+
 #endif
 
 }  // namespace zen