audacity/linuxdeploy
1
0
Fork 0
mirror of https://github.com/audacity/linuxdeploy.git synced 2026-04-19 09:45:16 -05:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #146 from linuxdeploy/fix-145

Browse Source 
Read subprocesses' pipes until they're empty
This commit is contained in:
TheAssassin
2020-09-22 13:46:31 +02:00
committed by GitHub
parent 8ee0e43c23 407ecc408d
commit e4fff0a5b7
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/subprocess/subprocess.cpp
View File

@@ -45,13 +45,19 @@ namespace linuxdeploy {
// the results are immediately appended to the main buffer
subprocess_result_buffer_t intermediate_buffer(4096);
// (try to) read from pipe
const auto bytes_read = reader.read(intermediate_buffer);
// (try to) read all available data from pipe
for (;;) {
const auto bytes_read = reader.read(intermediate_buffer);
// append to main buffer
buffer.reserve(buffer.size() + bytes_read);
std::copy(intermediate_buffer.begin(), (intermediate_buffer.begin() + bytes_read),
std::back_inserter(buffer));
if (bytes_read == 0) {
break;
}
// append to main buffer
buffer.reserve(buffer.size() + bytes_read);
std::copy(intermediate_buffer.begin(), (intermediate_buffer.begin() + bytes_read),
std::back_inserter(buffer));
}
}
// do-while might be a little more elegant, but we can save this one unnecessary sleep, so...