X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ffirework.c;h=979d1d7c567ae8a61ca35cd0404cb41b526fe4ce;hp=66c1227cf0f082731ac0bc9b783242360beee4c5;hb=41068edef084c39be0cecdf949d9b538d925f42c;hpb=c633e5103a29a38532cf1925257b91cea33fd090

diff --git a/test/firework.c b/test/firework.c
index 66c1227c..979d1d7c 100644
--- a/test/firework.c
+++ b/test/firework.c
@@ -1,9 +1,35 @@
+/****************************************************************************
+ * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc.              *
+ *                                                                          *
+ * Permission is hereby granted, free of charge, to any person obtaining a  *
+ * copy of this software and associated documentation files (the            *
+ * "Software"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/
 /*
- * $Id: firework.c,v 1.17 2000/09/02 18:41:12 tom Exp $
+ * $Id: firework.c,v 1.25 2009/08/29 19:02:25 tom Exp $
  */
 #include <test.priv.h>
 
-#include <signal.h>
 #include <time.h>
 
 static int my_bg = COLOR_BLACK;
@@ -19,7 +45,7 @@ static RETSIGTYPE
 onsig(int n GCC_UNUSED)
 {
     cleanup();
-    exit(EXIT_FAILURE);
+    ExitProgram(EXIT_FAILURE);
 }
 
 static void
@@ -35,7 +61,7 @@ showit(void)
 #endif
 	if (ch == 'q') {
 	    cleanup();
-	    exit(EXIT_SUCCESS);
+	    ExitProgram(EXIT_SUCCESS);
 	} else if (ch == 's') {
 	    nodelay(stdscr, FALSE);
 	} else if (ch == ' ') {
@@ -44,9 +70,8 @@ showit(void)
     }
 }
 
-static
-int
-get_colour(chtype * bold)
+static int
+get_colour(chtype *bold)
 {
     int attr;
     attr = (rand() % 16) + 1;
@@ -69,14 +94,14 @@ explode(int row, int col)
     showit();
 
     init_pair(1, get_colour(&bold), my_bg);
-    attrset(COLOR_PAIR(1) | bold);
+    (void) attrset(COLOR_PAIR(1) | bold);
     mvprintw(row - 1, col - 1, " - ");
     mvprintw(row + 0, col - 1, "-+-");
     mvprintw(row + 1, col - 1, " - ");
     showit();
 
     init_pair(1, get_colour(&bold), my_bg);
-    attrset(COLOR_PAIR(1) | bold);
+    (void) attrset(COLOR_PAIR(1) | bold);
     mvprintw(row - 2, col - 2, " --- ");
     mvprintw(row - 1, col - 2, "-+++-");
     mvprintw(row + 0, col - 2, "-+#+-");
@@ -85,7 +110,7 @@ explode(int row, int col)
     showit();
 
     init_pair(1, get_colour(&bold), my_bg);
-    attrset(COLOR_PAIR(1) | bold);
+    (void) attrset(COLOR_PAIR(1) | bold);
     mvprintw(row - 2, col - 2, " +++ ");
     mvprintw(row - 1, col - 2, "++#++");
     mvprintw(row + 0, col - 2, "+# #+");
@@ -94,7 +119,7 @@ explode(int row, int col)
     showit();
 
     init_pair(1, get_colour(&bold), my_bg);
-    attrset(COLOR_PAIR(1) | bold);
+    (void) attrset(COLOR_PAIR(1) | bold);
     mvprintw(row - 2, col - 2, "  #  ");
     mvprintw(row - 1, col - 2, "## ##");
     mvprintw(row + 0, col - 2, "#   #");
@@ -103,7 +128,7 @@ explode(int row, int col)
     showit();
 
     init_pair(1, get_colour(&bold), my_bg);
-    attrset(COLOR_PAIR(1) | bold);
+    (void) attrset(COLOR_PAIR(1) | bold);
     mvprintw(row - 2, col - 2, " # # ");
     mvprintw(row - 1, col - 2, "#   #");
     mvprintw(row + 0, col - 2, "     ");
@@ -114,16 +139,13 @@ explode(int row, int col)
 
 int
 main(
-    int argc GCC_UNUSED,
-    char *argv[]GCC_UNUSED)
+	int argc GCC_UNUSED,
+	char *argv[]GCC_UNUSED)
 {
-    int j;
     int start, end, row, diff, flag = 0, direction;
     unsigned seed;
 
-    for (j = SIGHUP; j <= SIGTERM; j++)
-	if (signal(j, SIG_IGN) != SIG_IGN)
-	    signal(j, onsig);
+    CATCHALL(onsig);
 
     initscr();
     noecho();
@@ -151,10 +173,10 @@ main(
 	    direction = (start > end) ? -1 : 1;
 	    diff = abs(start - end);
 	} while (diff < 2 || diff >= LINES - 2);
-	attrset(A_NORMAL);
+	(void) attrset(A_NORMAL);
 	for (row = 0; row < diff; row++) {
 	    mvprintw(LINES - row, start + (row * direction),
-		(direction < 0) ? "\\" : "/");
+		     (direction < 0) ? "\\" : "/");
 	    if (flag++) {
 		showit();
 		erase();