diff options
| author |   nicm <nicm@openbsd.org> | 2014-07-21 10:52:48 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2014-07-21 10:52:48 +0000 |
| commit | a5035d44b9049e26924ee086d691aa550696966b (patch) | |
| tree | 2db8e589e0fecf876706ed48eef75b3d84c5d83c /usr.bin/tmux/server.c | |
| parent | Drop explicit support for F13-F20 and change to match the xterm terminfo (diff) | |
| download | wireguard-openbsd-a5035d44b9049e26924ee086d691aa550696966b.tar.xz wireguard-openbsd-a5035d44b9049e26924ee086d691aa550696966b.zip | |
lockf is entirely useless and it was a mistake to change to it, go back
to using flock which actually works sensibly. Also always retry the lock
to fix a potential race, and add some extra logging.
Diffstat (limited to 'usr.bin/tmux/server.c')
| -rw-r--r-- | usr.bin/tmux/server.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/tmux/server.c b/usr.bin/tmux/server.c index f3706aed213..3289dc2196b 100644 --- a/usr.bin/tmux/server.c +++ b/usr.bin/tmux/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.114 2014/05/14 06:21:19 nicm Exp $ */ +/* $OpenBSD: server.c,v 1.115 2014/07/21 10:52:48 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -111,6 +111,7 @@ server_start(int lockfd, char *lockfile) /* The first client is special and gets a socketpair; create it. */ if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pair) != 0) fatal("socketpair failed"); + log_debug("starting server"); switch (fork()) { case -1: |