X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ffilter.c;h=6cd9206b274d44b1d6646e839c6cba1dabfa52d0;hp=2bd9b20f881d4a1651b48d3035c259c70bc8c7da;hb=HEAD;hpb=989279b4d718c26ccc7bad2dfba099e4788f5da3

diff --git a/test/filter.c b/test/filter.c
index 2bd9b20f..b7444569 100644
--- a/test/filter.c
+++ b/test/filter.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ * Copyright 1998-2016,2017 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            *
@@ -29,7 +30,7 @@
 /*
  * Author:  Thomas E. Dickey 1998
  *
- * $Id: filter.c,v 1.31 2017/09/10 19:49:55 tom Exp $
+ * $Id: filter.c,v 1.38 2022/12/04 00:40:11 tom Exp $
  *
  * An example of the 'filter()' function in ncurses, this program prompts
  * for commands and executes them (like a command shell).  It illustrates
@@ -41,6 +42,7 @@
  * reset_shell_mode() and reset_prog_mode() functions, we could invoke endwin()
  * and refresh(), but that does not work any better.
  */
+#define NEED_KEY_EVENT
 #include <test.priv.h>
 
 #if HAVE_FILTER
@@ -100,12 +102,11 @@ static int
 new_command(char *buffer, int length, int underline, bool clocked, bool polled)
 {
     int code = OK;
-    int limit;
 
     if (polled) {
 	bool done = FALSE;
 	bool first = TRUE;
-	int y, x;
+	int y = 0, x = 0;
 	int n;
 	int mark = 0;
 	int used = 0;
@@ -113,6 +114,7 @@ new_command(char *buffer, int length, int underline, bool clocked, bool polled)
 
 	timeout(20);		/* no one types 50CPS... */
 	while (!done) {
+	    int limit;
 	    int ch = getch();
 
 	    buffer[used] = '\0';
@@ -297,28 +299,32 @@ cancel_altscreen(void)
 #endif
 
 static void
-usage(void)
+usage(int ok)
 {
     static const char *msg[] =
     {
 	"Usage: filter [options]"
 	,""
+	,USAGE_COMMON
 	,"Options:"
 #ifdef NCURSES_VERSION
-	,"  -a   suppress xterm alternate-screen by amending smcup/rmcup"
+	," -a       suppress xterm alternate-screen by amending smcup/rmcup"
 #endif
-	,"  -c   show current time on prompt line with \"Command\""
+	," -c       show current time on prompt line with \"Command\""
 #if HAVE_USE_DEFAULT_COLORS
-	,"  -d   invoke use_default_colors"
+	," -d       invoke use_default_colors"
 #endif
-	,"  -i   use initscr() rather than newterm()"
-	,"  -p   poll for individual characters rather than using getnstr"
+	," -i       use initscr() rather than newterm()"
+	," -p       poll for individual characters rather than using getnstr"
     };
     unsigned n;
     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[])
@@ -338,7 +344,7 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    while ((ch = getopt(argc, argv, "adcip")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "adcip")) != -1) {
 	switch (ch) {
 #ifdef NCURSES_VERSION
 	case 'a':
@@ -359,8 +365,12 @@ main(int argc, char *argv[])
 	case 'p':
 	    p_option = TRUE;
 	    break;
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
 	default:
-	    usage();
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
 	}
     }