X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fdots_curses.c;h=215351815e03d11d1217ba95d76b326d1e6e8afe;hp=e8c452cfd1a97d102089c5a10417b24a6144d38b;hb=81c758ae6facb0256dbc8a9d1d93795dd093d683;hpb=8c661e43004cf715b9eb63f34bef4eb6f793d46f diff --git a/test/dots_curses.c b/test/dots_curses.c index e8c452cf..21535181 100644 --- a/test/dots_curses.c +++ b/test/dots_curses.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2014,2017 Free Software Foundation, Inc. * + * Copyright (c) 2014-2018,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,13 +29,13 @@ /* * Author: Thomas E. Dickey * - * $Id: dots_curses.c,v 1.11 2017/10/30 22:22:22 tom Exp $ + * $Id: dots_curses.c,v 1.14 2019/01/21 14:20:18 tom Exp $ * * A simple demo of the curses interface used for comparison with termcap. */ #include -#if !defined(__MINGW32__) +#if !defined(_WIN32) #include #endif @@ -96,7 +96,9 @@ usage(void) #if HAVE_USE_DEFAULT_COLORS ," -d invoke use_default_colors()" #endif +#if HAVE_USE_ENV ," -e allow environment $LINES / $COLUMNS" +#endif ," -m SIZE set margin (default: 2)" ," -s MSECS delay 1% of the time (default: 1 msecs)" }; @@ -120,11 +122,16 @@ main(int argc, char *argv[]) #endif int m_option = 2; int s_option = 1; + size_t need; + char *my_env; while ((x = getopt(argc, argv, "T:dem:s:")) != -1) { switch (x) { 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_DEFAULT_COLORS case 'd':