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

added string_utils and strcpy_safe

Browse Source
This commit is contained in:
Erik Frojdh
2018-12-19 15:44:21 +01:00
parent 89d9204e1c
commit 1ca8bf204a
7 changed files with 74 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/CMakeLists.txt
View File

@ -6,6 +6,7 @@ set(SOURCES
slsDetector/slsDetector.cpp
../slsSupportLib/include/ClientInterface.cpp
../slsSupportLib/include/utilities.cpp
../slsSupportLib/src/string_utils.cpp
)
set(HEADERS
@ -46,6 +47,7 @@ set(PUBLICHEADERS
${PROJECT_SOURCE_DIR}/slsSupportLib/include/sls_detector_exceptions.h
${PROJECT_SOURCE_DIR}/slsSupportLib/include/utilities.h
${PROJECT_SOURCE_DIR}/slsSupportLib/include/container_utils.h
${PROJECT_SOURCE_DIR}/slsSupportLib/include/string_utils.h
sharedMemory/SharedMemory.h
slsDetector/slsDetector.h
slsDetector/slsDetectorUsers.h

18
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -9,11 +9,13 @@
#include "sls_detector_exceptions.h"
#include "utilities.h"
#include "string_utils.h"
#include <iomanip>
#include <iostream>
#include <rapidjson/document.h> //json header in zmq stream
#include <sstream>
#include <string.h>
#include <cstring>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/types.h>
@ -391,15 +393,11 @@ void multiSlsDetector::updateUserdetails() {
memset(thisMultiDetector->lastUser, 0, SHORT_STRING_LENGTH);
memset(thisMultiDetector->lastDate, 0, SHORT_STRING_LENGTH);
try {
strncpy(thisMultiDetector->lastUser, exec("whoami").c_str(),
SHORT_STRING_LENGTH - 1);
thisMultiDetector->lastUser[SHORT_STRING_LENGTH - 1] = 0;
strncpy(thisMultiDetector->lastDate, exec("date").c_str(),
DATE_LENGTH - 1);
thisMultiDetector->lastDate[DATE_LENGTH - 1] = 0;
sls::strcpy_safe(thisMultiDetector->lastUser, exec("whoami").c_str());
sls::strcpy_safe(thisMultiDetector->lastDate, exec("date").c_str());
} catch (...) {
strcpy(thisMultiDetector->lastUser, "errorreading");
strcpy(thisMultiDetector->lastDate, "errorreading");
sls::strcpy_safe(thisMultiDetector->lastUser, "errorreading");
sls::strcpy_safe(thisMultiDetector->lastDate, "errorreading");
}
}
@ -3116,7 +3114,7 @@ int multiSlsDetector::setCTBPattern(std::string fname, int detPos) {
int addr = 0;
FILE *fd = fopen(fname.c_str(), "r");
if (fd <= 0) {
if (fd == nullptr) {
FILE_LOG(logERROR) << "Could not open file";
setErrorMask(getErrorMask() | MULTI_OTHER_ERROR);
return -1;