detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-06 18:10:40 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
maliakal_d 2020-02-04 12:00:15 +01:00
commit c4559fadb3
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -206,23 +206,19 @@ bool DetectorImpl::isAcquireReady() {
} }
std::string DetectorImpl::exec(const char *cmd) { std::string DetectorImpl::exec(const char *cmd) {
int bufsize = 128; char buffer[128];
char buffer[bufsize]; std::string result;
std::string result = "";
FILE *pipe = popen(cmd, "r"); FILE *pipe = popen(cmd, "r");
if (pipe == nullptr) { if (pipe == nullptr) {
throw RuntimeError("Could not open pipe"); throw RuntimeError("Could not open pipe");
} }
try {
while (feof(pipe) == 0) { while (feof(pipe) == 0) {
if (fgets(buffer, bufsize, pipe) != nullptr) { if (fgets(buffer, sizeof(buffer), pipe) != nullptr) {
result += buffer; result += buffer;
}
} }
} catch (...) {
pclose(pipe);
throw;
} }
pclose(pipe); pclose(pipe);
result.erase(result.find_last_not_of(" \t\n\r") + 1); result.erase(result.find_last_not_of(" \t\n\r") + 1);
return result; return result;