yetangitu/recoll
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

solaris locking fix

Browse source
This commit is contained in:
Jean-Francois Dockes 2012-04-28 15:32:38 +02:00
parent 27a4f93a39
commit 630b9400d2
1 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/utils/pathut.cpp
View file

@ -547,11 +547,26 @@ pid_t Pidfile::read_pid()
int Pidfile::flopen() int Pidfile::flopen()
{ {
const char *path = m_path.c_str(); const char *path = m_path.c_str();
int operation = LOCK_EX | LOCK_NB;
if ((m_fd = ::open(path, O_RDWR|O_CREAT, 0644)) == -1) { if ((m_fd = ::open(path, O_RDWR|O_CREAT, 0644)) == -1) {
m_reason = "Open failed"; m_reason = "Open failed";
return -1; return -1;
} }
#ifdef sun
struct flock lockdata;
lockdata.l_start = 0;
lockdata.l_len = 0;
lockdata.l_type = F_WRLCK;
lockdata.l_whence = SEEK_SET;
if (fcntl(m_fd, F_SETLK, &lockdata) != 0) {
int serrno = errno;
(void)::close(m_fd);
errno = serrno;
m_reason = "fcntl lock failed";
return -1;
}
#else
int operation = LOCK_EX | LOCK_NB;
if (flock(m_fd, operation) == -1) { if (flock(m_fd, operation) == -1) {
int serrno = errno; int serrno = errno;
(void)::close(m_fd); (void)::close(m_fd);
@ -559,6 +574,8 @@ int Pidfile::flopen()
m_reason = "flock failed"; m_reason = "flock failed";
return -1; return -1;
} }
#endif // ! sun
if (ftruncate(m_fd, 0) != 0) { if (ftruncate(m_fd, 0) != 0) {
/* can't happen [tm] */ /* can't happen [tm] */
int serrno = errno; int serrno = errno;