circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 06:17:04 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 834:

Browse Source 
Move all calls to fcntl(...O_NONBLOCK) into a function and clear the
flag on the stdio file descriptors before closing them (fixes things
like "tmux ls && cat").
This commit is contained in:
Tiago Cunha
2011-01-21 23:44:13 +00:00
parent 6b19621112
commit 492e3aa437
9 changed files with 55 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tty.c
View File

@ -1,4 +1,4 @@
/* $Id: tty.c,v 1.199 2011-01-07 14:34:45 tcunha Exp $ */
/* $Id: tty.c,v 1.200 2011-01-21 23:44:13 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -165,15 +165,11 @@ void
tty_start_tty(struct tty *tty)
{
struct termios tio;
int mode;
if (tty->fd == -1)
return;
if ((mode = fcntl(tty->fd, F_GETFL)) == -1)
fatal("fcntl failed");
if (fcntl(tty->fd, F_SETFL, mode|O_NONBLOCK) == -1)
fatal("fcntl failed");
setblocking(tty->fd, 0);
bufferevent_enable(tty->event, EV_READ|EV_WRITE);
@ -220,7 +216,6 @@ void
tty_stop_tty(struct tty *tty)
{
struct winsize ws;
int mode;
if (!(tty->flags & TTY_STARTED))
return;
@ -251,8 +246,7 @@ tty_stop_tty(struct tty *tty)
tty_raw(tty, tty_term_string(tty->term, TTYC_RMCUP));
if ((mode = fcntl(tty->fd, F_GETFL)) != -1)
fcntl(tty->fd, F_SETFL, mode & ~O_NONBLOCK);
setblocking(tty->fd, 1);
}
void