ncurses 6.3 - patch 20221203

[ncurses.git] / test / test_vidputs.c

diff --git a/test/test_vidputs.c b/test/test_vidputs.c
index 25b7714dcf7b803c1d28a236d39c09925d4c1b46..d7bbfcb2b7fdbe57de8f0f0f0ec60393b8614d2b 100644 (file)
--- a/test/test_vidputs.c
+++ b/test/test_vidputs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2022 Thomas E. Dickey                                *
  * Copyright 2013-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_vidputs.c,v 1.11 2021/04/25 00:10:43 tom Exp $
+ * $Id: test_vidputs.c,v 1.14 2022/12/04 00:40:11 tom Exp $
  *
  * Demonstrate the vidputs and vidattr functions.
  * Thomas Dickey - 2013/01/12
@@ -94,22 +94,26 @@ test_vidputs(void)
 }
 
 static void
-usage(void)
+usage(int ok)
 {
     static const char *tbl[] =
     {
        "Usage: test_vidputs [options]"
        ,""
+       ,USAGE_COMMON
        ,"Options:"
-       ,"  -e      use stderr (default stdout)"
-       ,"  -n      do not initialize terminal"
-       ,"  -p      use vidputs (default vidattr)"
+       ," -e       use stderr (default stdout)"
+       ," -n       do not initialize terminal"
+       ," -p       use vidputs (default vidattr)"
     };
     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)
@@ -119,7 +123,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 
     my_fp = stdout;
 
-    while ((ch = getopt(argc, argv, "enp")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "enp")) != -1) {
        switch (ch) {
        case 'e':
            my_fp = stderr;
@@ -130,13 +134,16 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
        case 'p':
            p_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);
 
     if (no_init) {
        START_TRACE();