diff options
Diffstat (limited to 'test/test_add_wchstr.c')
| -rw-r--r-- | test/test_add_wchstr.c | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/test/test_add_wchstr.c b/test/test_add_wchstr.c index e2c8b6677faa..f69e1ddc271a 100644 --- a/test/test_add_wchstr.c +++ b/test/test_add_wchstr.c @@ -1,6 +1,6 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * - * Copyright 2009-2016,2017 Free Software Foundation, Inc. * + * Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 2009-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 * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_add_wchstr.c,v 1.27 2020/02/02 23:34:34 tom Exp $ + * $Id: test_add_wchstr.c,v 1.34 2022/12/10 22:28:50 tom Exp $ * * Demonstrate the waddwchstr() and wadd_wch functions. * Thomas Dickey - 2009/9/12 @@ -132,10 +132,11 @@ ChWLen(const wchar_t *source) if (!pass_ctls) { size_t adjust = 0; size_t n; - const char *s; - for (n = 0; n < result; ++n) { - if (source[n] < 256 && (s = unctrl((chtype) source[n])) != 0) { + for (n = 0; source[n] != 0; ++n) { + const char *s; + + if ((source[n] < 256) && (s = unctrl((chtype) source[n])) != 0) { adjust += (strlen(s) - 1); } } @@ -190,7 +191,7 @@ legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length) } static int -ColOf(wchar_t *buffer, int length, int margin) +ColOf(const wchar_t *buffer, int length, int margin) { int n; int result; @@ -541,33 +542,37 @@ recursive_test(int level) } static void -usage(void) +usage(int ok) { static const char *tbl[] = { "Usage: test_add_wchstr [options]" ,"" + ,USAGE_COMMON ,"Options:" - ," -f FILE read data from given file" - ," -n NUM limit string-adds to NUM bytes on ^N replay" - ," -m perform wmove/move separately from add-functions" - ," -p pass-thru control characters without using unctrl()" - ," -w use window-parameter even when stdscr would be implied" + ," -f FILE read data from given file" + ," -n NUM limit string-adds to NUM bytes on ^N replay" + ," -m perform wmove/move separately from add-functions" + ," -p pass-thru control characters without using unctrl()" + ," -w use window-parameter even when stdscr would be implied" }; unsigned n; for (n = 0; n < SIZEOF(tbl); ++n) fprintf(stderr, "%s\n", tbl[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { int ch; setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "f:mn:pw")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "f:mn:pw")) != -1) { switch (ch) { case 'f': init_linedata(optarg); @@ -586,13 +591,16 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) case 'w': w_opt = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); recursive_test(0); endwin(); |