circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2020-10-30 20:01:20 +00:00
parent d064060904 95841ba16a
commit ffe39edf2f
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client.c
View File

@@ -36,6 +36,7 @@
static struct tmuxproc *client_proc; static struct tmuxproc *client_proc;
static struct tmuxpeer *client_peer; static struct tmuxpeer *client_peer;
static uint64_t client_flags; static uint64_t client_flags;
static int client_suspended;
static enum { static enum {
CLIENT_EXIT_NONE, CLIENT_EXIT_NONE,
CLIENT_EXIT_DETACHED, CLIENT_EXIT_DETACHED,
@@ -221,7 +222,7 @@ static void
client_exit(void) client_exit(void)
{ {
struct client_file *cf; struct client_file *cf;
size_t left; size_t left;
int waiting = 0; int waiting = 0;
RB_FOREACH (cf, client_files, &client_files) { RB_FOREACH (cf, client_files, &client_files) {
@@ -765,6 +766,7 @@ client_signal(int sig)
struct sigaction sigact; struct sigaction sigact;
int status; int status;
log_debug("%s: %s", __func__, strsignal(sig));
if (sig == SIGCHLD) if (sig == SIGCHLD)
waitpid(WAIT_ANY, &status, WNOHANG); waitpid(WAIT_ANY, &status, WNOHANG);
else if (!client_attached) { else if (!client_attached) {
@@ -778,7 +780,8 @@ client_signal(int sig)
proc_send(client_peer, MSG_EXITING, -1, NULL, 0); proc_send(client_peer, MSG_EXITING, -1, NULL, 0);
break; break;
case SIGTERM: case SIGTERM:
client_exitreason = CLIENT_EXIT_TERMINATED; if (!client_suspended)
client_exitreason = CLIENT_EXIT_TERMINATED;
client_exitval = 1; client_exitval = 1;
proc_send(client_peer, MSG_EXITING, -1, NULL, 0); proc_send(client_peer, MSG_EXITING, -1, NULL, 0);
break; break;
@@ -793,6 +796,7 @@ client_signal(int sig)
if (sigaction(SIGTSTP, &sigact, NULL) != 0) if (sigaction(SIGTSTP, &sigact, NULL) != 0)
fatal("sigaction failed"); fatal("sigaction failed");
proc_send(client_peer, MSG_WAKEUP, -1, NULL, 0); proc_send(client_peer, MSG_WAKEUP, -1, NULL, 0);
client_suspended = 0;
break; break;
} }
} }
@@ -1005,6 +1009,7 @@ client_dispatch_attached(struct imsg *imsg)
sigact.sa_handler = SIG_DFL; sigact.sa_handler = SIG_DFL;
if (sigaction(SIGTSTP, &sigact, NULL) != 0) if (sigaction(SIGTSTP, &sigact, NULL) != 0)
fatal("sigaction failed"); fatal("sigaction failed");
client_suspended = 1;
kill(getpid(), SIGTSTP); kill(getpid(), SIGTSTP);
break; break;
case MSG_LOCK: case MSG_LOCK:

2
server-client.c
View File

@@ -2023,7 +2023,7 @@ server_client_dispatch(struct imsg *imsg, void *arg)
break; break;
c->flags &= ~CLIENT_SUSPENDED; c->flags &= ~CLIENT_SUSPENDED;
if (c->fd == -1) /* exited in the meantime */ if (c->fd == -1 || c->session == NULL) /* exited already */
break; break;
s = c->session; s = c->session;