ncurses 6.4 - patch 20240420

[ncurses.git] / test / test.priv.h

diff --git a/test/test.priv.h b/test/test.priv.h
index a572b5c25bc0610bca3dec8e57081144646b93d5..a901185b8df04832530d68439c2fb78e4ff835e3 100644 (file)
--- a/test/test.priv.h
+++ b/test/test.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/
-/* $Id: test.priv.h,v 1.210 2023/02/25 21:26:04 tom Exp $ */
+/* $Id: test.priv.h,v 1.218 2024/02/10 14:40:03 tom Exp $ */
 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1
@@ -303,6 +303,18 @@
 #define HAVE_TIGETSTR 0
 #endif
 
+#ifndef HAVE_TIPARM
+#define HAVE_TIPARM 0
+#endif
+
+#ifndef HAVE_TIPARM_S
+#define HAVE_TIPARM_S 0
+#endif
+
+#ifndef HAVE_TISCAN_S
+#define HAVE_TISCAN_S 0
+#endif
+
 #ifndef HAVE_TPUTS_SP
 #define HAVE_TPUTS_SP 0
 #endif
@@ -379,6 +391,10 @@
 #define NO_LEAKS 0
 #endif
 
+#ifndef HAVE__NC_TPARM_ANALYZE
+#define HAVE__NC_TPARM_ANALYZE 0
+#endif
+
 /*
  * Workaround for HPUX
  */
@@ -471,6 +487,13 @@ extern int optind;
 #include <assert.h>
 #include <ctype.h>
 
+#if HAVE_STDINT_H
+#include <stdint.h>
+#define my_intptr_t    intptr_t
+#else
+#define my_intptr_t    long
+#endif
+
 #if defined(_MSC_VER)
 #undef popen
 #define popen(s,n) _popen(s,n)
@@ -729,28 +752,27 @@ extern int optind;
 ," -V       show version of curses"
 
 #if HAVE_CURSES_VERSION
-#define format_version(buffer) strcpy(buffer, curses_version())
+#define format_version(buffer, size) strcpy(buffer, curses_version())
 #elif defined(NCURSES_VERSION_MAJOR) && defined(NCURSES_VERSION_MINOR) && defined(NCURSES_VERSION_PATCH)
-#define format_version(buffer) sprintf(buffer, "ncurses %d.%d.%d", \
-       NCURSES_VERSION_MAJOR, \
-       NCURSES_VERSION_MINOR, \
-       NCURSES_VERSION_PATCH)
+#define format_version(buffer, size) \
+       _nc_SPRINTF(buffer, _nc_SLIMIT(size) "ncurses %d.%d.%d", \
+                   NCURSES_VERSION_MAJOR, \
+                   NCURSES_VERSION_MINOR, \
+                   NCURSES_VERSION_PATCH)
 #else
-#define format_version(buffer) strcpy(buffer, "ncurses-examples")
+#define format_version(buffer, size) strcpy(buffer, "ncurses-examples")
 #endif
 
 #define VERSION_COMMON() \
 static char *version_common(char **argv) { \
        char *base = argv[0]; \
-       char *leaf = strrchr(base, '/'); \
-       char *result = malloc(strlen(base) + 80); \
-       if (result == NULL) { \
-           static char unknown[] = "?"; \
-           result = unknown; \
-       } else { \
-           if (leaf++ == NULL) leaf = base; \
-           sprintf(result, "%.20s: ", leaf); \
-           format_version(result + strlen(result)); \
+       char *part = strrchr(base, '/'); \
+       size_t need = strlen(base) + 80; \
+       char *result = malloc(need); \
+       if (result != NULL) { \
+           if (part++ == NULL) part = base; \
+           _nc_SPRINTF(result, _nc_SLIMIT(need) "%.20s: ", part); \
+           format_version(result + strlen(result), need - strlen(result)); \
        } \
        return result; \
 } \
@@ -995,7 +1017,9 @@ extern int TABSIZE;
 
 #define UChar(c)    ((unsigned char)(c))
 
+#ifndef SIZEOF
 #define SIZEOF(table)  (sizeof(table)/sizeof(table[0]))
+#endif
 
 #if defined(NCURSES_VERSION) && HAVE_NC_ALLOC_H
 #include <nc_alloc.h>
@@ -1090,14 +1114,14 @@ extern int TABSIZE;
 #if HAVE_CLOCK_GETTIME
 # define GetClockTime(t) clock_gettime(CLOCK_REALTIME, t)
 # define TimeType struct timespec
-# define TimeScale 1000000000L         /* 1e9 */
+# define TimeScale 1000000000L /* 1e9 */
 # define ElapsedSeconds(b,e) \
            (double) (((e)->tv_sec - (b)->tv_sec) \
                    + ((e)->tv_nsec - (b)->tv_nsec) / TimeScale)
 #elif HAVE_GETTIMEOFDAY
 # define GetClockTime(t) gettimeofday(t, 0)
 # define TimeType struct timeval
-# define TimeScale 1000000L            /* 1e6 */
+# define TimeScale 1000000L    /* 1e6 */
 # define ElapsedSeconds(b,e) \
            (double) (((e)->tv_sec - (b)->tv_sec) \
                    + ((e)->tv_usec - (b)->tv_usec) / TimeScale)