X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ftest_sgr.c;h=71811140f6356b130b6104a4a697d57544786659;hp=509033ed777444b37c94c99c531425e5375664fd;hb=119b5a6788c26bf7dcc99fcfd54e072946352a93;hpb=e2e9c09c48b19b24979cafb2d4864f538b5ddd1c diff --git a/test/test_sgr.c b/test/test_sgr.c index 509033ed..71811140 100644 --- 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-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,7 +29,7 @@ /* * Author: Thomas E. Dickey * - * $Id: test_sgr.c,v 1.8 2016/09/04 23:30:56 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. */ @@ -49,6 +49,7 @@ failed(const char *msg) #if HAVE_TIGETSTR +static bool no_init = FALSE; static bool q_opt = FALSE; static char *d_opt; @@ -118,7 +119,7 @@ next_dbitem(void) return result; } -#ifdef NO_LEAKS +#if NO_LEAKS static void free_dblist(void) { @@ -146,7 +147,7 @@ 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((int) ((bits & (unsigned) (1 << n)) ? params[n] : '-')); @@ -181,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); } @@ -286,7 +295,11 @@ brute_force(const char *name) } } } + for (count = 0; count < MAXSGR; ++count) { + free(values[count]); + } } + free(my_name); del_curterm(cur_term); } @@ -302,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; @@ -317,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; @@ -325,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; @@ -349,7 +366,7 @@ main(int argc, char *argv[]) printf("%ld distinct values\n", total_values); -#ifdef NO_LEAKS +#if NO_LEAKS free_dblist(); #endif