ncurses 6.4 - patch 20231202

[ncurses.git] / test / dots_xcurses.c

diff --git a/test/dots_xcurses.c b/test/dots_xcurses.c
index b640c2b612677224bec116fb965e904f085614a7..b4b52193d2621e569e4b2e6f1eb097e866a90e71 100644 (file)
--- a/test/dots_xcurses.c
+++ b/test/dots_xcurses.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 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_xcurses.c,v 1.24 2020/08/29 16:22:03 juergen Exp $
+ * $Id: dots_xcurses.c,v 1.29 2023/01/07 17:21:48 tom Exp $
  *
  * A simple demo of the wide-curses interface used for comparison with termcap.
  */
@@ -110,12 +110,13 @@ set_colors(int fg, int bg)
 }
 
 static void
-usage(void)
+usage(int ok)
 {
     static const char *msg[] =
     {
        "Usage: dots_xcurses [options]"
        ,""
+       ,USAGE_COMMON
        ,"Options:"
        ," -T TERM  override $TERM"
 #if HAVE_USE_DEFAULT_COLORS
@@ -136,8 +137,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[])
@@ -155,13 +159,14 @@ main(int argc, char *argv[])
     size_t need;
     char *my_env;
 
-    while ((ch = getopt(argc, argv, "T:dem:r:s:x")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "T:dem:r:s:x")) != -1) {
        switch (ch) {
        case 'T':
            need = 6 + strlen(optarg);
-           my_env = malloc(need);
-           _nc_SPRINTF(my_env, _nc_SLIMIT(need) "TERM=%s", optarg);
-           putenv(my_env);
+           if ((my_env = malloc(need)) != NULL) {
+               _nc_SPRINTF(my_env, _nc_SLIMIT(need) "TERM=%s", optarg);
+               putenv(my_env);
+           }
            break;
 #if HAVE_USE_DEFAULT_COLORS
        case 'd':
@@ -187,12 +192,16 @@ main(int argc, char *argv[])
            x_option = TRUE;
            break;
 #endif
+       case OPTS_VERSION:
+           show_version(argv);
+           ExitProgram(EXIT_SUCCESS);
        default:
-           usage();
-           break;
+           usage(ch == OPTS_USAGE);
+           /* NOTREACHED */
        }
     }
 
+    setlocale(LC_ALL, "");
     srand((unsigned) time(0));
 
     SetupAlarm(r_option);