X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;ds=sidebyside;f=test%2Fhanoi.c;fp=test%2Fhanoi.c;h=6d92332fa095d216cee977c1df9844672f2a4e1d;hb=6641601a9dd7f34deeaa978899b3730b27635afb;hp=034878abb526fa6668646366de4b5b43af730a6b;hpb=205ea499dbbceba5201d997fbd8b6b1f7f29bd50;p=ncurses.git

diff --git a/test/hanoi.c b/test/hanoi.c
index 034878ab..6d92332f 100644
--- a/test/hanoi.c
+++ b/test/hanoi.c
@@ -42,7 +42,7 @@
  *
  *	Date: 05.Nov.90
  *
- * $Id: hanoi.c,v 1.44 2022/07/28 00:31:22 tom Exp $
+ * $Id: hanoi.c,v 1.47 2022/12/04 00:40:11 tom Exp $
  */
 
 #include <test.priv.h>
@@ -241,12 +241,13 @@ Solved(int NumTiles)
 }
 
 static void
-usage(void)
+usage(int ok)
 {
     static const char *msg[] =
     {
 	"Usage: hanoi [options] [[<No Of Tiles>] [a]]"
 	,""
+	,USAGE_COMMON
 	,"Options:"
 #if HAVE_USE_DEFAULT_COLORS
 	," -d       invoke use_default_colors"
@@ -259,8 +260,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)
@@ -272,7 +276,7 @@ main(int argc, char **argv)
 #endif
 
     NTiles = DEFAULTTILES;
-    while ((ch = getopt(argc, argv, "dn:X")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "dn:X")) != -1) {
 	switch (ch) {
 #if HAVE_USE_DEFAULT_COLORS
 	case 'd':
@@ -285,8 +289,11 @@ main(int argc, char **argv)
 	case 'X':
 	    AutoFlag = TRUE;
 	    break;
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
 	default:
-	    usage();
+	    usage(ch == OPTS_USAGE);
 	    /* NOTREACHED */
 	}
     }
@@ -295,7 +302,7 @@ main(int argc, char **argv)
     switch (argc - optind) {
     case 2:
 	if (strcmp(argv[optind + 1], "a")) {
-	    usage();
+	    usage(FALSE);
 	}
 	AutoFlag = TRUE;
 	/* FALLTHRU */
@@ -305,12 +312,12 @@ main(int argc, char **argv)
     case 0:
 	break;
     default:
-	usage();
+	usage(FALSE);
     }
 
     if (NTiles > MAXTILES || NTiles < MINTILES) {
 	fprintf(stderr, "Range %d to %d\n", MINTILES, MAXTILES);
-	usage();
+	usage(FALSE);
     }
 
     initscr();