From 646bfe403e638f2a005ddfba37da0f94805d7e11 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 27 Apr 2020 09:36:30 +0100 Subject: [PATCH] Do not close stdout file descriptor in control mode since it will be needed for printing the exit messages. --- client.c | 5 +++-- configure.ac | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client.c b/client.c index 91e084a5..f247d059 100644 --- a/client.c +++ b/client.c @@ -523,7 +523,7 @@ client_write_open(void *data, size_t datalen) errno = EBADF; else { cf->fd = dup(msg->fd); - if (client_flags & CLIENT_CONTROL) + if (~client_flags & CLIENT_CONTROL) close(msg->fd); /* can only be used once */ } } @@ -678,7 +678,8 @@ client_read_open(void *data, size_t datalen) errno = EBADF; else { cf->fd = dup(msg->fd); - close(msg->fd); /* can only be used once */ + if (~client_flags & CLIENT_CONTROL) + close(msg->fd); /* can only be used once */ } } if (cf->fd == -1) { diff --git a/configure.ac b/configure.ac index 25d3881c..6a9ba594 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # configure.ac -AC_INIT([tmux], 3.1) +AC_INIT([tmux], 3.1a) AC_PREREQ([2.60]) AC_CONFIG_AUX_DIR(etc)