diff options
author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:31:23 +0200 |
---|---|---|
committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:31:23 +0200 |
commit | 851b6f99c1248c8ec8e33322a3179c1d82fdd515 (patch) | |
tree | 5b9abf4c4e648ea48ed4873e3c4bf1b225c64daf /zen/read_txt.cpp | |
parent | 6.1 (diff) | |
download | FreeFileSync-851b6f99c1248c8ec8e33322a3179c1d82fdd515.tar.gz FreeFileSync-851b6f99c1248c8ec8e33322a3179c1d82fdd515.tar.bz2 FreeFileSync-851b6f99c1248c8ec8e33322a3179c1d82fdd515.zip |
6.2
Diffstat (limited to 'zen/read_txt.cpp')
-rw-r--r-- | zen/read_txt.cpp | 99 |
1 files changed, 0 insertions, 99 deletions
diff --git a/zen/read_txt.cpp b/zen/read_txt.cpp deleted file mode 100644 index 23649846..00000000 --- a/zen/read_txt.cpp +++ /dev/null @@ -1,99 +0,0 @@ -// ************************************************************************** -// * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * -// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * -// ************************************************************************** - -#include "read_txt.h" - -using namespace zen; - - -namespace -{ -warn_static("superfluous method") -std::string detectLineBreak(const Zstring& filename) //throw FileError -{ - //read a (hopefully) significant portion of data - zen::FileInput input(filename); - - std::vector<char> buffer(64 * 1024); - size_t bytesRead = input.read(&buffer[0], buffer.size()); //throw FileError - buffer.resize(bytesRead); - - //detect line break - std::string linebreakChars = "\r\n"; - std::vector<char>::iterator iter = std::find_first_of(buffer.begin(), buffer.end(), - linebreakChars.begin(), linebreakChars.end()); - if (iter != buffer.end()) - { - if (*iter == '\r') - { - ++iter; - if (iter != buffer.end()) - { - - if (*iter == '\n') - return "\r\n"; //Windows - else - return "\r"; //Mac - } - } - else if (*iter == '\n') - return "\n"; //Linux - } - //fallback - return "\n"; -} -} - - -LineExtractor::LineExtractor(const Zstring& filename, const std::string& lineBreak) : //throw FileError - inputStream(filename), bufferLogBegin(buffer.begin()), lineBreak_(lineBreak) -{ - if (lineBreak.empty()) - lineBreak_ = detectLineBreak(filename); //throw FileError -} - - -bool LineExtractor::getLine(std::string& output) //throw FileError -{ - warn_static("don't use lineBreak, but support any of r, n, rn!!!") - for (;;) - { - //check if full line is in buffer - std::vector<char>::iterator iter = std::search(bufferLogBegin, buffer.end(), lineBreak_.begin(), lineBreak_.end()); - if (iter != buffer.end()) - { - output.assign(bufferLogBegin, iter); - bufferLogBegin = iter + lineBreak_.size(); - return true; - } - - buffer.erase(buffer.begin(), bufferLogBegin); - bufferLogBegin = buffer.begin(); - - //if done: cleanup - if (inputStream.eof()) - { - if (buffer.empty()) - return false; - - output.assign(buffer.begin(), buffer.end()); - buffer.clear(); - return true; - } - - //read next block - const size_t BLOCK_SIZE = 512 * 1024; - buffer.resize(buffer.size() + BLOCK_SIZE); - - size_t bytesRead = inputStream.read(&buffer[0] + buffer.size() - BLOCK_SIZE, BLOCK_SIZE); //throw FileError - assert(bytesRead <= BLOCK_SIZE); //promised by FileInput() - - if (bytesRead < BLOCK_SIZE) - buffer.resize(buffer.size() - (BLOCK_SIZE - bytesRead)); - - bufferLogBegin = buffer.begin(); - } -} |