|
Lines 1-5
Link Here
|
| 1 |
--- term.c.orig 2007-12-04 15:42:55.000000000 +0300 |
1 |
--- term.c.orig 2007-12-04 15:42:55.000000000 +0300 |
| 2 |
+++ term.c 2007-12-04 15:43:04.000000000 +0300 |
2 |
+++ term.c 2007-12-04 15:43:04.000000000 +0300 |
|
|
3 |
@@ -30,8 +30,8 @@ |
| 4 |
#include <console.h> |
| 5 |
#endif |
| 6 |
|
| 7 |
-#ifdef HAVE_TERMIO_H |
| 8 |
-#include <termio.h> |
| 9 |
+#if 1 |
| 10 |
+#include <termios.h> |
| 11 |
#else |
| 12 |
#ifdef HAVE_SGTTY_H |
| 13 |
#include <sgtty.h> |
| 14 |
@@ -71,8 +71,8 @@ |
| 15 |
char so_arr[40]; |
| 16 |
char se_arr[40]; |
| 17 |
|
| 18 |
-#ifdef HAVE_TERMIO_H |
| 19 |
-struct termio tty_cooked, tty_cbreak; |
| 20 |
+#if 1 |
| 21 |
+struct termios tty_cooked, tty_cbreak; |
| 22 |
#else |
| 23 |
#ifdef HAVE_SGTTY_H |
| 24 |
struct sgttyb tty_cooked, tty_cbreak; |
| 3 |
@@ -85,7 +85,7 @@ |
25 |
@@ -85,7 +85,7 @@ |
| 4 |
|
26 |
|
| 5 |
char *termcap_ptr; |
27 |
char *termcap_ptr; |
|
Lines 9-11
Link Here
|
| 9 |
*termcap_ptr++ = ch; |
31 |
*termcap_ptr++ = ch; |
| 10 |
return 0; |
32 |
return 0; |
| 11 |
} |
33 |
} |
|
|
34 |
@@ -125,8 +125,8 @@ |
| 35 |
#endif /* WIN32 */ |
| 36 |
#else |
| 37 |
if (interactive) { |
| 38 |
-#ifdef HAVE_TERMIO_H |
| 39 |
- ioctl(0,TCGETA,(char *)(&tty_cooked)); |
| 40 |
+#if 1 |
| 41 |
+ tcgetattr(0, &tty_cooked); |
| 42 |
tty_cbreak = tty_cooked; |
| 43 |
tty_cbreak.c_cc[VMIN] = '\01'; |
| 44 |
tty_cbreak.c_cc[VTIME] = '\0'; |
| 45 |
@@ -181,8 +181,8 @@ |
| 46 |
void charmode_on() { |
| 47 |
#ifdef unix |
| 48 |
if ((readstream == stdin) && interactive && !tty_charmode) { |
| 49 |
-#ifdef HAVE_TERMIO_H |
| 50 |
- ioctl(0,TCSETA,(char *)(&tty_cbreak)); |
| 51 |
+#if 1 |
| 52 |
+ tcsetattr(0, TCSANOW, &tty_cbreak); |
| 53 |
#else /* !HAVE_TERMIO_H */ |
| 54 |
ioctl(0,TIOCSETP,(char *)(&tty_cbreak)); |
| 55 |
#endif /* HAVE_TERMIO_H */ |
| 56 |
@@ -197,8 +197,8 @@ |
| 57 |
void charmode_off() { |
| 58 |
#ifdef unix |
| 59 |
if (tty_charmode) { |
| 60 |
-#ifdef HAVE_TERMIO_H |
| 61 |
- ioctl(0,TCSETA,(char *)(&tty_cooked)); |
| 62 |
+#if 1 |
| 63 |
+ tcsetattr(0, TCSANOW, &tty_cooked); |
| 64 |
#else /* !HAVE_TERMIO_H */ |
| 65 |
ioctl(0,TIOCSETP,(char *)(&tty_cooked)); |
| 66 |
#endif /* HAVE_TERMIO_H */ |