diff options
Diffstat (limited to 'test/test_sgr.c')
| -rw-r--r-- | test/test_sgr.c | 52 |
1 files changed, 30 insertions, 22 deletions
diff --git a/test/test_sgr.c b/test/test_sgr.c index aeb833cf9e10..8763dca3cd34 100644 --- a/test/test_sgr.c +++ b/test/test_sgr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * 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 * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: test_sgr.c,v 1.15 2020/02/02 23:34:34 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. */ @@ -38,7 +38,7 @@ #include <test.priv.h> #if !HAVE_TIGETSTR -static void failed(const char *) GCC_NORETURN; +static GCC_NORETURN void failed(const char *); static void failed(const char *msg) @@ -61,7 +61,7 @@ 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) { size_t need = strlen(e_opt) + 2 + (size_t) (p - q); char *result = malloc(need); @@ -116,7 +116,7 @@ next_dbitem(void) db_item++; } } - printf("** %s\n", result); + printf("** %s\n", result ? result : "<null>"); return result; } @@ -305,35 +305,39 @@ brute_force(const char *name) } 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", - " -n do not initialize terminal, to test error-checking", - " -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:nq")) != -1) { - switch (n) { + while ((ch = getopt(argc, argv, OPTS_COMMON "d:e:nq")) != -1) { + switch (ch) { case 'd': d_opt = optarg; break; @@ -346,15 +350,19 @@ main(int argc, char *argv[]) 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]); } @@ -376,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); |