ncurses 5.9 - patch 20150307

[ncurses.git] / test / filter.c

diff --git a/test/filter.c b/test/filter.c
index bdcea3673301e83bc41f7b5d9a53e08814389d11..ab2d8562d996bf66799db66e717d9c3dbd4bdc78 100644 (file)
--- a/test/filter.c
+++ b/test/filter.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-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            *
@@ -29,7 +29,7 @@
 /*
  * Author:  Thomas E. Dickey <dickey@clark.net> 1998
  *
- * $Id: filter.c,v 1.11 2006/12/09 16:53:47 tom Exp $
+ * $Id: filter.c,v 1.16 2014/08/09 22:35:51 tom Exp $
  */
 #include <test.priv.h>
 
@@ -48,7 +48,7 @@
  */
 
 static int
-new_command(char *buffer, int length, attr_t underline)
+new_command(char *buffer, int length, int underline)
 {
     int code;
 
@@ -78,16 +78,50 @@ new_command(char *buffer, int length, attr_t underline)
     return code;
 }
 
+static void
+usage(void)
+{
+    static const char *msg[] =
+    {
+       "Usage: filter [options]"
+       ,""
+       ,"Options:"
+       ,"  -i   use initscr() rather than newterm()"
+    };
+    unsigned n;
+    for (n = 0; n < SIZEOF(msg); n++)
+       fprintf(stderr, "%s\n", msg[n]);
+    ExitProgram(EXIT_FAILURE);
+}
+
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
+    int ch;
     char buffer[80];
-    attr_t underline;
+    int underline;
+    bool i_option = FALSE;
 
     setlocale(LC_ALL, "");
 
+    while ((ch = getopt(argc, argv, "i")) != -1) {
+       switch (ch) {
+       case 'i':
+           i_option = TRUE;
+           break;
+       default:
+           usage();
+       }
+    }
+
+    printf("starting filter program using %s...\n",
+          i_option ? "initscr" : "newterm");
     filter();
-    (void) newterm((char *) 0, stdout, stdin);
+    if (i_option) {
+       initscr();
+    } else {
+       (void) newterm((char *) 0, stdout, stdin);
+    }
     cbreak();
     keypad(stdscr, TRUE);
 
@@ -98,7 +132,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
        if (use_default_colors() != ERR)
            background = -1;
 #endif
-       init_pair(1, COLOR_CYAN, background);
+       init_pair(1, COLOR_CYAN, (short) background);
        underline = COLOR_PAIR(1);
     } else {
        underline = A_UNDERLINE;
@@ -109,7 +143,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
        reset_shell_mode();
        printf("\n");
        fflush(stdout);
-       system(buffer);
+       IGNORE_RC(system(buffer));
        reset_prog_mode();
        touchwin(stdscr);
        erase();