X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ffilter.c;h=1ecf28155a192e31e6d26ad9f7cb3bcde5d20d7f;hp=89096ba370ff3c0082b89af0d2ddd34474faaa48;hb=9b4c4abadc0a29999c5ddad5aa8d769fee28d687;hpb=29a36e53e1f77a0c3672f2e267d573823d6a9a60

diff --git a/test/filter.c b/test/filter.c
index 89096ba3..1ecf2815 100644
--- a/test/filter.c
+++ b/test/filter.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2014,2016 Free Software Foundation, Inc.              *
+ * Copyright 2019,2020 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.26 2016/08/20 20:38:56 tom Exp $
+ * $Id: filter.c,v 1.34 2020/02/02 23:34:34 tom Exp $
  *
  * An example of the 'filter()' function in ncurses, this program prompts
  * for commands and executes them (like a command shell).  It illustrates
@@ -68,10 +69,10 @@ show_prompt(int underline, bool clocked)
 	    int skip, y, x;
 	    int margin;
 
-	    sprintf(buffer, "%02d:%02d:%02d",
-		    my->tm_hour,
-		    my->tm_min,
-		    my->tm_sec);
+	    _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) "%02d:%02d:%02d",
+			my->tm_hour,
+			my->tm_min,
+			my->tm_sec);
 
 	    if (limit > 9) {
 		skip = 0;
@@ -100,12 +101,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 +113,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';
@@ -242,18 +243,18 @@ new_command(char *buffer, int length, int underline, bool clocked, bool polled)
 	 */
 #ifdef KEY_EVENT
 	if (code == KEY_EVENT)
-	    strcpy(buffer, "# event!");
+	    _nc_STRCPY(buffer, "# event!", length);
 #endif
 #ifdef KEY_RESIZE
 	if (code == KEY_RESIZE) {
-	    strcpy(buffer, "# resize!");
+	    _nc_STRCPY(buffer, "# resize!", length);
 	    getch();
 	}
 #endif
     }
     attroff(underline);
     attroff(A_BOLD);
-    printw("\n");
+    refresh();
 
     return code;
 }
@@ -308,6 +309,9 @@ usage(void)
 	,"  -a   suppress xterm alternate-screen by amending smcup/rmcup"
 #endif
 	,"  -c   show current time on prompt line with \"Command\""
+#if HAVE_USE_DEFAULT_COLORS
+	,"  -d   invoke use_default_colors"
+#endif
 	,"  -i   use initscr() rather than newterm()"
 	,"  -p   poll for individual characters rather than using getnstr"
     };
@@ -327,12 +331,15 @@ main(int argc, char *argv[])
     bool a_option = FALSE;
 #endif
     bool c_option = FALSE;
+#if HAVE_USE_DEFAULT_COLORS
+    bool d_option = FALSE;
+#endif
     bool i_option = FALSE;
     bool p_option = FALSE;
 
     setlocale(LC_ALL, "");
 
-    while ((ch = getopt(argc, argv, "acip")) != -1) {
+    while ((ch = getopt(argc, argv, "adcip")) != -1) {
 	switch (ch) {
 #ifdef NCURSES_VERSION
 	case 'a':
@@ -342,6 +349,11 @@ main(int argc, char *argv[])
 	case 'c':
 	    c_option = TRUE;
 	    break;
+#if HAVE_USE_DEFAULT_COLORS
+	case 'd':
+	    d_option = TRUE;
+	    break;
+#endif
 	case 'i':
 	    i_option = TRUE;
 	    break;
@@ -359,7 +371,10 @@ main(int argc, char *argv[])
     if (i_option) {
 	initscr();
     } else {
-	(void) newterm((char *) 0, stdout, stdin);
+	if (newterm((char *) 0, stdout, stdin) == 0) {
+	    fprintf(stderr, "cannot initialize terminal\n");
+	    ExitProgram(EXIT_FAILURE);
+	}
     }
 #ifdef NCURSES_VERSION
     if (a_option) {
@@ -373,7 +388,7 @@ main(int argc, char *argv[])
 	int background = COLOR_BLACK;
 	start_color();
 #if HAVE_USE_DEFAULT_COLORS
-	if (use_default_colors() != ERR)
+	if (d_option && (use_default_colors() != ERR))
 	    background = -1;
 #endif
 	init_pair(1, COLOR_CYAN, (short) background);