X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fdots_mvcur.c;h=d6df3988c945e1bf7990516e9ac9e2a288db56da;hp=2a2cdf5429be709d449ce9a621670c329c18f334;hb=e656c0ca01fc196f0eb66972af7fc51cb83d9651;hpb=58369d647d003dd9d9e1ecfc5ab07982db28f3da

diff --git a/test/dots_mvcur.c b/test/dots_mvcur.c
index 2a2cdf54..d6df3988 100644
--- 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.17 2017/10/22 00:44:39 tom Exp $
+ * $Id: dots_mvcur.c,v 1.20 2019/01/21 14:20:18 tom Exp $
  *
  * A simple demo of the terminfo interface, and mvcur.
  */
@@ -98,7 +98,7 @@ ranf(void)
 }
 
 static int
-get_number(const char *cap, int map)
+get_number(NCURSES_CONST char *cap, int map)
 {
     int result = map;
     if (cap != 0) {
@@ -118,7 +118,9 @@ usage(void)
 	,""
 	,"Options:"
 	," -T TERM  override $TERM"
+#if HAVE_USE_ENV
 	," -e       allow environment $LINES / $COLUMNS"
+#endif
 	," -f       use tigetnum rather than <term.h> mapping"
 	," -m SIZE  set margin (default: 2)"
 	," -s MSECS delay 1% of the time (default: 1 msecs)"
@@ -144,15 +146,22 @@ 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) {
 	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':
 	    use_env(TRUE);
 	    break;
+#endif
 	case 'f':
 	    f_option = 1;
 	    break;