ncurses 6.3 - patch 20221203

[ncurses.git] / test / dots_termcap.c

diff --git a/test/dots_termcap.c b/test/dots_termcap.c
index 5e4c17d1adaf8288de69f3877d9f2d2c6fa90429..aa1d1988780631dd5c5b37d0fda6ab9159a415ab 100644 (file)
--- a/test/dots_termcap.c
+++ b/test/dots_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2018-2020,2022 Thomas E. Dickey                                *
  * Copyright 2013-2014,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: dots_termcap.c,v 1.26 2020/09/05 17:58:47 juergen Exp $
+ * $Id: dots_termcap.c,v 1.29 2022/12/04 00:40:11 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
@@ -180,12 +180,13 @@ get_number(NCURSES_CONST char *cap, const char *env)
 }
 
 static void
-usage(void)
+usage(int ok)
 {
     static const char *msg[] =
     {
        "Usage: dots_termcap [options]"
        ,""
+       ,USAGE_COMMON
        ,"Options:"
        ," -T TERM  override $TERM"
        ," -e       allow environment $LINES / $COLUMNS"
@@ -198,8 +199,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[])
@@ -220,7 +224,7 @@ main(int argc, char *argv[])
     size_t need;
     char *my_env;
 
-    while ((ch = getopt(argc, argv, "T:em:r:s:")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "T:em:r:s:")) != -1) {
        switch (ch) {
        case 'T':
            need = 6 + strlen(optarg);
@@ -240,9 +244,12 @@ main(int argc, char *argv[])
        case 's':
            s_option = atoi(optarg);
            break;
+       case OPTS_VERSION:
+           show_version(argv);
+           ExitProgram(EXIT_SUCCESS);
        default:
-           usage();
-           break;
+           usage(ch == OPTS_USAGE);
+           /* NOTREACHED */
        }
     }