Changes in uspace/app/tetris/tetris.c [ceb07b9:19f857a] in mainline

File:

• uspace/app/tetris/tetris.c (modified) (5 diffs)

uspace/app/tetris/tetris.c

@@ -1 @@
-/*
- * Copyright (c) 2011 Martin Decky
- * All rights reserved.
+/*      $OpenBSD: tetris.c,v 1.21 2006/04/20 03:24:12 ray Exp $ */
+/*      $NetBSD: tetris.c,v 1.2 1995/04/22 07:42:47 cgd Exp $   */
+
+/*-
+ * Copyright (c) 1992, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek and Darren F. Provine.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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. 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.
  *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - 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.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** Attributations
- *
- * tetris.c 8.1 (Berkeley) 5/31/93
- * NetBSD: tetris.c,v 1.2 1995/04/22 07:42:47 cgd
- * OpenBSD: tetris.c,v 1.21 2006/04/20 03:24:12 ray
- *
- * Based upon BSD Tetris
- *
- * Copyright (c) 1992, 1993
- *      The Regents of the University of California.
- *      Distributed under BSD license.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek and Darren F. Provine.
- *
+ *      @(#)tetris.c    8.1 (Berkeley) 5/31/93
  */
 
@@ -64 +56 @@
 #include <unistd.h>
 #include <getopt.h>
+
+#include "input.h"
 #include "scores.h"
 #include "screen.h"
@@ -251 +245 @@
         int ch;
         
-        console = console_init(stdin, stdout);
-        
         keys = "jkl pq";
         
         classic = 0;
-        showpreview = 1;
+        showpreview = 1; 
         
         while ((ch = getopt(argc, argv, "ck:ps")) != -1)
@@ -291 +283 @@
                 for (j = i + 1; j <= 5; j++) {
                         if (keys[i] == keys[j])
-                                errx(1, "%s", "duplicate command keys specified.");
+                                errx(1, "duplicate command keys specified.");
                 }
                 
@@ -379 +371 @@
                                         scr_msg(key_msg, 0);
                                         scr_msg(msg, 1);
-                                        console_flush(console);
-                                } while (!twait());
+                                        (void) fflush(stdout);
+                                } while (rwait((struct timeval *) NULL) == -1);
                                 
                                 scr_msg(msg, 0);