ncurses 6.0 - patch 20170909

[ncurses.git] / test / demo_termcap.c

diff --git a/test/demo_termcap.c b/test/demo_termcap.c
index c62dba8e0ce96c2b95e6d9ac1e89d61c3960a9c2..e1ce0cda219a5e784b7f4c1d0c0c3df904206faf 100644 (file)
--- a/test/demo_termcap.c
+++ b/test/demo_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2005-2014,2015 Free Software Foundation, Inc.              *
+ * Copyright (c) 2005-2016,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 +29,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: demo_termcap.c,v 1.49 2015/10/10 20:41:16 tom Exp $
+ * $Id: demo_termcap.c,v 1.55 2017/09/04 13:28:44 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
@@ -74,8 +74,10 @@ static bool b_opt = FALSE;
 static bool n_opt = FALSE;
 static bool s_opt = FALSE;
 static bool q_opt = FALSE;
+#ifdef NCURSES_VERSION
 static bool x_opt = FALSE;
 static bool y_opt = FALSE;
+#endif
 
 static char *d_opt;
 static char *e_opt;
@@ -100,8 +102,9 @@ static long total_s_values;
 static char *
 make_dbitem(char *p, char *q)
 {
-    char *result = malloc(strlen(e_opt) + 2 + (size_t) (p - q));
-    sprintf(result, "%s=%.*s", e_opt, (int) (p - q), q);
+    size_t need = strlen(e_opt) + 2 + (size_t) (p - q);
+    char *result = malloc(need);
+    _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) (p - q), q);
     return result;
 }
 
@@ -156,6 +159,7 @@ next_dbitem(void)
     return result;
 }
 
+#if NO_LEAKS
 static void
 free_dblist(void)
 {
@@ -167,6 +171,7 @@ free_dblist(void)
        db_list = 0;
     }
 }
+#endif /* NO_LEAKS */
 
 static void
 show_string(const char *name, const char *value)
@@ -358,7 +363,7 @@ demo_termcap(NCURSES_CONST char *name)
 #ifdef NCURSES_VERSION
        if (x_opt && (my_blob == 0) && y_opt) {
 #if NCURSES_XNAMES
-           TERMTYPE *term = &(cur_term->type);
+           TERMTYPE *term = (TERMTYPE *) cur_term;
            if (term != 0
                && ((NUM_BOOLEANS(term) != BOOLCOUNT)
                    || (NUM_NUMBERS(term) != NUMCOUNT)
@@ -699,7 +704,7 @@ copy_code_list(NCURSES_CONST char *const *list)
                length += chunk;
            } else {
                result[count] = unused;
-               strcpy(unused, list[count]);
+               _nc_STRCPY(unused, list[count], length);
                unused += chunk;
            }
        }
@@ -714,7 +719,18 @@ copy_code_list(NCURSES_CONST char *const *list)
 
     return result;
 }
-#endif
+
+#if NO_LEAKS
+static void
+free_code_list(char **list)
+{
+    if (list) {
+       free(list[0]);
+       free(list);
+    }
+}
+#endif /* NO_LEAKS */
+#endif /* USE_CODE_LISTS */
 
 static void
 usage(void)
@@ -754,7 +770,9 @@ main(int argc, char *argv[])
     int n;
     char *name;
     bool a_opt = FALSE;
+#if defined(NCURSES_VERSION) || defined(HAVE_CURSES_DATA_OSPEED)
     bool v_opt = FALSE;
+#endif
     char *input_name = 0;
 
     int repeat;
@@ -790,9 +808,12 @@ main(int argc, char *argv[])
        case 's':
            s_opt = TRUE;
            break;
+#if defined(NCURSES_VERSION) || defined(HAVE_CURSES_DATA_OSPEED)
        case 'v':
            v_opt = TRUE;
            break;
+#endif
+#ifdef NCURSES_VERSION
 #if NCURSES_XNAMES
        case 'x':
            x_opt = TRUE;
@@ -801,6 +822,7 @@ main(int argc, char *argv[])
            y_opt = TRUE;
            x_opt = TRUE;
            break;
+#endif
 #endif
        default:
            usage();
@@ -870,11 +892,18 @@ main(int argc, char *argv[])
        show_number("PC", PC);
        show_string("UP", UP);
        show_string("BC", BC);
-       show_number("ospeed", ospeed);
+       show_number("ospeed", (int) ospeed);
     }
 #endif
 
+#if NO_LEAKS
     free_dblist();
+#if USE_CODE_LISTS
+    free_code_list(my_boolcodes);
+    free_code_list(my_numcodes);
+    free_code_list(my_strcodes);
+#endif
+#endif /* NO_LEAKS */
 
     ExitProgram(EXIT_SUCCESS);
 }