soenkehahn/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Handle carriage return

Browse source
This commit is contained in:
Eelco Dolstra 2016-04-25 19:18:28 +02:00
parent ca9de88a51
commit cc804d0dc6
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/libstore/build.cc
View file

@ -2935,18 +2935,13 @@ void DerivationGoal::handleChildOutput(int fd, const string & data)
return; return;
} }
for (size_t pos = 0; true; ) { for (auto c : data)
auto newline = data.find('\n', pos); if (c == '\r')
currentLogLine.clear(); // FIXME: not quite right
if (newline == std::string::npos) { else if (c == '\n')
currentLogLine.append(data, pos, std::string::npos);
break;
}
currentLogLine.append(data, pos, newline - pos);
flushLine(); flushLine();
pos = newline + 1; else
} currentLogLine += c;
if (bzLogFile) { if (bzLogFile) {
int err; int err;