TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-09 12:28:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(logger): detect and remove \r from log messages

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2024-01-15 15:36:15 +01:00
parent f08dec266b
commit bc72147689
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dwarfs/logger.cpp
View File

@ -162,8 +162,17 @@ void stream_logger::write(level_type level, const std::string& output,
}
}
std::string tmp;
folly::small_vector<std::string_view, 2> lines;
folly::split('\n', output, lines);
if (output.find('\r') != std::string::npos) {
tmp.reserve(output.size());
std::copy_if(output.begin(), output.end(), std::back_inserter(tmp),
[](char c) { return c != '\r'; });
folly::split('\n', tmp, lines);
} else {
folly::split('\n', output, lines);
}
if (lines.back().empty()) {
lines.pop_back();