mirror of
https://github.com/tmux/tmux.git
synced 2025-09-02 13:37:12 +00:00
Drop the no_stop argument to tty_close and tty_free in favour of a flag in the
tty struct.
This commit is contained in:
15
tty.c
15
tty.c
@ -149,6 +149,8 @@ tty_start_tty(struct tty *tty)
|
||||
tty->rupper = UINT_MAX;
|
||||
|
||||
tty->mode = MODE_CURSOR;
|
||||
|
||||
tty->flags |= TTY_STARTED;
|
||||
}
|
||||
|
||||
void
|
||||
@ -156,6 +158,10 @@ tty_stop_tty(struct tty *tty)
|
||||
{
|
||||
struct winsize ws;
|
||||
|
||||
if (!(tty->flags & TTY_STARTED))
|
||||
return;
|
||||
tty->flags &= ~TTY_STARTED;
|
||||
|
||||
/*
|
||||
* Be flexible about error handling and try not kill the server just
|
||||
* because the fd is invalid. Things like ssh -t can easily leave us
|
||||
@ -281,7 +287,7 @@ tty_get_acs(struct tty *tty, u_char ch)
|
||||
}
|
||||
|
||||
void
|
||||
tty_close(struct tty *tty, int no_stop)
|
||||
tty_close(struct tty *tty)
|
||||
{
|
||||
if (tty->fd == -1)
|
||||
return;
|
||||
@ -291,8 +297,7 @@ tty_close(struct tty *tty, int no_stop)
|
||||
tty->log_fd = -1;
|
||||
}
|
||||
|
||||
if (!no_stop)
|
||||
tty_stop_tty(tty);
|
||||
tty_stop_tty(tty);
|
||||
|
||||
tty_term_free(tty->term);
|
||||
tty_keys_free(tty);
|
||||
@ -305,9 +310,9 @@ tty_close(struct tty *tty, int no_stop)
|
||||
}
|
||||
|
||||
void
|
||||
tty_free(struct tty *tty, int no_stop)
|
||||
tty_free(struct tty *tty)
|
||||
{
|
||||
tty_close(tty, no_stop);
|
||||
tty_close(tty);
|
||||
|
||||
if (tty->path != NULL)
|
||||
xfree(tty->path);
|
||||
|
Reference in New Issue
Block a user