Merge remote-tracking branch 'origin/master'

[mmh] / sbr / discard.c

diff --git a/sbr/discard.c b/sbr/discard.c
index 21fc88f..d3eabd0 100644 (file)
--- a/sbr/discard.c
+++ b/sbr/discard.c
@@ -1,59 +1,25 @@
 /*
- * discard.c -- discard output on a file pointer
- *
- * This code is Copyright (c) 2002, by the authors of nmh.  See the
- * COPYRIGHT file in the root directory of the nmh distribution for
- * complete copyright information.
- */
+** discard.c -- discard output on a file pointer
+**
+** This code is Copyright (c) 2002, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/
 
 #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
-
-#ifdef SCO_5_STDIO
-# define _ptr  __ptr
-# define _cnt  __cnt
-# define _base __base
-# define _filbuf(fp)  ((fp)->__cnt = 0, __filbuf(fp))
-#endif
+#include <termios.h>
 
 
 void
-discard (FILE *io)
+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
+       tcflush(fileno(io), TCOFLUSH);
 
 #if defined(_FSTDIO) || defined(__DragonFly__)
-       fpurge (io);
+       fpurge(io);
 #else
 # ifdef LINUX_STDIO
        io->_IO_write_ptr = io->_IO_write_base;
@@ -63,4 +29,3 @@ discard (FILE *io)
 # endif
 #endif
 }
-