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

Merge pull request #76 from slsdetectorgroup/exec

Browse Source 
Buffern in exec
This commit is contained in:
Dhanya Thattil 2020-02-04 10:59:48 +01:00 committed by GitHub
commit 94fcf52e64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;