circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-01 20:57:00 +00:00
Code Issues Projects Releases Wiki Activity

Now the tty has a pointer back to the client there is no point (and a

Browse Source 
bit confusing) in it keeping a copy of the fd as well. Remove it.
This commit is contained in:
nicm
2020-05-24 09:13:06 +00:00
parent 033d6472cb
commit 6c82982711
4 changed files with 40 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd-new-session.c
View File

@ -165,13 +165,13 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
* the terminal as that calls tcsetattr() to prepare for tmux taking
* over.
*/
if (!detached && !already_attached && c->tty.fd != -1) {
if (!detached && !already_attached && c->fd != -1) {
if (server_client_check_nested(cmdq_get_client(item))) {
cmdq_error(item, "sessions should be nested with care, "
"unset $TMUX to force");
goto fail;
}
if (tcgetattr(c->tty.fd, &tio) != 0)
if (tcgetattr(c->fd, &tio) != 0)
fatal("tcgetattr failed");
tiop = &tio;
} else