diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-05-31 13:00:11 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-05-31 13:00:11 +0100 |
| commit | 2ee9c4df12429d4f6fb8f06a373fdd5c0347049c (patch) | |
| tree | 1c241b4bcd2e637cbae11d7fb6b34840d9839ec7 /client.c | |
| parent | e6c77e7afbcee07ed6237f2a0f30e70f45ecf0ba (diff) | |
| parent | 76cb088d16fd5aa47b54428368ef403cbbcf4f5a (diff) | |
| download | rtmux-2ee9c4df12429d4f6fb8f06a373fdd5c0347049c.tar.gz rtmux-2ee9c4df12429d4f6fb8f06a373fdd5c0347049c.tar.bz2 rtmux-2ee9c4df12429d4f6fb8f06a373fdd5c0347049c.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); |