[BACK]Return to io.c CVS log [TXT] [DIR] Up to [gforth] / gforth / engine

Diff for /gforth/engine/io.c between versions 1.20 and 1.30

version 1.20, 2006/04/09 07:39:07 version 1.30, 2007/07/14 19:57:16
Line 1 Line 1
 /* direct key io driver  /* direct key io driver
   
   Copyright (C) 1995,1996,1997,1998,1999,2002,2003 Free Software Foundation, Inc.    Copyright (C) 1995,1996,1997,1998,1999,2002,2003,2006 Free Software Foundation, Inc.
   
   This file is part of Gforth.    This file is part of Gforth.
   
Line 475  void prep_terminal () Line 475  void prep_terminal ()
   }      /* added by MdG */    }      /* added by MdG */
         
   setlocale(LC_ALL, "");    setlocale(LC_ALL, "");
     setlocale(LC_NUMERIC, "C");
   
   /* Try to keep this function from being INTerrupted.  We can do it    /* Try to keep this function from being INTerrupted.  We can do it
      on POSIX and systems with BSD-like signal handling. */       on POSIX and systems with BSD-like signal handling. */
Line 617  void deprep_terminal () Line 618  void deprep_terminal ()
 }  }
 #endif  /* NEW_TTY_DRIVER */  #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;  
 /* !! This is a bug: if key_avail(file1) is followed by getkey(file2),  
    the getkey(file2) can return the character from file1. - anton */  
   
 /* Moreover, key_avail and getkey bypass the buffering of the FILE *,  
    leading to unpleasant effects if KEY-FILE and KEY?-FILE are mixed  
    with READ-FILE and READ-LINE */  
   
 long key_avail (FILE * stream)  long key_avail (FILE * stream)
 {  {
   int tty = fileno (stream);    int tty = fileno (stream);
   int chars_avail = pending;    fd_set selin;
   int result;    static struct timespec now = { 0 , 0 };
     int res;
   
     setvbuf(stream, NULL, _IONBF, 0);
   if(!terminal_prepped && stream == stdin)    if(!terminal_prepped && stream == stdin)
     prep_terminal();      prep_terminal();
   
 #if defined(FIONREAD) && !defined(_WIN32)    FD_ZERO(&selin);
   /* !! What is the point of this part? it does not affect    FD_SET(tty, &selin);
      chars_avail, and "result" is never used - anton */    return select(1, &selin, NULL, NULL, &now);
   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);  
   }  
   
   return chars_avail;  
 }  }
   
 /* Get a key from the buffer of characters to be read.  /* Get a key from the buffer of characters to be read.
Line 683  Cell getkey(FILE * stream) Line 646  Cell getkey(FILE * stream)
   Cell result;    Cell result;
   unsigned char c;    unsigned char c;
   
   if(!terminal_prepped)    setvbuf(stream, NULL, _IONBF, 0);
     if(!terminal_prepped && stream == stdin)
     prep_terminal();      prep_terminal();
   
   while (pending < 0)    result = fread(&c, sizeof(c), 1, stream);
     {    return result==0 ? (errno == EINTR ? 12 : 4) : c;
       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);  
     }  
   
   /* otherwise there is a character pending;  #ifdef STANDALONE
      return it and delete pending char */  void emit_char(char x)
   result = (Cell) pending;  {
   pending = -1L;    putc(x, stdout);
   }
   
   return result;  void type_chars(char *addr, unsigned int l)
   {
     fwrite(addr, l, 1, stdout);
 }  }
   #endif
   
 #ifdef TEST  #ifdef TEST
   
Removed from v.1.20  
changed lines
  Added in v.1.30

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>