ncurses 6.2 - patch 20200418

[ncurses.git] / test / test_sgr.c

diff --git a/test/test_sgr.c b/test/test_sgr.c
index 66241b391ca919b0b3fdcd1a1e5483cdbfab7830..aeb833cf9e10c902eb628f7fe29116c3a3aa0c57 100644 (file)
--- a/test/test_sgr.c
+++ b/test/test_sgr.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

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

- * $Id: test_sgr.c,v 1.10 2017/04/09 00:27:42 tom Exp $
+ * $Id: test_sgr.c,v 1.15 2020/02/02 23:34:34 tom Exp $

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


@@ -49,6 +50,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;


@@ -146,7 +148,7 @@ dumpit(unsigned bits, unsigned ignore, const char *sgr, const char *sgr0)
     static char params[] = "SURBDBIPA";
     unsigned n;
 
     static char params[] = "SURBDBIPA";
     unsigned n;
 

-    printf("%4d ", bits);
+    printf("%4u ", bits);

     bits &= ~ignore;
     for (n = 0; n < MAXPAR; ++n) {
        putchar((int) ((bits & (unsigned) (1 << n)) ? params[n] : '-'));
     bits &= ~ignore;
     for (n = 0; n < MAXPAR; ++n) {
        putchar((int) ((bits & (unsigned) (1 << n)) ? params[n] : '-'));


@@ -181,15 +183,23 @@ brute_force(const char *name)
     char *my_bold;
     char *my_revs;
     char *my_smso;
     char *my_bold;
     char *my_revs;
     char *my_smso;

+    char *my_name = strdup(name);

 
     if (db_list) {
        putenv(next_dbitem());
     }
 
     if (db_list) {
        putenv(next_dbitem());
     }

+

     if (!q_opt)
     if (!q_opt)

-       printf("Terminal type \"%s\"\n", name);
-    setupterm((NCURSES_CONST char *) name, 1, (int *) 0);
+       printf("Terminal type \"%s\"\n", my_name);
+
+    if (no_init) {
+       START_TRACE();
+    } else {
+       setupterm((NCURSES_CONST char *) my_name, 1, (int *) 0);
+    }
+

     if (!q_opt) {
     if (!q_opt) {

-       if (strcmp(name, ttytype))
+       if (strcmp(my_name, ttytype))

            printf("... actual \"%s\"\n", ttytype);
     }
 
            printf("... actual \"%s\"\n", ttytype);
     }
 


@@ -290,6 +300,7 @@ brute_force(const char *name)
            free(values[count]);
        }
     }
            free(values[count]);
        }
     }

+    free(my_name);

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


@@ -305,6 +316,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;


@@ -320,7 +332,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;


@@ -328,6 +340,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;