From fc37cc4a02ed13d1a73b941a9f80975600fd1b99 Mon Sep 17 00:00:00 2001
From: David Foerster <david.foerster@informatik.hu-berlin.de>
Date: Tue, 10 May 2016 20:20:14 +0200
Subject: Normalize all line terminators

---
 src/Platform/FileCommon.cpp | 162 ++++++++++++++++++++++----------------------
 1 file changed, 81 insertions(+), 81 deletions(-)

(limited to 'src/Platform/FileCommon.cpp')

diff --git a/src/Platform/FileCommon.cpp b/src/Platform/FileCommon.cpp
index e9b77540..934211bd 100644
--- a/src/Platform/FileCommon.cpp
+++ b/src/Platform/FileCommon.cpp
@@ -8,84 +8,84 @@
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.
-*/
-
-#include "File.h"
-#ifdef TC_UNIX
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <utime.h>
-#endif
-
-namespace VeraCrypt
-{
-	File::~File ()
-	{
-		try
-		{
-			if (FileIsOpen)
-				Close();
-		}
-		catch (...) { }
-	}
-
-	void File::Copy (const FilePath &sourcePath, const FilePath &destinationPath, bool preserveTimestamps)
-	{
-		File source;
-		source.Open (sourcePath);
-
-		File destination;
-		destination.Open (destinationPath, CreateWrite);
-
-		SecureBuffer buffer (OptimalReadSize);
-		uint64 len;
-
-		while ((len = source.Read (buffer)) > 0)
-		{
-			destination.Write (buffer, static_cast <size_t> (len));
-		}
-
-		if (preserveTimestamps)
-		{
-			destination.Flush();
-#ifndef TC_WINDOWS
-			struct stat statData;
-			throw_sys_sub_if (stat (string (sourcePath).c_str(), &statData) == -1, wstring (sourcePath));
-
-			struct utimbuf u;
-			u.actime = statData.st_atime;
-			u.modtime = statData.st_mtime;
-			throw_sys_sub_if (utime (string (destinationPath).c_str(), &u) == -1, wstring (destinationPath));
-#endif
-		}
-	}
-	
-	FilePath File::GetPath () const
-	{
-		if_debug (ValidateState());
-		return Path;
-	}
-
-	void File::ReadCompleteBuffer (const BufferPtr &buffer) const
-	{
-		size_t dataLeft = buffer.Size();
-		size_t offset = 0;
-
-		while (dataLeft > 0)
-		{
-			size_t dataRead = static_cast <size_t> (Read (buffer.GetRange (offset, dataLeft)));
-			if (dataRead == 0)
-				throw InsufficientData (SRC_POS);
-
-			dataLeft -= dataRead;
-			offset += dataRead;
-		}
-	}
-	
-	void File::ValidateState () const
-	{
-		if (!FileIsOpen)
-			throw NotInitialized (SRC_POS);
-	}
-}
+*/
+
+#include "File.h"
+#ifdef TC_UNIX
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <utime.h>
+#endif
+
+namespace VeraCrypt
+{
+	File::~File ()
+	{
+		try
+		{
+			if (FileIsOpen)
+				Close();
+		}
+		catch (...) { }
+	}
+
+	void File::Copy (const FilePath &sourcePath, const FilePath &destinationPath, bool preserveTimestamps)
+	{
+		File source;
+		source.Open (sourcePath);
+
+		File destination;
+		destination.Open (destinationPath, CreateWrite);
+
+		SecureBuffer buffer (OptimalReadSize);
+		uint64 len;
+
+		while ((len = source.Read (buffer)) > 0)
+		{
+			destination.Write (buffer, static_cast <size_t> (len));
+		}
+
+		if (preserveTimestamps)
+		{
+			destination.Flush();
+#ifndef TC_WINDOWS
+			struct stat statData;
+			throw_sys_sub_if (stat (string (sourcePath).c_str(), &statData) == -1, wstring (sourcePath));
+
+			struct utimbuf u;
+			u.actime = statData.st_atime;
+			u.modtime = statData.st_mtime;
+			throw_sys_sub_if (utime (string (destinationPath).c_str(), &u) == -1, wstring (destinationPath));
+#endif
+		}
+	}
+	
+	FilePath File::GetPath () const
+	{
+		if_debug (ValidateState());
+		return Path;
+	}
+
+	void File::ReadCompleteBuffer (const BufferPtr &buffer) const
+	{
+		size_t dataLeft = buffer.Size();
+		size_t offset = 0;
+
+		while (dataLeft > 0)
+		{
+			size_t dataRead = static_cast <size_t> (Read (buffer.GetRange (offset, dataLeft)));
+			if (dataRead == 0)
+				throw InsufficientData (SRC_POS);
+
+			dataLeft -= dataRead;
+			offset += dataRead;
+		}
+	}
+	
+	void File::ValidateState () const
+	{
+		if (!FileIsOpen)
+			throw NotInitialized (SRC_POS);
+	}
+}
-- 
cgit v1.2.3


From 11716ed2dacbb104f8f59867fe66f2c0a6984291 Mon Sep 17 00:00:00 2001
From: David Foerster <david.foerster@informatik.hu-berlin.de>
Date: Tue, 10 May 2016 22:16:32 +0200
Subject: Remove trailing whitespace

---
 src/Platform/FileCommon.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/Platform/FileCommon.cpp')

diff --git a/src/Platform/FileCommon.cpp b/src/Platform/FileCommon.cpp
index 934211bd..a5331266 100644
--- a/src/Platform/FileCommon.cpp
+++ b/src/Platform/FileCommon.cpp
@@ -3,7 +3,7 @@
  Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
  by the TrueCrypt License 3.0.
 
- Modifications and additions to the original source code (contained in this file) 
+ Modifications and additions to the original source code (contained in this file)
  and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
@@ -60,7 +60,7 @@ namespace VeraCrypt
 #endif
 		}
 	}
-	
+
 	FilePath File::GetPath () const
 	{
 		if_debug (ValidateState());
@@ -82,7 +82,7 @@ namespace VeraCrypt
 			offset += dataRead;
 		}
 	}
-	
+
 	void File::ValidateState () const
 	{
 		if (!FileIsOpen)
-- 
cgit v1.2.3