mirror of
				https://github.com/tmux/tmux.git
				synced 2025-10-26 12:27:15 +00:00 
			
		
		
		
	Sync OpenBSD patchset 595:
Use tcflush(3) instead of TIOCFLUSH, from Ed Schouten.
This commit is contained in:
		
							
								
								
									
										12
									
								
								tty.c
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								tty.c
									
									
									
									
									
								
							| @@ -1,4 +1,4 @@ | |||||||
| /* $Id: tty.c,v 1.185 2009-12-26 23:50:15 tcunha Exp $ */ | /* $Id: tty.c,v 1.186 2010-01-05 23:49:24 tcunha Exp $ */ | ||||||
|  |  | ||||||
| /* | /* | ||||||
|  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> |  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> | ||||||
| @@ -147,9 +147,6 @@ tty_start_tty(struct tty *tty) | |||||||
| { | { | ||||||
| 	struct termios	 tio; | 	struct termios	 tio; | ||||||
| 	int		 mode; | 	int		 mode; | ||||||
| #ifdef TIOCFLUSH |  | ||||||
| 	int		 what; |  | ||||||
| #endif |  | ||||||
|  |  | ||||||
| 	if (tty->fd == -1) | 	if (tty->fd == -1) | ||||||
| 		return; | 		return; | ||||||
| @@ -173,12 +170,7 @@ tty_start_tty(struct tty *tty) | |||||||
| 	tio.c_cc[VTIME] = 0; | 	tio.c_cc[VTIME] = 0; | ||||||
| 	if (tcsetattr(tty->fd, TCSANOW, &tio) != 0) | 	if (tcsetattr(tty->fd, TCSANOW, &tio) != 0) | ||||||
| 		fatal("tcsetattr failed"); | 		fatal("tcsetattr failed"); | ||||||
|  | 	tcflush(tty->fd, TCIOFLUSH); | ||||||
| #ifdef TIOCFLUSH |  | ||||||
| 	what = 0; |  | ||||||
| 	if (ioctl(tty->fd, TIOCFLUSH, &what) != 0) |  | ||||||
| 		fatal("ioctl(TIOCFLUSH)"); |  | ||||||
| #endif |  | ||||||
|  |  | ||||||
| 	tty_putcode(tty, TTYC_SMCUP); | 	tty_putcode(tty, TTYC_SMCUP); | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Tiago Cunha
					Tiago Cunha