From: Lyndon Nerenberg <lyndon@orthanc.ca>
Date: Sun, 25 Dec 2011 00:15:22 +0000 (-0800)
Subject: Collapse termio/termios/sgtty terminal interface code down to
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=ed759f583c7c5b2487ee5317d3ad4bc791a1d249;p=mmh

Collapse termio/termios/sgtty terminal interface code down to
the Posix termios interface.
---

diff --git a/sbr/discard.c b/sbr/discard.c
index dbc865c..dbe309d 100644
--- a/sbr/discard.c
+++ b/sbr/discard.c
@@ -9,15 +9,7 @@
 
 #include <h/mh.h>
 
-#ifdef HAVE_TERMIOS_H
-# include <termios.h>
-#else
-# ifdef HAVE_TERMIO_H
-#  include <termio.h>
-# else
-#  include <sgtty.h>
-# endif
-#endif
+#include <termios.h>
 
 #ifdef SCO_5_STDIO
 # define _ptr  __ptr
@@ -30,28 +22,10 @@
 void
 discard (FILE *io)
 {
-#ifndef HAVE_TERMIOS_H
-# ifdef HAVE_TERMIO_H
-    struct termio tio;
-# else
-    struct sgttyb tio;
-# endif
-#endif
-
     if (io == NULL)
 	return;
 
-#ifdef HAVE_TERMIOS_H
     tcflush (fileno(io), TCOFLUSH);
-#else
-# ifdef HAVE_TERMIO_H
-    if (ioctl (fileno(io), TCGETA, &tio) != -1)
-	ioctl (fileno(io), TCSETA, &tio);
-# else
-    if (ioctl (fileno(io), TIOCGETP, (char *) &tio) != -1)
-	ioctl (fileno(io), TIOCSETP, (char *) &tio);
-# endif
-#endif
 
 #if defined(_FSTDIO) || defined(__DragonFly__)
     fpurge (io);
diff --git a/uip/msh.c b/uip/msh.c
index c2d4e1a..9e56ddd 100644
--- a/uip/msh.c
+++ b/uip/msh.c
@@ -22,15 +22,7 @@
 #include <h/mts.h>
 #include <h/utils.h>
 
-#ifdef HAVE_TERMIOS_H
-# include <termios.h>
-#else
-# ifdef HAVE_TERMIO_H
-#  include <termio.h>
-# else
-#  include <sgtty.h>
-# endif
-#endif
+#include <termios.h>
 
 #include <pwd.h>
 #include <setjmp.h>
diff --git a/uip/prompter.c b/uip/prompter.c
index 7c28aec..459fa97 100644
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -14,15 +14,7 @@
 #include <signal.h>
 #include <setjmp.h>
 
-#ifdef HAVE_TERMIOS_H
-# include <termios.h>
-#else
-# ifdef HAVE_TERMIO_H
-#  include <termio.h>
-# else
-#  include <sgtty.h>
-# endif
-#endif
+#include <termios.h>
 
 #define	QUOTE '\\'
 
@@ -63,25 +55,10 @@ static struct swit switches[] = {
 };
 
 
-#ifdef HAVE_TERMIOS_H
 static struct termios tio;
-# define ERASE tio.c_cc[VERASE]
-# define KILL  tio.c_cc[VKILL]
-# define INTR  tio.c_cc[VINTR]
-#else
-# ifdef HAVE_TERMIO_H
-static struct termio tio;
-#  define ERASE tio.c_cc[VERASE]
-#  define KILL  tio.c_cc[VKILL]
-#  define INTR  tio.c_cc[VINTR]
-# else
-static struct sgttyb tio;
-static struct tchars tc;
-#  define ERASE tio.sg_erase
-#  define KILL  tio.sg_kill
-#  define INTR  tc.t_intrc
-# endif
-#endif
+#define ERASE tio.c_cc[VERASE]
+#define KILL  tio.c_cc[VKILL]
+#define INTR  tio.c_cc[VINTR]
 
 static int wtuser = 0;
 static int sigint = 0;
@@ -193,23 +170,10 @@ main (int argc, char **argv)
      * Are we changing the kill or erase character?
      */
     if (killp || erasep) {
-#ifdef HAVE_TERMIOS_H
 	cc_t save_erase, save_kill;
-#else
-	int save_erase, save_kill;
-#endif
 
 	/* get the current terminal attributes */
-#ifdef HAVE_TERMIOS_H
 	tcgetattr(0, &tio);
-#else
-# ifdef HAVE_TERMIO_H
-	ioctl(0, TCGETA, &tio);
-# else
-	ioctl (0, TIOCGETP, (char *) &tio);
-	ioctl (0, TIOCGETC, (char *) &tc);
-# endif
-#endif
 
 	/* save original kill, erase character for later */
 	save_kill = KILL;
@@ -220,15 +184,7 @@ main (int argc, char **argv)
 	ERASE = erasep ? chrcnv (erasep) : save_erase;
 
 	/* set the new terminal attributes */
-#ifdef HAVE_TERMIOS_H
 	 tcsetattr(0, TCSADRAIN, &tio);
-#else
-# ifdef HAVE_TERMIO_H
-	ioctl(0, TCSETAW, &tio);
-# else
-	ioctl (0, TIOCSETN, (char *) &tio);
-# endif
-#endif
 
 	/* print out new kill erase characters */
 	chrdsp ("erase", ERASE);
@@ -283,15 +239,7 @@ main (int argc, char **argv)
 		    if (i == -1) {
 abort:
 			if (killp || erasep) {
-#ifdef HAVE_TERMIOS_H
 			    tcsetattr(0, TCSADRAIN, &tio);
-#else
-# ifdef HAVE_TERMIO
-			    ioctl (0, TCSETA, &tio);
-# else
-			    ioctl (0, TIOCSETN, (char *) &tio);
-# endif
-#endif
 			}
 			unlink (tmpfil);
 			done (1);
@@ -378,15 +326,7 @@ no_body:
     SIGNAL (SIGINT, SIG_IGN);
 
     if (killp || erasep) {
-#ifdef HAVE_TERMIOS_H
 	 tcsetattr(0, TCSADRAIN, &tio);
-#else
-# ifdef HAVE_TERMIO_H
-	ioctl (0, TCSETAW, &tio);
-# else
-	ioctl (0, TIOCSETN, (char *) &tio);
-# endif
-#endif
     }
 
     if ((fdi = open (tmpfil, O_RDONLY)) == NOTOK)
diff --git a/uip/termsbr.c b/uip/termsbr.c
index 740d021..92f7a0e 100644
--- a/uip/termsbr.c
+++ b/uip/termsbr.c
@@ -9,15 +9,7 @@
 
 #include <h/mh.h>
 
-#ifdef HAVE_TERMIOS_H
-# include <termios.h>
-#else
-# ifdef HAVE_TERMIO_H
-#  include <termio.h>
-# else
-#  include <sgtty.h>
-# endif
-#endif
+#include <termios.h>
 
 #ifdef HAVE_TERMCAP_H
 # include <termcap.h>
@@ -81,16 +73,7 @@ read_termcap(void)
     char termbuf[TXTSIZ];
 #endif
 
-#ifdef HAVE_TERMIOS_H
     struct termios tio;
-#else
-# ifdef HAVE_TERMIO_H
-    struct termio tio;
-# else
-    struct sgttyb tio;
-# endif
-#endif
-
     static int inited = 0;
 
     if (inited++)
@@ -110,15 +93,7 @@ read_termcap(void)
 	return;
 #endif
 
-#ifdef HAVE_TERMIOS_H
     speedcode = cfgetospeed(&tio);
-#else
-# ifdef HAVE_TERMIO_H
-    speedcode = ioctl(fileno(stdout), TCGETA, &tio) != NOTOK ? tio.c_cflag & CBAUD : 0;
-# else
-    speedcode = ioctl(fileno(stdout), TIOCGETP, (char *) &tio) != NOTOK ? tio.sg_ospeed : 0;
-# endif
-#endif
 
     HC = tgetflag ("hc");