Fix uip/whom.c for C89 compatibility

[mmh] / uip / termsbr.c

diff --git a/uip/termsbr.c b/uip/termsbr.c
index defc93f..fbf5f16 100644 (file)
--- a/uip/termsbr.c
+++ b/uip/termsbr.c
@@ -8,15 +8,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>
@@ -41,49 +33,23 @@
 # define TXTSIZ BUFSIZ
 #endif
 
-/*
-** These variables are sometimes defined in,
-** and needed by the termcap library.
-*/
-#ifdef HAVE_OSPEED
-# ifdef MUST_DEFINE_OSPEED
-extern short ospeed;
-extern char PC;
-# endif
-#else
-short ospeed;
-char PC;
-#endif
-
 static long speedcode;
 
 static int initCO = 0;
 
 static int CO = 80;      /* number of colums */
 
-static char termcap[TXTSIZ];
-
 
 static void
 read_termcap(void)
 {
-       char *bp, *cp;
        char *term;
 
 #ifndef TGETENT_ACCEPTS_NULL
        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++)
@@ -103,24 +69,10 @@ 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
 
        if (!initCO && (CO = tgetnum("co")) <= 0)
                CO = 80;
-
-       cp = termcap;
-       if ((bp = tgetstr("pc", &cp)))
-               PC = *bp;
 }