From 7a645185e12ffc5e3a20480305cc6928f53b18d5 Mon Sep 17 00:00:00 2001
From: miwi <miwi@FreeBSD.org>
Date: Thu, 10 Jan 2008 11:47:47 +0000
Subject: - Use termios, not sgtty

PR:		119192
Submitted by:	Ed Schouten <ed@fxq.nl>
---
 chinese/celvis/files/patch-curses.c | 67 +++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 chinese/celvis/files/patch-curses.c

(limited to 'chinese/celvis')

diff --git a/chinese/celvis/files/patch-curses.c b/chinese/celvis/files/patch-curses.c
new file mode 100644
index 000000000000..35a4d1e02cf7
--- /dev/null
+++ b/chinese/celvis/files/patch-curses.c
@@ -0,0 +1,67 @@
+The following patch seems to fix celvis on my machine. Just place it in
+the files/ directory.
+
+--- curses.c	1991-09-21 23:42:07.000000000 +0200
++++ curses.c	2007-12-31 15:40:30.000000000 +0100
+@@ -17,8 +17,13 @@
+ #include "config.h"
+ #include "vi.h"
+ 
++#undef BSD
++#undef UNIXV
++#define BSD	0
++#define UNIXV	1
++
+ #if UNIXV
+-# include	<termio.h>
++# include	<termios.h>
+ #endif
+ 
+ #if BSD || UNIX7 || MINIX
+@@ -86,8 +91,8 @@
+ char	ERASEKEY;	/* backspace key taken from ioctl structure */
+ 
+ #if UNIXV
+-static struct termio	oldtermio;	/* original tty mode */
+-static struct termio	newtermio;	/* raw/noecho tty mode */
++static struct termios	oldtermio;	/* original tty mode */
++static struct termios	newtermio;	/* raw/noecho tty mode */
+ #endif
+ 
+ #if BSD || UNIX7 || MINIX
+@@ -133,7 +138,7 @@
+ 
+ 	/* change the terminal mode to raw/noecho */
+ #if UNIXV
+-	ioctl(2, TCGETA, &oldtermio);
++	tcgetattr(2, &oldtermio);
+ #endif
+ 
+ #if BSD || UNIX7 || MINIX
+@@ -170,7 +175,7 @@
+ 
+ 	/* change the terminal mode back the way it was */
+ #if UNIXV
+-	ioctl(2, TCSETAW, &oldtermio);
++	tcsetattr(2, TCSADRAIN, &oldtermio);
+ #endif
+ #if BSD || UNIX7 || MINIX
+ 	ioctl(2, TIOCSETP, &oldsgttyb);
+@@ -190,7 +195,7 @@
+ {	
+ 	/* change the terminal mode to raw/noecho */
+ #if UNIXV
+-	ospeed = (oldtermio.c_cflag & CBAUD);
++	ospeed = cfgetospeed(&oldtermio);
+ 	ERASEKEY = oldtermio.c_cc[VERASE];
+ 	newtermio = oldtermio;
+ 	newtermio.c_iflag &= (IXON|IXOFF|IXANY|ISTRIP|IGNBRK);
+@@ -199,7 +204,7 @@
+ 	newtermio.c_cc[VINTR] = ctrl('C'); /* always use ^C for interrupts */
+ 	newtermio.c_cc[VEOF] = 1;	/* minimum # characters to read */
+ 	newtermio.c_cc[VEOL] = 2;	/* allow at least 0.2 seconds */
+-	ioctl(2, TCSETAW, &newtermio);
++	tcsetattr(2, TCSADRAIN, &newtermio);
+ #endif
+ #if BSD || UNIX7 || MINIX
+ 	struct tchars	tbuf;
-- 
cgit