VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Platform/TextReader.cpp
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2016-05-10 22:34:27 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2016-05-10 22:34:27 +0200
commit268ef2d8e904db5068dbdc0fdc7ce3940d6452ea (patch)
treeb1afa687c97fbf5e1ba2c92c5a10479ae5f832f5 /src/Platform/TextReader.cpp
parent6d61f06a5348aebe7dbc0bf44d3e2729c20f7fd0 (diff)
parent5f47d8b6f11cdb3c4c2f43e04e5acfc6ffcb3035 (diff)
downloadVeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.tar.gz
VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.zip
Merge pull request #61 from davidfoerster/normalize-line-terminators
Normalize line terminators
Diffstat (limited to 'src/Platform/TextReader.cpp')
-rw-r--r--src/Platform/TextReader.cpp64
1 files changed, 32 insertions, 32 deletions
diff --git a/src/Platform/TextReader.cpp b/src/Platform/TextReader.cpp
index 91f9ed09..1f4003e5 100644
--- a/src/Platform/TextReader.cpp
+++ b/src/Platform/TextReader.cpp
@@ -3,39 +3,39 @@
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 "TextReader.h"
-
-namespace VeraCrypt
-{
- TextReader::TextReader (const FilePath &path)
- {
- InputFile.reset (new File);
- InputFile->Open (path);
- InputStream = shared_ptr <Stream> (new FileStream (InputFile));
- }
-
- bool TextReader::ReadLine (string &outputString)
- {
- outputString.erase();
-
- char c;
- while (InputStream->Read (BufferPtr ((byte *) &c, sizeof (c))) == sizeof (c))
- {
- if (c == '\r')
- continue;
-
- if (c == '\n')
- return true;
-
- outputString += c;
- }
- return !outputString.empty();
- }
-}
+*/
+
+#include "TextReader.h"
+
+namespace VeraCrypt
+{
+ TextReader::TextReader (const FilePath &path)
+ {
+ InputFile.reset (new File);
+ InputFile->Open (path);
+ InputStream = shared_ptr <Stream> (new FileStream (InputFile));
+ }
+
+ bool TextReader::ReadLine (string &outputString)
+ {
+ outputString.erase();
+
+ char c;
+ while (InputStream->Read (BufferPtr ((byte *) &c, sizeof (c))) == sizeof (c))
+ {
+ if (c == '\r')
+ continue;
+
+ if (c == '\n')
+ return true;
+
+ outputString += c;
+ }
+ return !outputString.empty();
+ }
+}