diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-05-15 16:50:15 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-05-15 16:50:15 +0100 |
| commit | 907ad00300506c25ee84223811e25a411dc21517 (patch) | |
| tree | ec84d431722e22820564b77157df41c11ccc25be /client.c | |
| parent | 5b1cf02f2ea224922661495af32d46b024e28eef (diff) | |
| parent | fce095665c62eb38826f42ae55a0fbe998f18be0 (diff) | |
| download | rtmux-907ad00300506c25ee84223811e25a411dc21517.tar.gz rtmux-907ad00300506c25ee84223811e25a411dc21517.tar.bz2 rtmux-907ad00300506c25ee84223811e25a411dc21517.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Conflicts:
Makefile.am
Diffstat (limited to 'client.c')
| -rw-r--r-- | client.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -78,8 +78,8 @@ client_get_lock(char *lockfile) if ((lockfd = open(lockfile, O_WRONLY|O_CREAT, 0600)) == -1) fatal("open failed"); - if (flock(lockfd, LOCK_EX|LOCK_NB) == -1 && errno == EWOULDBLOCK) { - while (flock(lockfd, LOCK_EX) == -1 && errno == EINTR) + if (lockf(lockfd, F_TLOCK, 0) == -1 && errno == EAGAIN) { + while (lockf(lockfd, F_LOCK, 0) == -1 && errno == EINTR) /* nothing */; close(lockfd); return (-1); |