ncurses 6.1 - patch 20180929

[ncurses.git] / test / test_sgr.c

diff --git a/test/test_sgr.c b/test/test_sgr.c
index aa7a649ba778415b1beedadb3dd401b866f102cf..e19afc5070fcfbe0579590a10870a425820f0217 100644 (file)
--- a/test/test_sgr.c
+++ b/test/test_sgr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2015,2016 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2015-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            *
  *                                                                          *
  * 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
  *
 /*
  * Author: Thomas E. Dickey
  *

- * $Id: test_sgr.c,v 1.7 2016/06/11 23:15:03 tom Exp $
+ * $Id: test_sgr.c,v 1.11 2017/06/24 18:35:25 tom Exp $

  *
  * A simple demo of the sgr/sgr0 terminal capabilities.
  */
  *
  * A simple demo of the sgr/sgr0 terminal capabilities.
  */


@@ -49,6 +49,7 @@ failed(const char *msg)
 
 #if HAVE_TIGETSTR
 
 
 #if HAVE_TIGETSTR
 

+static bool no_init = FALSE;

 static bool q_opt = FALSE;
 
 static char *d_opt;
 static bool q_opt = FALSE;
 
 static char *d_opt;


@@ -61,8 +62,9 @@ static long total_values;
 static char *
 make_dbitem(char *p, char *q)
 {
 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;
 }
 
     return result;
 }
 


@@ -117,7 +119,7 @@ next_dbitem(void)
     return result;
 }
 
     return result;
 }
 

-#ifdef NO_LEAKS
+#if NO_LEAKS

 static void
 free_dblist(void)
 {
 static void
 free_dblist(void)
 {


@@ -184,9 +186,16 @@ brute_force(const char *name)
     if (db_list) {
        putenv(next_dbitem());
     }
     if (db_list) {
        putenv(next_dbitem());
     }

+

     if (!q_opt)
        printf("Terminal type \"%s\"\n", name);
     if (!q_opt)
        printf("Terminal type \"%s\"\n", name);

-    setupterm((NCURSES_CONST char *) name, 1, (int *) 0);
+
+    if (no_init) {
+       START_TRACE();
+    } else {
+       setupterm((NCURSES_CONST char *) name, 1, (int *) 0);
+    }
+

     if (!q_opt) {
        if (strcmp(name, ttytype))
            printf("... actual \"%s\"\n", ttytype);
     if (!q_opt) {
        if (strcmp(name, ttytype))
            printf("... actual \"%s\"\n", ttytype);


@@ -285,6 +294,9 @@ brute_force(const char *name)
                }
            }
        }
                }
            }
        }

+       for (count = 0; count < MAXSGR; ++count) {
+           free(values[count]);
+       }

     }
     del_curterm(cur_term);
 }
     }
     del_curterm(cur_term);
 }


@@ -301,6 +313,7 @@ usage(void)
        "Options:",
        " -d LIST  colon-separated list of databases to use",
        " -e NAME  environment variable to set with -d option",
        "Options:",
        " -d LIST  colon-separated list of databases to use",
        " -e NAME  environment variable to set with -d option",

+       " -n       do not initialize terminal, to test error-checking",

        " -q       quiet (prints only counts)",
     };
     unsigned n;
        " -q       quiet (prints only counts)",
     };
     unsigned n;


@@ -316,7 +329,7 @@ main(int argc, char *argv[])
     int n;
     char *name;
 
     int n;
     char *name;
 

-    while ((n = getopt(argc, argv, "d:e:q")) != -1) {
+    while ((n = getopt(argc, argv, "d:e:nq")) != -1) {

        switch (n) {
        case 'd':
            d_opt = optarg;
        switch (n) {
        case 'd':
            d_opt = optarg;


@@ -324,6 +337,9 @@ main(int argc, char *argv[])
        case 'e':
            e_opt = optarg;
            break;
        case 'e':
            e_opt = optarg;
            break;

+       case 'n':
+           no_init = TRUE;
+           break;

        case 'q':
            q_opt = TRUE;
            break;
        case 'q':
            q_opt = TRUE;
            break;


@@ -348,7 +364,7 @@ main(int argc, char *argv[])
 
     printf("%ld distinct values\n", total_values);
 
 
     printf("%ld distinct values\n", total_values);
 

-#ifdef NO_LEAKS
+#if NO_LEAKS

     free_dblist();
 #endif
 
     free_dblist();
 #endif