Merge pull request #61 from davidfoerster/normalize-line-terminators

Normalize line terminators
author: Mounir IDRASSI <mounir.idrassi@idrix.fr> 2016-05-10 22:34:27 +0200
committer: Mounir IDRASSI <mounir.idrassi@idrix.fr> 2016-05-10 22:34:27 +0200
commit: 268ef2d8e904db5068dbdc0fdc7ce3940d6452ea (patch)
tree: b1afa687c97fbf5e1ba2c92c5a10479ae5f832f5 /src/Platform/Unix
parent: 6d61f06a5348aebe7dbc0bf44d3e2729c20f7fd0 (diff)
parent: 5f47d8b6f11cdb3c4c2f43e04e5acfc6ffcb3035 (diff)
download: VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.tar.gz
VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.zip
17 files changed, 37 insertions, 37 deletions
diff --git a/src/Platform/Unix/Directory.cpp b/src/Platform/Unix/Directory.cpp
index db81b126..9c0590cb 100644
--- a/src/Platform/Unix/Directory.cpp
+++ b/src/Platform/Unix/Directory.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
@@ -53,7 +53,7 @@ namespace VeraCrypt
 		while ((dirEntry = readdir (dir)) != nullptr)
 		{
 			shared_ptr <FilePath> filePath (new FilePath (string (AppendSeparator (path)) + string (dirEntry->d_name)));
-			
+
 			if (!regularFilesOnly || filePath->IsFile())
 				files.push_back (filePath);
 
diff --git a/src/Platform/Unix/File.cpp b/src/Platform/Unix/File.cpp
index ddc7518e..5c45dcfc 100644
--- a/src/Platform/Unix/File.cpp
+++ b/src/Platform/Unix/File.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
@@ -73,7 +73,7 @@ namespace VeraCrypt
 				}
 				catch (...) // Suppress errors to allow using read-only files
 				{
-#ifdef DEBUG 
+#ifdef DEBUG
 					throw;
 #endif
 				}
@@ -132,7 +132,7 @@ namespace VeraCrypt
 
 		// HDIO_GETGEO ioctl is limited by the size of long
 		TextReader tr ("/sys/block/" + string (Path.ToHostDriveOfPartition().ToBaseName()) + "/" + string (Path.ToBaseName()) + "/start");
-		
+
 		string line;
 		tr.ReadLine (line);
 		return StringConverter::ToUInt64 (line) * GetDeviceSectorSize();
@@ -199,7 +199,7 @@ namespace VeraCrypt
 		case CreateReadWrite:
 			sysFlags |= O_CREAT | O_TRUNC | O_RDWR;
 			break;
-				
+
 		case CreateWrite:
 			sysFlags |= O_CREAT | O_TRUNC | O_WRONLY;
 			break;
@@ -262,7 +262,7 @@ namespace VeraCrypt
 					throw SystemException (SRC_POS, wstring (path));
 				}
 				break;
-			
+
 			case ShareReadWriteIgnoreLock:
 				break;
 
@@ -339,7 +339,7 @@ namespace VeraCrypt
 #endif
 		throw_sys_sub_if (write (FileHandle, buffer, buffer.Size()) != (ssize_t) buffer.Size(), wstring (Path));
 	}
