X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=test%2Fdots_termcap.c;h=b81a53d741a25a465f743b683b35b995dd7c5ce3;hb=eccca377f55c70b12e3e92621d94d1e1c1fcfb7d;hp=e9c34bace2da51e42cc374509aa2c40c267877ef;hpb=58369d647d003dd9d9e1ecfc5ab07982db28f3da;p=ncurses.git

diff --git a/test/dots_termcap.c b/test/dots_termcap.c
index e9c34bac..b81a53d7 100644
--- a/test/dots_termcap.c
+++ b/test/dots_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2013-2014,2017 Free Software Foundation, Inc.              *
+ * Copyright (c) 2013-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,14 +29,14 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: dots_termcap.c,v 1.15 2017/10/22 00:49:45 tom Exp $
+ * $Id: dots_termcap.c,v 1.18 2019/01/21 14:20:18 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
 
@@ -60,7 +60,7 @@ static char *t_ve;
 static char *t_vi;
 
 static struct {
-    const char *name;
+    NCURSES_CONST char *name;
     char **value;
 } my_caps[] = {
 
@@ -152,7 +152,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;
@@ -164,7 +164,7 @@ my_napms(int ms)
 }
 
 static int
-get_number(const char *cap, const char *env)
+get_number(NCURSES_CONST char *cap, const char *env)
 {
     int result = tgetnum(cap);
     char *value = env ? getenv(env) : 0;
@@ -213,11 +213,16 @@ main(int argc, char *argv[])
     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) {
 	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;