X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2Fcbits%2FinputReady.lc;h=0aadd7d6bad859a0c3f03459000e8b05fa43b4b7;hb=967cc47f37cb93a5e2b6df7822c9a646f0428247;hp=8baa5829716d5c38c3442d66141f7e552401ae58;hpb=a586fca9b8d54f935babca01e1308ac51840f8ae;p=ghc-hetmet.git

diff --git a/ghc/lib/std/cbits/inputReady.lc b/ghc/lib/std/cbits/inputReady.lc
index 8baa582..0aadd7d 100644
--- a/ghc/lib/std/cbits/inputReady.lc
+++ b/ghc/lib/std/cbits/inputReady.lc
@@ -35,48 +35,47 @@
 #include <sys/time.h>
 #endif
 
+/*
+ * inputReady(ptr, msecs) checks to see whether input is available
+ * on the file object 'ptr', timing out after (approx.) 'msec' milliseconds.
+ * Input meaning 'can I safely read at least a *character* from this file
+ * object without blocking?'
+ * 
+ * If the file object has a non-empty buffer, the test is trivial. If not,
+ * we select() on the (readable) file descriptor.
+ *
+ * Notice that for file descriptors connected to ttys in non-canonical mode
+ * (i.e., it's buffered), inputReady will not return true until a *complete
+ * line* can be read.
+ */
+
 StgInt
-inputReady(fp, nsecs)
-StgForeignObj fp;
-StgInt nsecs;
+inputReady(ptr, msecs)
+StgForeignObj ptr;
+StgInt msecs;
 {
-    int flags, c, fd, maxfd, ready;
+    IOFileObject* fo = (IOFileObject*)ptr;
+    int c, fd, maxfd, ready;
     fd_set rfd;
     struct timeval tv;
 
-    if (feof((FILE *) fp))
+    if ( FILEOBJ_IS_EOF(fo) )
 	return 0;
 
-    fd = fileno((FILE *)fp);
-
-    /* Get the original file status flags */
-    while ((flags = fcntl(fd, F_GETFL)) < 0) {
-	/* highly unlikely */
-	if (errno != EINTR) {
-	    cvtErrno();
-	    stdErrno();
-	    return -1;
-	}
+    if ( !FILEOBJ_BUFFER_EMPTY(fo) ) {
+	   /* Don't look any further, there's stuff in the buffer */
+	   return 1;
     }
 
-    /* If it's not already non-blocking, make it so */
-    if (!(flags & O_NONBLOCK)) {
-	while (fcntl(fd, F_SETFL, flags | O_NONBLOCK) < 0) {
-	    /* still highly unlikely */
-	    if (errno != EINTR) {
-		cvtErrno();
-		stdErrno();
-		return -1;
-	    }
-	}
-    }
+    fd = fo->fd;
+
     /* Now try to get a character */
     FD_ZERO(&rfd);
     FD_SET(fd, &rfd);
     /* select() will consider the descriptor set in the range of 0 to (maxfd-1) */
     maxfd = fd + 1;
-    tv.tv_usec = 0;
-    tv.tv_sec  = nsecs;
+    tv.tv_sec  = msecs / 1000;
+    tv.tv_usec = msecs % 1000;
     while ((ready = select(maxfd, &rfd, NULL, NULL, &tv)) < 0 ) {
       if (errno != EINTR ) {
 		cvtErrno();
@@ -85,42 +84,10 @@ StgInt nsecs;
       		break;
       }
    }
-   /*
-    while ((c = getc((FILE *) fp)) == EOF && errno == EINTR)
-	clearerr((FILE *) fp);
-   */
-
-    /* If we made it non-blocking for this, switch it back */
-    if (!(flags & O_NONBLOCK)) {
-	while (fcntl(fd, F_SETFL, flags) < 0) {
-	    /* still highly unlikely */
-	    if (errno != EINTR) {
-		cvtErrno();
-		stdErrno();
-		return -1;
-	    }
-	}
-    }
+
     /* 1 => Input ready, 0 => time expired  (-1 error) */
     return (ready);
 
-    /*
-    if (c == EOF) {
-	if (errno == EAGAIN || feof((FILE *) fp)) {
-	    clearerr((FILE *) fp);
-	    return 0;
-	} else {
-	    cvtErrno();
-	    stdErrno();
-	    return -1;
-	}
-    } else if (ungetc(c, (FILE *) fp) == EOF) {
-	cvtErrno();
-	stdErrno();
-	return -1;
-    } else
-	return 1;
-    */
 }
 
 \end{code}