- Use termios.h

PR:		110443
Submitted by:	Ed Schouten <ed@fxq.nl>
Approved by:	maintainer
This commit is contained in:
Martin Wilke 2007-04-15 18:55:36 +00:00
parent 0bb715f7be
commit c3b79dee99
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=190017

View file

@ -18,7 +18,7 @@
/* unless you are on VMS define one of these... */ /* unless you are on VMS define one of these... */
#define UNIX #define UNIX
/* #define TURBO_C */ /* #define TURBO_C */
@@ -35,16 +46,16 @@ @@ -35,8 +46,8 @@
/* then if you defined UNIX you must use one of these ways to do non-blocking /* then if you defined UNIX you must use one of these ways to do non-blocking
* tty reads * tty reads
*/ */
@ -29,16 +29,24 @@
/* #define USE_ATTSELECT */ /* #define USE_ATTSELECT */
/* #define USE_BSDSELECT */ /* #define USE_BSDSELECT */
/* and then if you defined UNIX you must also use one of these ways to control @@ -56,7 +67,7 @@
* the tty modes. #ifdef UNIX
*/ #include <signal.h>
-#define USE_TERMIO #ifdef USE_TERMIO
-/* #define USE_SGTTY */ -#include <termio.h>
+/* #define USE_TERMIO */ +#include <termios.h>
+#define USE_SGTTY #endif
#ifdef USE_SGTTY
/* if you defined TURBO_C you might want this too if screen io looks garbled */ #include <sgtty.h>
/* #define USE_ANSISYS */ @@ -73,7 +84,7 @@
static int tloaded;
static int ttysetup;
#ifdef USE_TERMIO
-static struct termio orig_tio;
+static struct termios orig_tio;
#endif
#ifdef USE_SGTTY
static struct sgttyb orig_sgtty;
@@ -199,11 +210,19 @@ @@ -199,11 +210,19 @@
seqa[0] = c; seqa[0] = c;
if (l > 1) { if (l > 1) {
@ -60,3 +68,32 @@
alarm(0); alarm(0);
if (got_alrm) if (got_alrm)
return (c); return (c);
@@ -232,7 +251,7 @@
}
#ifdef USE_TERMIO
- ioctl (0, TCSETA, &orig_tio);
+ tcsetattr(0, TCSANOW, &orig_tio);
#endif
#ifdef USE_SGTTY
ioctl (0, TIOCSETP, &orig_sgtty);
@@ -321,16 +340,16 @@
setuptty()
{
#ifdef USE_TERMIO
- struct termio tio;
+ struct termios tio;
- ioctl (0, TCGETA, &orig_tio);
+ tcgetattr(0, &orig_tio);
tio = orig_tio;
tio.c_iflag &= ~ICRNL; /* leave CR unchanged */
tio.c_oflag &= ~OPOST; /* no output processing */
tio.c_lflag &= ~(ICANON|ECHO); /* no input processing, no echo */
tio.c_cc[VMIN] = 1; /* return after each char */
tio.c_cc[VTIME] = 0; /* no read timeout */
- ioctl (0, TCSETA, &tio);
+ tcsetattr(0, TCSANOW, &tio);
#endif
#ifdef USE_SGTTY
struct sgttyb sg;