ncurses 6.2 - patch 20200531

[ncurses.git] / test / dots_termcap.c

diff --git a/test/dots_termcap.c b/test/dots_termcap.c
index b0b016c8dac40bb3a523d87209d427faf084a099..52749c754d63122d8e23731582ef4fff744b437e 100644 (file)
--- a/test/dots_termcap.c
+++ b/test/dots_termcap.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2013-2014,2017 Free Software Foundation, Inc.              *
+ * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2013-2014,2017 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            *
@@ -29,14 +30,14 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: dots_termcap.c,v 1.16 2017/10/22 15:21:34 tom Exp $
+ * $Id: dots_termcap.c,v 1.24 2020/05/29 23:04:02 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
 #define USE_TINFO
 #include <test.priv.h>
 
-#if !defined(__MINGW32__)
+#if !defined(_WIN32)
 #include <sys/time.h>
 #endif
 
@@ -130,9 +131,10 @@ cleanup(void)
     outs(t_cl);
     outs(t_ve);
 
-    printf("\n\n%ld total cells, rate %.2f/sec\n",
-          total_chars,
-          ((double) (total_chars) / (double) (time((time_t *) 0) - started)));
+    fflush(stdout);
+    fprintf(stderr, "\n\n%ld total cells, rate %.2f/sec\n",
+           total_chars,
+           ((double) (total_chars) / (double) (time((time_t *) 0) - started)));
 }
 
 static void
@@ -152,7 +154,7 @@ static void
 my_napms(int ms)
 {
     if (ms > 0) {
-#if defined(__MINGW32__) || !HAVE_GETTIMEOFDAY
+#if defined(_WIN32) || !HAVE_GETTIMEOFDAY
        Sleep((DWORD) ms);
 #else
        struct timeval data;
@@ -188,6 +190,7 @@ usage(void)
        ," -T TERM  override $TERM"
        ," -e       allow environment $LINES / $COLUMNS"
        ," -m SIZE  set margin (default: 2)"
+       ," -r SECS  self-interrupt/exit after specified number of seconds"
        ," -s MSECS delay 1% of the time (default: 1 msecs)"
     };
     size_t n;
@@ -201,23 +204,29 @@ usage(void)
 int
 main(int argc, char *argv[])
 {
-    int x, y, z, p;
+    int ch;
     int num_colors;
     int num_lines;
     int num_columns;
     int e_option = 0;
     int m_option = 2;
+    int r_option = 0;
     int s_option = 1;
     double r;
     double c;
     char buffer[1024];
     char area[1024];
     char *name;
+    size_t need;
+    char *my_env;
 
-    while ((x = getopt(argc, argv, "T:em:s:")) != -1) {
-       switch (x) {
+    while ((ch = getopt(argc, argv, "T:em:r:s:")) != -1) {
+       switch (ch) {
        case 'T':
-           putenv(strcat(strcpy(malloc(6 + strlen(optarg)), "TERM="), optarg));
+           need = 6 + strlen(optarg);
+           my_env = malloc(need);
+           _nc_SPRINTF(my_env, _nc_SLIMIT(need) "TERM=%s", optarg);
+           putenv(my_env);
            break;
        case 'e':
            e_option = 1;
@@ -225,6 +234,9 @@ main(int argc, char *argv[])
        case 'm':
            m_option = atoi(optarg);
            break;
+       case 'r':
+           r_option = atoi(optarg);
+           break;
        case 's':
            s_option = atoi(optarg);
            break;
@@ -241,8 +253,9 @@ main(int argc, char *argv[])
 
     srand((unsigned) time(0));
 
-    InitAndCatch(z = tgetent(buffer, name), onsig);
-    if (z < 0) {
+    SetupAlarm((unsigned) r_option);
+    InitAndCatch(ch = tgetent(buffer, name), onsig);
+    if (ch < 0) {
        fprintf(stderr, "terminal description not found\n");
        ExitProgram(EXIT_FAILURE);
     } else {
@@ -273,18 +286,19 @@ main(int argc, char *argv[])
     started = time((time_t *) 0);
 
     while (!interrupted) {
-       x = (int) (c * ranf()) + m_option;
-       y = (int) (r * ranf()) + m_option;
-       p = (ranf() > 0.9) ? '*' : ' ';
+       int x = (int) (c * ranf()) + m_option;
+       int y = (int) (r * ranf()) + m_option;
+       int p = (ranf() > 0.9) ? '*' : ' ';
 
        tputs(tgoto(t_cm, x, y), 1, outc);
        if (num_colors > 0) {
-           z = (int) (ranf() * num_colors);
+           int z = (int) (ranf() * num_colors);
            if (ranf() > 0.01) {
                tputs(tgoto(t_AF, 0, z), 1, outc);
            } else {
                tputs(tgoto(t_AB, 0, z), 1, outc);
-               my_napms(s_option);
+               if (s_option)
+                   my_napms(s_option);
            }
        } else if (VALID_STRING(t_me)
                   && VALID_STRING(t_mr)) {
@@ -292,7 +306,8 @@ main(int argc, char *argv[])
                outs((ranf() > 0.6)
                     ? t_mr
                     : t_me);
-               my_napms(s_option);
+               if (s_option)
+                   my_napms(s_option);
            }
        }
        outc(p);