mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2026-05-18 02:21:33 +00:00
Normalize all line terminators
This commit is contained in:
@@ -8,34 +8,34 @@
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user