ncurses 5.7 - patch 20090829

[ncurses.git] / test / gdc.c

diff --git a/test/gdc.c b/test/gdc.c
index 83b3fd55a8bf567e639c1146d41bcda9e9bc2f2b..5eb36820f70bcbbbe608926d1daad3ebee363eed 100644 (file)
--- a/test/gdc.c
+++ b/test/gdc.c
@@ -1,3 +1,30 @@
+/****************************************************************************
+ * Copyright (c) 1998-2008,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.                                                           *
+ ****************************************************************************/
 /*
  * Grand digital clock for curses compatible terminals
  * Usage: gdc [-s] [n]   -- run for n seconds (default infinity)
@@ -6,7 +33,7 @@
  * modified 10-18-89 for curses (jrl)
  * 10-18-89 added signal handling
  *
- * $Id: gdc.c,v 1.26 2005/05/28 21:39:39 tom Exp $
+ * $Id: gdc.c,v 1.32 2009/08/29 19:02:25 tom Exp $
  */
 
 #include <test.priv.h>
@@ -51,20 +78,21 @@ drawbox(bool scrolling)
     int n;
 
     if (hascolor)
-       attrset(COLOR_PAIR(PAIR_FRAMES));
+       (void) attrset(COLOR_PAIR(PAIR_FRAMES));
 
     mvaddch(YBASE - 1, XBASE - 1, ACS_ULCORNER);
     hline(ACS_HLINE, XLENGTH);
     mvaddch(YBASE - 1, XBASE + XLENGTH, ACS_URCORNER);
 
     mvaddch(YBASE + YDEPTH, XBASE - 1, ACS_LLCORNER);
-    mvinchnstr(YBASE + YDEPTH, XBASE, bottom, XLENGTH);
-    for (n = 0; n < XLENGTH; n++) {
-       if (!scrolling)
-           bottom[n] &= ~A_COLOR;
-       bottom[n] = ACS_HLINE | (bottom[n] & (A_ATTRIBUTES | A_COLOR));
+    if ((mvinchnstr(YBASE + YDEPTH, XBASE, bottom, XLENGTH)) != ERR) {
+       for (n = 0; n < XLENGTH; n++) {
+           if (!scrolling)
+               bottom[n] &= ~A_COLOR;
+           bottom[n] = ACS_HLINE | (bottom[n] & (A_ATTRIBUTES | A_COLOR));
+       }
+       mvaddchnstr(YBASE + YDEPTH, XBASE, bottom, XLENGTH);
     }
-    mvaddchnstr(YBASE + YDEPTH, XBASE, bottom, XLENGTH);
     mvaddch(YBASE + YDEPTH, XBASE + XLENGTH, ACS_LRCORNER);
 
     move(YBASE, XBASE - 1);
@@ -74,7 +102,7 @@ drawbox(bool scrolling)
     vline(ACS_VLINE, YDEPTH);
 
     if (hascolor)
-       attrset(COLOR_PAIR(PAIR_OTHERS));
+       (void) attrset(COLOR_PAIR(PAIR_OTHERS));
 }
 
 static void
@@ -142,10 +170,9 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    signal(SIGINT, sighndl);
-    signal(SIGTERM, sighndl);
+    CATCHALL(sighndl);
 
-    while ((k = getopt(argc, argv, "sn")) != EOF) {
+    while ((k = getopt(argc, argv, "sn")) != -1) {
        switch (k) {
        case 's':
            scrol = TRUE;
@@ -160,6 +187,7 @@ main(int argc, char *argv[])
     }
     if (optind < argc) {
        count = atoi(argv[optind++]);
+       assert(count >= 0);
     }
     if (optind < argc)
        usage();
@@ -192,7 +220,7 @@ main(int argc, char *argv[])
        init_pair(PAIR_DIGITS, COLOR_BLACK, COLOR_RED);
        init_pair(PAIR_OTHERS, COLOR_RED, bg);
        init_pair(PAIR_FRAMES, COLOR_WHITE, bg);
-       attrset(COLOR_PAIR(PAIR_OTHERS));
+       (void) attrset(COLOR_PAIR(PAIR_OTHERS));
     }
 
   restart:
@@ -307,7 +335,7 @@ main(int argc, char *argv[])
            goto restart;
        case ERR:
            if (sigtermed) {
-               standend();
+               (void) standend();
                endwin();
                fprintf(stderr, "gdc terminated by signal %d\n", sigtermed);
                ExitProgram(EXIT_FAILURE);
@@ -317,7 +345,7 @@ main(int argc, char *argv[])
            continue;
        }
     } while (--count);
-    standend();
+    (void) standend();
     endwin();
     ExitProgram(EXIT_SUCCESS);
 }