X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ftest_sgr.c;h=33564adb2a51805784181cf6e98a57669476aae0;hp=cff9d0d2d9be03c1bf42b5dc7d87fdeffaa5f799;hb=HEAD;hpb=fd1066cc97c836a67fa2623b6cf7ffd2ece39dc7 diff --git a/test/test_sgr.c b/test/test_sgr.c index cff9d0d2..8763dca3 100644 --- a/test/test_sgr.c +++ b/test/test_sgr.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 2015 Free Software Foundation, Inc. * + * Copyright 2019-2022,2023 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 * @@ -29,14 +30,15 @@ /* * 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.22 2023/05/27 20:13:10 tom Exp $ * * A simple demo of the sgr/sgr0 terminal capabilities. */ #define USE_TINFO #include -static void failed(const char *) GCC_NORETURN; +#if !HAVE_TIGETSTR +static GCC_NORETURN void failed(const char *); static void failed(const char *msg) @@ -44,9 +46,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; @@ -57,10 +61,11 @@ static int db_item; static long total_values; static char * -make_dbitem(char *p, char *q) +make_dbitem(const char *const p, const char *const 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; } @@ -111,11 +116,11 @@ next_dbitem(void) db_item++; } } - printf("** %s\n", result); + printf("** %s\n", result ? result : ""); return result; } -#ifdef NO_LEAKS +#if NO_LEAKS static void free_dblist(void) { @@ -143,10 +148,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 +183,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 +214,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 +249,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,57 +296,73 @@ brute_force(const char *name) } } } + for (count = 0; count < MAXSGR; ++count) { + free(values[count]); + } } + free(my_name); del_curterm(cur_term); } static void -usage(void) +usage(int ok) { static const char *msg[] = { - "Usage: test_sgr [options] [terminal]", - "", - "Print all distinct combinations of sgr capability.", - "", - "Options:", - " -d LIST colon-separated list of databases to use", - " -e NAME environment variable to set with -d option", - " -q quiet (prints only counts)", + "Usage: test_sgr [options] [terminal]" + ,"" + ,"Print all distinct combinations of sgr capability." + ,"" + ,USAGE_COMMON + ,"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; for (n = 0; n < SIZEOF(msg); ++n) { fprintf(stderr, "%s\n", msg[n]); } - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { - int n; + int ch; char *name; - while ((n = getopt(argc, argv, "d:e:q")) != -1) { - switch (n) { + while ((ch = getopt(argc, argv, OPTS_COMMON "d:e:nq")) != -1) { + switch (ch) { case 'd': d_opt = optarg; break; case 'e': e_opt = optarg; break; + case 'n': + no_init = TRUE; + break; case 'q': q_opt = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } make_dblist(); if (optind < argc) { + int n; for (n = optind; n < argc; ++n) { brute_force(argv[n]); } @@ -346,7 +375,7 @@ main(int argc, char *argv[]) printf("%ld distinct values\n", total_values); -#ifdef NO_LEAKS +#if NO_LEAKS free_dblist(); #endif @@ -355,7 +384,7 @@ main(int argc, char *argv[]) #else /* !HAVE_TIGETSTR */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(void) { failed("This program requires the terminfo functions such as tigetstr"); ExitProgram(EXIT_FAILURE);