diff options
| 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/FileCommon.cpp | |
| parent | 6d61f06a5348aebe7dbc0bf44d3e2729c20f7fd0 (diff) | |
| parent | 5f47d8b6f11cdb3c4c2f43e04e5acfc6ffcb3035 (diff) | |
| download | VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.tar.gz VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.zip | |
Merge pull request #61 from davidfoerster/normalize-line-terminators
Normalize line terminators
Diffstat (limited to 'src/Platform/FileCommon.cpp')
| -rw-r--r-- | src/Platform/FileCommon.cpp | 164 |
1 files changed, 82 insertions, 82 deletions
diff --git a/src/Platform/FileCommon.cpp b/src/Platform/FileCommon.cpp index e9b77540..a5331266 100644 --- a/src/Platform/FileCommon.cpp +++ b/src/Platform/FileCommon.cpp @@ -3,89 +3,89 @@ 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 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); + } +} |