|
Lines 1-5
Link Here
|
| 1 |
--- calldbx.c.orig Tue Jun 20 07:11:00 1995 |
1 |
--- calldbx.c.orig Tue Jun 20 07:11:00 1995 |
| 2 |
+++ calldbx.c Fri Nov 17 21:27:09 2000 |
2 |
+++ calldbx.c Fri Nov 17 21:27:09 2000 |
|
|
3 |
@@ -74,8 +74,8 @@ |
| 4 |
#include <string.h> |
| 5 |
#include <fcntl.h> |
| 6 |
#include "global.h" |
| 7 |
-#if !(defined(OLDSUNOS) || defined(BSD)) |
| 8 |
-#include <termio.h> |
| 9 |
+#if !(defined(OLDSUNOS) || defined(BSD)) || defined(__FreeBSD__) |
| 10 |
+#include <termios.h> |
| 11 |
#else |
| 12 |
#include <sgtty.h> |
| 13 |
#endif |
| 3 |
@@ -137,13 +137,17 @@ |
14 |
@@ -137,13 +137,17 @@ |
| 4 |
|
15 |
|
| 5 |
#ifndef sco |
16 |
#ifndef sco |
|
Lines 19-21
Link Here
|
| 19 |
if ((master = open(pty, O_RDWR)) >= 0) |
30 |
if ((master = open(pty, O_RDWR)) >= 0) |
| 20 |
return (master); |
31 |
return (master); |
| 21 |
} |
32 |
} |
|
|
33 |
@@ -246,8 +250,8 @@ |
| 34 |
/* |
| 35 |
* (JBL)10MAY91 : use sgttyb if generic BSD |
| 36 |
*/ |
| 37 |
-#if !(defined(OLDSUNOS) || defined(BSD)) |
| 38 |
- struct termio Termio; |
| 39 |
+#if !(defined(OLDSUNOS) || defined(BSD)) || defined(__FreeBSD__) |
| 40 |
+ struct termios Termio; |
| 41 |
#else |
| 42 |
struct sgttyb Termio; |
| 43 |
#endif |
| 44 |
@@ -355,11 +359,11 @@ |
| 45 |
/* |
| 46 |
* (JBL)10MAY91 : use sgttyb if OLDSUN or generic BSD |
| 47 |
*/ |
| 48 |
-#if !(defined(OLDSUNOS) || defined(BSD)) |
| 49 |
- ioctl(slave, TCGETA, &Termio); |
| 50 |
+#if !(defined(OLDSUNOS) || defined(BSD)) || defined(__FreeBSD__) |
| 51 |
+ tcgetattr(slave, &Termio); |
| 52 |
Termio.c_lflag &= ~ECHO; /* No echo */ |
| 53 |
Termio.c_oflag &= ~ONLCR; /* Do not map NL to CR-NL on output */ |
| 54 |
- ioctl(slave, TCSETA, &Termio); |
| 55 |
+ tcsetattr(slave, TCSANOW, &Termio); |
| 56 |
#else |
| 57 |
ioctl(slave, TIOCGETP, &Termio); |
| 58 |
Termio.sg_flags &= ~ECHO; /* No echo */ |