Fix merge conflicts

[bsdgames-darwin.git] / tetris / input.c

diff --git a/tetris/input.c b/tetris/input.c
index e20c45e4097cd0491e34fb293a56b80c2391829f..65741e5c81e1749ad95b9f8a94af6410b30f46f5 100644 (file)
--- a/tetris/input.c
+++ b/tetris/input.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: input.c,v 1.5 2002/06/02 22:17:38 wiz Exp $    */
+/*     $NetBSD: input.c,v 1.11 2009/05/25 04:33:53 dholland Exp $      */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -15,11 +15,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -44,6 +40,7 @@
 
 #include <sys/types.h>
 #include <sys/time.h>
+#include <sys/poll.h>
 
 #include <errno.h>
 #include <unistd.h>
@@ -51,6 +48,8 @@
 #include "input.h"
 #include "tetris.h"
 
+#define INFTIM (-1)
+
 /* return true iff the given timeval is positive */
 #define        TV_POS(tv) \
        ((tv)->tv_sec > 0 || ((tv)->tv_sec == 0 && (tv)->tv_usec > 0))
@@ -65,49 +64,47 @@
        }
 
 /*
- * Do a `read wait': select for reading from stdin, with timeout *tvp.
+ * Do a `read wait': poll for reading from stdin, with timeout *tvp.
  * On return, modify *tvp to reflect the amount of time spent waiting.
  * It will be positive only if input appeared before the time ran out;
  * otherwise it will be zero or perhaps negative.
  *
- * If tvp is nil, wait forever, but return if select is interrupted.
+ * If tvp is nil, wait forever, but return if poll is interrupted.
  *
  * Return 0 => no input, 1 => can read() from stdin
  */
 int
-rwait(tvp)
-       struct timeval *tvp;
+rwait(struct timeval *tvp)
 {
-       int i;
-       struct timeval starttv, endtv, *s;
+       struct pollfd set[1];
+       struct timeval starttv, endtv;
+       int timeout;
 #define        NILTZ ((struct timezone *)0)
 
-       /*
-        * Someday, select() will do this for us.
-        * Just in case that day is now, and no one has
-        * changed this, we use a temporary.
-        */
        if (tvp) {
                (void) gettimeofday(&starttv, NILTZ);
                endtv = *tvp;
-               s = &endtv;
+               timeout = tvp->tv_sec * 1000 + tvp->tv_usec / 1000;
        } else
-               s = 0;
+               timeout = INFTIM;
 again:
-       i = 1;
-       switch (select(1, (fd_set *)&i, (fd_set *)0, (fd_set *)0, s)) {
+       set[0].fd = STDIN_FILENO;
+       set[0].events = POLLIN;
+       switch (poll(set, 1, timeout)) {
 
        case -1:
                if (tvp == 0)
                        return (-1);
                if (errno == EINTR)
                        goto again;
-               stop("select failed, help");
+               stop("poll failed, help");
                /* NOTREACHED */
 
        case 0: /* timed out */
-               tvp->tv_sec = 0;
-               tvp->tv_usec = 0;
+               if (tvp) {
+                       tvp->tv_sec = 0;
+                       tvp->tv_usec = 0;
+               }
                return (0);
        }
        if (tvp) {
@@ -120,11 +117,11 @@ again:
 }
 
 /*
- * `sleep' for the current turn time (using select).
+ * `sleep' for the current turn time.
  * Eat any input that might be available.
  */
 void
-tsleep()
+tsleep(void)
 {
        struct timeval tv;
        char c;
@@ -140,7 +137,7 @@ tsleep()
  * getchar with timeout.
  */
 int
-tgetchar()
+tgetchar(void)
 {
        static struct timeval timeleft;
        char c;