X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fdots.c;h=d34473c1bb7e50f9fd16af350a6b6eb330cb3edb;hp=079342372331bed1c15b6fac23b19bbc787af917;hb=3e91848cbe3dad23fdb60962fa9b678592591c34;hpb=8d3ea9021573747ecd129228ba7782a03243f62c diff --git a/test/dots.c b/test/dots.c index 07934237..d34473c1 100644 --- a/test/dots.c +++ b/test/dots.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 1999-2013,2017 Free Software Foundation, Inc. * + * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 1999-2013,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,7 +30,7 @@ /* * Author: Thomas E. Dickey 1999 * - * $Id: dots.c,v 1.33 2017/11/24 19:26:31 tom Exp $ + * $Id: dots.c,v 1.36 2020/02/02 23:34:34 tom Exp $ * * A simple demo of the terminfo interface. */ @@ -136,18 +137,23 @@ int main(int argc, char *argv[]) { - int x, y, z, p; + int ch; double r; double c; int my_colors; 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': @@ -190,13 +196,13 @@ main(int argc, 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(tparm3(cursor_address, y, x), 1, outc); 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 {