mirror of
https://github.com/tmux/tmux.git
synced 2024-12-12 17:38:48 +00:00
Sync OpenBSD patchset 245:
Add a TTY_OPENED flag and tidy a little.
This commit is contained in:
parent
5cc971facd
commit
0714e41148
3
tmux.h
3
tmux.h
@ -1,4 +1,4 @@
|
||||
/* $Id: tmux.h,v 1.412 2009-08-14 21:17:54 tcunha Exp $ */
|
||||
/* $Id: tmux.h,v 1.413 2009-08-14 21:20:01 tcunha Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
@ -867,6 +867,7 @@ struct tty {
|
||||
#define TTY_ESCAPE 0x4
|
||||
#define TTY_UTF8 0x8
|
||||
#define TTY_STARTED 0x10
|
||||
#define TTY_OPENED 0x20
|
||||
int flags;
|
||||
|
||||
int term_flags;
|
||||
|
36
tty.c
36
tty.c
@ -1,4 +1,4 @@
|
||||
/* $Id: tty.c,v 1.123 2009-08-14 21:17:54 tcunha Exp $ */
|
||||
/* $Id: tty.c,v 1.124 2009-08-14 21:20:01 tcunha Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
@ -80,8 +80,11 @@ tty_open(struct tty *tty, const char *overrides, char **cause)
|
||||
tty->log_fd = -1;
|
||||
|
||||
tty->term = tty_term_find(tty->termname, tty->fd, overrides, cause);
|
||||
if (tty->term == NULL)
|
||||
goto error;
|
||||
if (tty->term == NULL) {
|
||||
tty_close(tty);
|
||||
return (-1);
|
||||
}
|
||||
tty->flags |= TTY_OPENED;
|
||||
|
||||
tty->in = buffer_create(BUFSIZ);
|
||||
tty->out = buffer_create(BUFSIZ);
|
||||
@ -95,12 +98,6 @@ tty_open(struct tty *tty, const char *overrides, char **cause)
|
||||
tty_fill_acs(tty);
|
||||
|
||||
return (0);
|
||||
|
||||
error:
|
||||
close(tty->fd);
|
||||
tty->fd = -1;
|
||||
|
||||
return (-1);
|
||||
}
|
||||
|
||||
void
|
||||
@ -299,9 +296,6 @@ tty_get_acs(struct tty *tty, u_char ch)
|
||||
void
|
||||
tty_close(struct tty *tty)
|
||||
{
|
||||
if (tty->fd == -1)
|
||||
return;
|
||||
|
||||
if (tty->log_fd != -1) {
|
||||
close(tty->log_fd);
|
||||
tty->log_fd = -1;
|
||||
@ -309,14 +303,20 @@ tty_close(struct tty *tty)
|
||||
|
||||
tty_stop_tty(tty);
|
||||
|
||||
tty_term_free(tty->term);
|
||||
tty_keys_free(tty);
|
||||
if (tty->flags & TTY_OPENED) {
|
||||
tty_term_free(tty->term);
|
||||
tty_keys_free(tty);
|
||||
|
||||
close(tty->fd);
|
||||
tty->fd = -1;
|
||||
buffer_destroy(tty->in);
|
||||
buffer_destroy(tty->out);
|
||||
|
||||
buffer_destroy(tty->in);
|
||||
buffer_destroy(tty->out);
|
||||
tty->flags &= ~TTY_OPENED;
|
||||
}
|
||||
|
||||
if (tty->fd != -1) {
|
||||
close(tty->fd);
|
||||
tty->fd = -1;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
|
Loading…
Reference in New Issue
Block a user