nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

exclusively lock serial device to prevent simultaneous access, fix for closing serial device that is no tty

Browse Source
This commit is contained in:
john30
2015-11-22 13:54:18 +01:00
parent b67b2bff07
commit 427d6a7dca
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/device.cpp
+11 -1
View File
@@ -28,6 +28,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <fstream> #include <fstream>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/file.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_PPOLL #ifdef HAVE_PPOLL
@@ -214,8 +215,17 @@ result_t SerialDevice::open()
// open file descriptor // open file descriptor
m_fd = ::open(m_name, O_RDWR | O_NOCTTY); m_fd = ::open(m_name, O_RDWR | O_NOCTTY);
if (m_fd < 0 || isatty(m_fd) == 0) if (m_fd < 0)
return RESULT_ERR_NOTFOUND; return RESULT_ERR_NOTFOUND;
if (isatty(m_fd) == 0) {
close();
return RESULT_ERR_NOTFOUND;
}
if (flock(m_fd, LOCK_EX|LOCK_NB)) {
close();
return RESULT_ERR_DEVICE;
}
// save current settings // save current settings
tcgetattr(m_fd, &m_oldSettings); tcgetattr(m_fd, &m_oldSettings);