-	
+
 	void File::WriteAt (const ConstBufferPtr &buffer, uint64 position) const
 	{
 		if_debug (ValidateState());
diff --git a/src/Platform/Unix/FilesystemPath.cpp b/src/Platform/Unix/FilesystemPath.cpp
index 0beb4703..f5d59f9f 100644
--- a/src/Platform/Unix/FilesystemPath.cpp
+++ b/src/Platform/Unix/FilesystemPath.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
@@ -43,7 +43,7 @@ namespace VeraCrypt
 
 		struct stat statData;
 		throw_sys_sub_if (stat (StringConverter::ToSingle (path).c_str(), &statData) != 0, Path);
-		
+
 		if (S_ISREG (statData.st_mode)) return FilesystemPathType::File;
 		if (S_ISDIR (statData.st_mode)) return FilesystemPathType::Directory;
 		if (S_ISCHR (statData.st_mode)) return FilesystemPathType::CharacterDevice;
diff --git a/src/Platform/Unix/Mutex.cpp b/src/Platform/Unix/Mutex.cpp
index 80b68ffb..a6b61de6 100644
--- a/src/Platform/Unix/Mutex.cpp
+++ b/src/Platform/Unix/Mutex.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
diff --git a/src/Platform/Unix/Pipe.cpp b/src/Platform/Unix/Pipe.cpp
index 0d39adae..f427ae63 100644
--- a/src/Platform/Unix/Pipe.cpp
+++ b/src/Platform/Unix/Pipe.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
@@ -44,7 +44,7 @@ namespace VeraCrypt
 	int Pipe::GetReadFD ()
 	{
 		assert (ReadFileDescriptor != -1);
-		
+
 		if (WriteFileDescriptor != -1)
 		{
 			close (WriteFileDescriptor);
diff --git a/src/Platform/Unix/Pipe.h b/src/Platform/Unix/Pipe.h
index 9bee3ec9..72af91bd 100644
--- a/src/Platform/Unix/Pipe.h
+++ b/src/Platform/Unix/Pipe.h
@@ -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
diff --git a/src/Platform/Unix/Poller.cpp b/src/Platform/Unix/Poller.cpp
index ef202f49..6b845631 100644
--- a/src/Platform/Unix/Poller.cpp
+++ b/src/Platform/Unix/Poller.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
diff --git a/src/Platform/Unix/Poller.h b/src/Platform/Unix/Poller.h
index 3dc06b98..054fe75e 100644
--- a/src/Platform/Unix/Poller.h
+++ b/src/Platform/Unix/Poller.h
@@ -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
diff --git a/src/Platform/Unix/Process.cpp b/src/Platform/Unix/Process.cpp
index 07703649..92a8f478 100644
--- a/src/Platform/Unix/Process.cpp
+++ b/src/Platform/Unix/Process.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
@@ -53,16 +53,16 @@ namespace VeraCrypt
 				try
 				{
 					int argIndex = 0;
-					/* Workaround for gcc 5.X issue related to the use of STL (string and list) with muliple fork calls. 
-					 * 
+					/* Workaround for gcc 5.X issue related to the use of STL (string and list) with muliple fork calls.
+					 *
 					 * The char* pointers retrieved from the elements of parameter "arguments" are no longer valid after
 					 * a second fork is called. "arguments" was created in the parent of the current child process.
-					 * 
-					 * The only solution is to copy the elements of "arguments" parameter in a local string array on this 
-					 * child process and then use char* pointers retrieved from this local copies before calling fork. 
-					 * 
+					 *
+					 * The only solution is to copy the elements of "arguments" parameter in a local string array on this
+					 * child process and then use char* pointers retrieved from this local copies before calling fork.
+					 *
 					 * gcc 4.x doesn't suffer from this issue.
-					 * 
+					 *
 					 */
 					string argsCopy[array_capacity (args)];
 					if (!execFunctor)
@@ -74,7 +74,7 @@ namespace VeraCrypt
 					{
 						argsCopy[argIndex++] = arg;
 					}
-					
+
 					for (int i = 0; i < argIndex; i++)
 					{
 						args[i] = const_cast <char*> (argsCopy[i].c_str());
diff --git a/src/Platform/Unix/Process.h b/src/Platform/Unix/Process.h
index af9aa339..d19d5737 100644
--- a/src/Platform/Unix/Process.h
+++ b/src/Platform/Unix/Process.h
@@ -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
@@ -31,7 +31,7 @@ namespace VeraCrypt
 		Process ();
 		virtual ~Process ();
 
-		static string Execute (const string &processName, const list <string> &arguments, int timeOut = -1, ProcessExecFunctor *execFunctor = nullptr, const Buffer *inputData = nullptr); 
+		static string Execute (const string &processName, const list <string> &arguments, int timeOut = -1, ProcessExecFunctor *execFunctor = nullptr, const Buffer *inputData = nullptr);
 
 	protected:
 
diff --git a/src/Platform/Unix/SyncEvent.cpp b/src/Platform/Unix/SyncEvent.cpp
index 6e775493..10bbc0c9 100644
--- a/src/Platform/Unix/SyncEvent.cpp
+++ b/src/Platform/Unix/SyncEvent.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
@@ -66,7 +66,7 @@ namespace VeraCrypt
 			if (status != 0)
 				throw SystemException (SRC_POS, status);
 		}
-		
+
 		Signaled = false;
 	}
 }
diff --git a/src/Platform/Unix/System.h b/src/Platform/Unix/System.h
index e322d331..30384907 100644
--- a/src/Platform/Unix/System.h
+++ b/src/Platform/Unix/System.h
@@ -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
diff --git a/src/Platform/Unix/SystemException.cpp b/src/Platform/Unix/SystemException.cpp
index 6fc29176..be051cc0 100644
--- a/src/Platform/Unix/SystemException.cpp
+++ b/src/Platform/Unix/SystemException.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
@@ -37,7 +37,7 @@ namespace VeraCrypt
 		: Exception (message, subject), ErrorCode (errno)
 	{
 	}
-	
+
 	void SystemException::Deserialize (shared_ptr <Stream> stream)
 	{
 		Exception::Deserialize (stream);
@@ -49,7 +49,7 @@ namespace VeraCrypt
 	{
 		return ErrorCode != 0;
 	}
-	
+
 	void SystemException::Serialize (shared_ptr <Stream> stream) const
 	{
 		Exception::Serialize (stream);
diff --git a/src/Platform/Unix/SystemInfo.cpp b/src/Platform/Unix/SystemInfo.cpp
index abf5a393..c3e3ab38 100644
--- a/src/Platform/Unix/SystemInfo.cpp
+++ b/src/Platform/Unix/SystemInfo.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
diff --git a/src/Platform/Unix/SystemLog.cpp b/src/Platform/Unix/SystemLog.cpp
index 93fb4e35..88027e40 100644
--- a/src/Platform/Unix/SystemLog.cpp
+++ b/src/Platform/Unix/SystemLog.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
diff --git a/src/Platform/Unix/Thread.cpp b/src/Platform/Unix/Thread.cpp
index 5d7fe2ea..2d9fae09 100644
--- a/src/Platform/Unix/Thread.cpp
+++ b/src/Platform/Unix/Thread.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
diff --git a/src/Platform/Unix/Time.cpp b/src/Platform/Unix/Time.cpp
index f30058e4..e98cea69 100644
--- a/src/Platform/Unix/Time.cpp
+++ b/src/Platform/Unix/Time.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
author	Mounir IDRASSI <mounir.idrassi@idrix.fr>	2016-05-10 22:34:27 +0200
committer	Mounir IDRASSI <mounir.idrassi@idrix.fr>	2016-05-10 22:34:27 +0200
commit	268ef2d8e904db5068dbdc0fdc7ce3940d6452ea (patch)
tree	b1afa687c97fbf5e1ba2c92c5a10479ae5f832f5 /src/Platform/Unix
parent	6d61f06a5348aebe7dbc0bf44d3e2729c20f7fd0 (diff)
parent	5f47d8b6f11cdb3c4c2f43e04e5acfc6ffcb3035 (diff)
download	VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.tar.gz VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.zip