diff options
| author |   nicm <nicm@openbsd.org> | 2015-08-28 12:31:55 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2015-08-28 12:31:55 +0000 |
| commit | b79f03a5d74ab54a4b3349d742a2a07a8ba9c155 (patch) | |
| tree | 3f2fd5137bd6ab95eac512e59d585749b2a80b08 /usr.bin/tmux/server.c | |
| parent | Give clock mode its own timer. (diff) | |
| download | wireguard-openbsd-b79f03a5d74ab54a4b3349d742a2a07a8ba9c155.tar.xz wireguard-openbsd-b79f03a5d74ab54a4b3349d742a2a07a8ba9c155.zip | |
Remove the lock-server option which is a bit redundant, it isn't that
different without it.
Diffstat (limited to 'usr.bin/tmux/server.c')
| -rw-r--r-- | usr.bin/tmux/server.c | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/usr.bin/tmux/server.c b/usr.bin/tmux/server.c index 5056f277e4a..83ff9513135 100644 --- a/usr.bin/tmux/server.c +++ b/usr.bin/tmux/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.132 2015/08/28 12:25:42 nicm Exp $ */ +/* $OpenBSD: server.c,v 1.133 2015/08/28 12:31:55 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -64,7 +64,6 @@ void server_child_signal(void); void server_child_exited(pid_t, int); void server_child_stopped(pid_t, int); void server_second_callback(int, short, void *); -void server_lock_server(void); void server_lock_sessions(void); /* Set marked pane. */ @@ -506,10 +505,7 @@ server_second_callback(unused int fd, unused short events, unused void *arg) { struct timeval tv; - if (options_get_number(&global_s_options, "lock-server")) - server_lock_server(); - else - server_lock_sessions(); + server_lock_sessions(); evtimer_del(&server_ev_second); memset(&tv, 0, sizeof tv); @@ -517,27 +513,6 @@ server_second_callback(unused int fd, unused short events, unused void *arg) evtimer_add(&server_ev_second, &tv); } -/* Lock the server if ALL sessions have hit the time limit. */ -void -server_lock_server(void) -{ - struct session *s; - int timeout; - time_t t; - - t = time(NULL); - RB_FOREACH(s, sessions, &sessions) { - if (s->flags & SESSION_UNATTACHED) - continue; - timeout = options_get_number(&s->options, "lock-after-time"); - if (timeout <= 0 || t <= s->activity_time.tv_sec + timeout) - return; /* not timed out */ - } - - server_lock(); - recalculate_sizes(); -} - /* Lock any sessions which have timed out. */ void server_lock_sessions(void) |