* *character* from this file object without blocking?'
*/
int
-inputReady(int fd, int msecs, int isSock)
+fdReady(int fd, int write, int msecs, int isSock)
{
if
-#ifndef mingw32_TARGET_OS
- ( 1 ) {
-#else
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
( isSock ) {
+#else
+ ( 1 ) {
#endif
int maxfd, ready;
- fd_set rfd;
+ fd_set rfd, wfd;
struct timeval tv;
FD_ZERO(&rfd);
- FD_SET(fd, &rfd);
+ FD_ZERO(&wfd);
+ if (write) {
+ FD_SET(fd, &wfd);
+ } else {
+ FD_SET(fd, &rfd);
+ }
/* select() will consider the descriptor set in the range of 0 to
* (maxfd-1)
*/
maxfd = fd + 1;
tv.tv_sec = msecs / 1000;
- tv.tv_usec = msecs % 1000;
+ tv.tv_usec = (msecs % 1000) * 1000;
- while ((ready = select(maxfd, &rfd, NULL, NULL, &tv)) < 0 ) {
+ while ((ready = select(maxfd, &rfd, &wfd, NULL, &tv)) < 0 ) {
if (errno != EINTR ) {
return -1;
}
/* 1 => Input ready, 0 => not ready, -1 => error */
return (ready);
}
-#ifdef mingw32_TARGET_OS
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
else {
DWORD rc;
HANDLE hFile = (HANDLE)_get_osfhandle(fd);
-
- rc = MsgWaitForMultipleObjects( 1,
- &hFile,
- FALSE, /* wait all */
- msecs, /*millisecs*/
- QS_ALLEVENTS);
+ DWORD avail;
+
+ // WaitForMultipleObjects() works for Console input, but it
+ // doesn't work for pipes (it always returns WAIT_OBJECT_0
+ // even when no data is available). There doesn't seem to be
+ // an easy way to distinguish the two kinds of HANDLE, so we
+ // try to detect pipe input first, and if that fails we try
+ // WaitForMultipleObjects().
+ //
+ rc = PeekNamedPipe( hFile, NULL, 0, NULL, &avail, NULL );
+ if (rc != 0) {
+ if (avail != 0) {
+ return 1;
+ } else {
+ return 0;
+ }
+ } else {
+ rc = GetLastError();
+ if (rc == ERROR_BROKEN_PIPE) {
+ return 1; // this is probably what we want
+ }
+ if (rc != ERROR_INVALID_HANDLE) {
+ return -1;
+ }
+ }
+
+ rc = WaitForMultipleObjects( 1,
+ &hFile,
+ TRUE, /* wait all */
+ msecs); /*millisecs*/
/* 1 => Input ready, 0 => not ready, -1 => error */
switch (rc) {