diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-04-24 11:00:32 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-04-24 11:00:32 +0100 |
| commit | ce52e45d44b38fcedfe27bce519ce6f4fc76a25d (patch) | |
| tree | 03a44f9facd3deb64ec20b08af7323e803fc7668 /client.c | |
| parent | 4f3c31a6b63f4489bfc672b510036fd8d9491595 (diff) | |
| parent | 70bc8ef8450bfd2ae90df86f4c02437a4bb83319 (diff) | |
| download | rtmux-ce52e45d44b38fcedfe27bce519ce6f4fc76a25d.tar.gz rtmux-ce52e45d44b38fcedfe27bce519ce6f4fc76a25d.tar.bz2 rtmux-ce52e45d44b38fcedfe27bce519ce6f4fc76a25d.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
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); |