X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ftest_sgr.c;h=71811140f6356b130b6104a4a697d57544786659;hp=cff9d0d2d9be03c1bf42b5dc7d87fdeffaa5f799;hb=119b5a6788c26bf7dcc99fcfd54e072946352a93;hpb=fd1066cc97c836a67fa2623b6cf7ffd2ece39dc7

diff --git a/test/test_sgr.c b/test/test_sgr.c
index cff9d0d2..71811140 100644
--- a/test/test_sgr.c
+++ b/test/test_sgr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2015 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2015-2017,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,13 +29,14 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: test_sgr.c,v 1.4 2015/11/21 22:43:50 tom Exp $
+ * $Id: test_sgr.c,v 1.14 2019/08/17 21:36:44 tom Exp $
  *
  * A simple demo of the sgr/sgr0 terminal capabilities.
  */
 #define USE_TINFO
 #include <test.priv.h>
 
+#if !HAVE_TIGETSTR
 static void failed(const char *) GCC_NORETURN;
 
 static void
@@ -44,9 +45,11 @@ failed(const char *msg)
     fprintf(stderr, "%s\n", msg);
     ExitProgram(EXIT_FAILURE);
 }
+#endif
 
 #if HAVE_TIGETSTR
 
+static bool no_init = FALSE;
 static bool q_opt = FALSE;
 
 static char *d_opt;
@@ -59,8 +62,9 @@ static long total_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;
 }
 
@@ -115,7 +119,7 @@ next_dbitem(void)
     return result;
 }
 
-#ifdef NO_LEAKS
+#if NO_LEAKS
 static void
 free_dblist(void)
 {
@@ -143,10 +147,10 @@ dumpit(unsigned bits, unsigned ignore, const char *sgr, const char *sgr0)
     static char params[] = "SURBDBIPA";
     unsigned n;
 
-    printf("%4d ", bits);
+    printf("%4u ", bits);
     bits &= ~ignore;
     for (n = 0; n < MAXPAR; ++n) {
-	putchar((bits & (1 << n)) ? params[n] : '-');
+	putchar((int) ((bits & (unsigned) (1 << n)) ? params[n] : '-'));
     }
     putchar(' ');
     putp(sgr);
@@ -178,15 +182,23 @@ brute_force(const char *name)
     char *my_bold;
     char *my_revs;
     char *my_smso;
+    char *my_name = strdup(name);
 
     if (db_list) {
 	putenv(next_dbitem());
     }
+
     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 (strcmp(name, ttytype))
+	if (strcmp(my_name, ttytype))
 	    printf("... actual \"%s\"\n", ttytype);
     }
 
@@ -201,7 +213,7 @@ brute_force(const char *name)
     } else if (!VALID_STRING(my_sgr0)) {
 	fprintf(stderr, "no \"sgr0\" capability found\n");
     } else {
-	char *values[MAXSGR];
+	char *values[MAXSGR + MAXPAR];
 	unsigned j;
 	unsigned ignore = 0;
 	unsigned reason = 0;
@@ -236,7 +248,7 @@ brute_force(const char *name)
 	    }
 	}
 	for (j = 0; j < MAXPAR; ++j) {
-	    unsigned mask = (1 << j);
+	    unsigned mask = (unsigned) (1 << j);
 	    for (count = 0; count < MAXSGR; ++count) {
 		if ((count & mask) != 0)
 		    continue;
@@ -283,7 +295,11 @@ brute_force(const char *name)
 		}
 	    }
 	}
+	for (count = 0; count < MAXSGR; ++count) {
+	    free(values[count]);
+	}
     }
+    free(my_name);
     del_curterm(cur_term);
 }
 
@@ -299,6 +315,7 @@ usage(void)
 	"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;
@@ -314,7 +331,7 @@ main(int argc, char *argv[])
     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;
@@ -322,6 +339,9 @@ main(int argc, char *argv[])
 	case 'e':
 	    e_opt = optarg;
 	    break;
+	case 'n':
+	    no_init = TRUE;
+	    break;
 	case 'q':
 	    q_opt = TRUE;
 	    break;
@@ -346,7 +366,7 @@ main(int argc, char *argv[])
 
     printf("%ld distinct values\n", total_values);
 
-#ifdef NO_LEAKS
+#if NO_LEAKS
     free_dblist();
 #endif