--- gforth/engine/io.c	2002/12/24 23:40:30	1.15
+++ gforth/engine/io.c	2008/11/01 22:19:30	1.34
@@ -1,12 +1,12 @@
 /* direct key io driver
 
-  Copyright (C) 1995,1996,1997,1998,1999 Free Software Foundation, Inc.
+  Copyright (C) 1995,1996,1997,1998,1999,2002,2003,2006,2007,2008 Free Software Foundation, Inc.
 
   This file is part of Gforth.
 
   Gforth is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License
-  as published by the Free Software Foundation; either version 2
+  as published by the Free Software Foundation, either version 3
   of the License, or (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+  along with this program; if not, see http://www.gnu.org/licenses/.
 
   The following is stolen from the readline library for bash
 */
@@ -447,6 +446,8 @@ void deprep_terminal ()
 #define VTIME VEOL
 #endif
 
+#include <locale.h>
+
 void prep_terminal ()
 {
   int tty = fileno (stdin);
@@ -472,6 +473,9 @@ void prep_terminal ()
     return;      /* added by MdG */
   }      /* added by MdG */
    
+  setlocale(LC_ALL, "");
+  setlocale(LC_NUMERIC, "C");
+
   /* Try to keep this function from being INTerrupted.  We can do it
      on POSIX and systems with BSD-like signal handling. */
 #if defined (HAVE_POSIX_SIGNALS)
@@ -613,50 +617,19 @@ void deprep_terminal ()
 }
 #endif  /* NEW_TTY_DRIVER */
 
-/* If a character is available to be read, then read it
-   and stuff it into IBUFFER.  Otherwise, just return. */
-
-long pending = -1L;
-
 long key_avail (FILE * stream)
 {
   int tty = fileno (stream);
-  int chars_avail = pending;
-  int result;
-
-  if(!terminal_prepped)  prep_terminal();
+  fd_set selin;
+  static struct timeval now = { 0 , 0 };
 
-#if defined(FIONREAD) && !defined(_WIN32)
-  if(isatty (tty)) {
-    result = ioctl (tty, FIONREAD, &chars_avail);
-  }
-#else
-  {
-    fd_set selin;
-    static int now[2] = { 0 , 0 };
-    int res;
-    
-    FD_ZERO(&selin);
-    FD_SET(tty, &selin);
-    chars_avail=select(1, &selin, NULL, NULL, now);
-  }
-#endif
-  
-  if(chars_avail == -1L) {
-    unsigned char inchar;
-    
-    fcntl(tty, F_SETFL, O_NDELAY);
-    result = read(tty, &inchar, sizeof(char));
-    if(result == sizeof(char)) {
-      chars_avail = 1;
-      pending = (long)inchar;
-    } else {
-      chars_avail = 0;
-    }
-    fcntl(tty, F_SETFL, 0);
-  }
+  setvbuf(stream, NULL, _IONBF, 0);
+  if(!terminal_prepped && stream == stdin)
+    prep_terminal();
 
-  return chars_avail;
+  FD_ZERO(&selin);
+  FD_SET(tty, &selin);
+  return select(1, &selin, NULL, NULL, &now);
 }
 
 /* Get a key from the buffer of characters to be read.
@@ -671,35 +644,25 @@ Cell getkey(FILE * stream)
   Cell result;
   unsigned char c;
 
-  if(!terminal_prepped)
+  setvbuf(stream, NULL, _IONBF, 0);
+  if(!terminal_prepped && stream == stdin)
     prep_terminal();
 
-  while (pending < 0)
-    {
-      result = read (fileno (stream), &c, sizeof (char));
-
-      if (result == sizeof (char))
-        return /* (c == 0x7F ? 0x08 :*/ c /*)*/;
-
-      /* If zero characters are returned, then the file that we are
-	 reading from is empty!  Return EOF in that case. */
-      if (result == 0)
-	return (EOF);
-
-      /* If the error that we received was SIGINT, then try again,
-	 this is simply an interrupted system call to read ().
-	 Otherwise, some error ocurred, also signifying EOF. */
-      if (errno != EINTR)
-	return (EOF);
-    }
+  result = fread(&c, sizeof(c), 1, stream);
+  return result==0 ? (errno == EINTR ? 12 : 4) : c;
+}
 
-  /* otherwise there is a character pending;
-     return it and delete pending char */
-  result = (Cell) pending;
-  pending = -1L;
+#ifdef STANDALONE
+void emit_char(char x)
+{
+  putc(x, stdout);
+}
 
-  return result;
+void type_chars(char *addr, unsigned int l)
+{
+  fwrite(addr, l, 1, stdout);
 }
+#endif
 
 #ifdef TEST