X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;ds=sidebyside;f=test%2Fcolor_set.c;h=5510a0fdba44e65c899589d09070fa7b45bccce6;hb=b97ea58e03d5faebed2166faa4e0e590f2cdea34;hp=8d8d4b090cdebf8a2b0f3bc7afa280b17387b6b7;hpb=027ae42953e3186daed8f3882da73de48291b606;p=ncurses.git

diff --git a/test/color_set.c b/test/color_set.c
index 8d8d4b09..5510a0fd 100644
--- a/test/color_set.c
+++ b/test/color_set.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2003-2004,2006 Free Software Foundation, Inc.              *
+ * Copyright 2020,2020,2022 Thomas E. Dickey                                *
+ * Copyright 2003-2012,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -26,30 +27,66 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: color_set.c,v 1.5 2006/06/03 16:40:10 tom Exp $
+ * $Id: color_set.c,v 1.12 2022/12/10 23:36:59 tom Exp $
  */
 
 #include <test.priv.h>
 
-#ifdef HAVE_COLOR_SET
+#if HAVE_COLOR_SET
 
 #define SHOW(n) ((n) == ERR ? "ERR" : "OK")
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: color_set [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
-    short f, b;
-    int i;
+    NCURSES_COLOR_T f, b;
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
 
+    setlocale(LC_ALL, "");
     initscr();
     cbreak();
     noecho();
 
     if (has_colors()) {
+	int i;
+
 	start_color();
 
-	pair_content(0, &f, &b);
-	printw("pair 0 contains (%d,%d)\n", f, b);
+	(void) pair_content(0, &f, &b);
+	printw("pair 0 contains (%d,%d)\n", (int) f, (int) b);
 	getch();
 
 	printw("Initializing pair 1 to red/black\n");