ncurses 6.1 - patch 20191214

[ncurses.git] / test / dots_mvcur.c

diff --git a/test/dots_mvcur.c b/test/dots_mvcur.c
index 7dfae824995f29674e95d0bd434aa4fe89b0352d..16d5ca5ecf75a44223011ef53710acd8947c103a 100644 (file)
--- a/test/dots_mvcur.c
+++ b/test/dots_mvcur.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2007-2013,2017 Free Software Foundation, Inc.              *
+ * Copyright (c) 2007-2017,2019 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,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey - 2007
  *
- * $Id: dots_mvcur.c,v 1.19 2017/11/24 19:26:31 tom Exp $
+ * $Id: dots_mvcur.c,v 1.21 2019/08/24 22:19:28 tom Exp $
  *
  * A simple demo of the terminfo interface, and mvcur.
  */
@@ -138,7 +138,7 @@ main(int argc GCC_UNUSED,
      char *argv[]GCC_UNUSED)
 {
     int x0 = 1, y0 = 1;
-    int x, y, z, p;
+    int ch;
     double r;
     double c;
     SCREEN *sp;
@@ -146,11 +146,16 @@ main(int argc GCC_UNUSED,
     int f_option = 0;
     int m_option = 2;
     int s_option = 1;
+    size_t need;
+    char *my_env;
 
-    while ((x = getopt(argc, argv, "T:efm:s:")) != -1) {
-       switch (x) {
+    while ((ch = getopt(argc, argv, "T:efm: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;
 #if HAVE_USE_ENV
        case 'e':
@@ -200,9 +205,9 @@ main(int argc GCC_UNUSED,
     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) ? '*' : ' ';
 
        if (mvcur(y0, x0, y, x) != ERR) {
            x0 = x;
@@ -210,7 +215,7 @@ main(int argc GCC_UNUSED,
        }
 
        if (my_colors > 0) {
-           z = (int) (ranf() * my_colors);
+           int z = (int) (ranf() * my_colors);
            if (ranf() > 0.01) {
                tputs(tparm2(set_a_foreground, z), 1, outc);
            } else {