Changeset 4669Tweet

Timestamp:

10/06/10 21:33:24 (3 years ago)

Author:

sam

Message:

Disable select() on Win32. It is not supported on non-sockets.

File:

• zzuf/trunk/src/zzuf.c (modified) (5 diffs)

zzuf/trunk/src/zzuf.c

@@ -944 +944 @@
     tv.tv_usec = 1000;
 
-#if _WIN32
-    for(i = 0; i < opts->maxchild; i++)
-        for (j = 0; j < 3; j++)
-        {
-            char tmpbuf[1025];
-            int tmp = _read(opts->child[i].fd[j], tmpbuf, 1024);
-            if (tmp > 0)
-            {
-                tmpbuf[tmp] = 0;
-                fprintf(stderr, "read %i bytes on fd %i: \"%s\"\n", tmp, j, tmpbuf);
-            }
-        }
-#endif
-
+#if !defined _WIN32
+    /* Win32 does not support select() on non-sockets */
     errno = 0;
     ret = select(maxfd + 1, &fdset, NULL, NULL, &tv);
@@ -964 +952 @@
     if(ret <= 0)
         return;
+#endif
 
     /* XXX: cute (i, j) iterating hack */
@@ -973 +962 @@
             continue;
 
+#if !defined _WIN32
         if(!ZZUF_FD_ISSET(opts->child[i].fd[j], &fdset))
             continue;
+#endif
 
         ret = read(opts->child[i].fd[j], buf, BUFSIZ - 1);
@@ -988 +979 @@
                 write((j < 2) ? STDERR_FILENO : STDOUT_FILENO, buf, ret);
         }
+#if !defined _WIN32
         else if(ret == 0)
         {
@@ -999 +991 @@
                 opts->child[i].status = STATUS_EOF;
         }
+#endif
     }
 }