ncurses 6.3 - patch 20221203

[ncurses.git] / test / tclock.c

diff --git a/test/tclock.c b/test/tclock.c
index 23ceb6bf102fd809c9308dc53d833b2de80b7aca..0773b3b76e384e0c7c4b0b702ec904bb3e74e416 100644 (file)
--- a/test/tclock.c
+++ b/test/tclock.c
@@ -1,4 +1,4 @@
-/* $Id: tclock.c,v 1.43 2022/07/27 19:23:01 tom Exp $ */
+/* $Id: tclock.c,v 1.46 2022/12/04 00:40:11 tom Exp $ */
 
 #define NEED_TIME_H
 #include <test.priv.h>
@@ -107,12 +107,13 @@ dline(int pair, int from_x, int from_y, int x2, int y2, int ch)
 }
 
 static void
-usage(void)
+usage(int ok)
 {
     static const char *msg[] =
     {
        "Usage: tclock [options]"
        ,""
+       ,USAGE_COMMON
        ,"Options:"
 #if HAVE_USE_DEFAULT_COLORS
        ," -d       invoke use_default_colors"
@@ -123,8 +124,11 @@ usage(void)
     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[])
@@ -151,20 +155,23 @@ main(int argc, char *argv[])
     bool d_option = FALSE;
 #endif
 
-    while ((ch = getopt(argc, argv, "d")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "d")) != -1) {
        switch (ch) {
 #if HAVE_USE_DEFAULT_COLORS
        case 'd':
            d_option = TRUE;
            break;
 #endif
+       case OPTS_VERSION:
+           show_version(argv);
+           ExitProgram(EXIT_SUCCESS);
        default:
-           usage();
+           usage(ch == OPTS_USAGE);
            /* NOTREACHED */
        }
     }
     if (optind < argc)
-       usage();
+       usage(FALSE);
 
     setlocale(LC_ALL, "");