X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ffilter.c;h=c3ea3c1882b2866317cf9b1632b6a12d32bd8920;hp=5d161cb64d6efca989a9e7e813cb2b23ccc04a4e;hb=46722468f47c2b77b3987729b4bcf2321cccfd01;hpb=b1f61d9f3aa244512045a6b02e759825d7049d34

diff --git a/test/filter.c b/test/filter.c
index 5d161cb6..c3ea3c18 100644
--- a/test/filter.c
+++ b/test/filter.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2001,2002 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.3 1999/11/13 23:39:19 tom Exp $
+ * $Id: filter.c,v 1.7 2002/03/23 23:02:15 tom Exp $
  */
 #include <test.priv.h>
 
@@ -45,65 +45,59 @@
  * and refresh(), but that does not work any better.
  */
 
-#ifndef NCURSES_VERSION
-#define attr_t long
-#define getnstr(s,n) getstr(s)
-#endif
-
-static int new_command(char *buffer, int length, attr_t underline)
+static int
+new_command(char *buffer, int length, attr_t underline)
 {
-	int code;
+    int code;
 
-	attron(A_BOLD);
-	printw("Command: ");
-	attron(underline);
-	code = getnstr(buffer, length);
-	attroff(underline);
-	attroff(A_BOLD);
-	printw("\n");
+    attron(A_BOLD);
+    printw("Command: ");
+    attron(underline);
+    code = getnstr(buffer, length);
+    attroff(underline);
+    attroff(A_BOLD);
+    printw("\n");
 
-	return code;
+    return code;
 }
 
-int main(
-	int argc GCC_UNUSED,
-	char *argv[] GCC_UNUSED)
+int
+main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 {
-	SCREEN *sp;
-	char buffer[80];
-	attr_t underline;
+    char buffer[80];
+    attr_t underline;
 
-	filter();
-	sp = newterm((char *)0, stdout, stdin);
-	cbreak();
-	keypad(stdscr, TRUE);
+    filter();
+    (void) newterm((char *) 0, stdout, stdin);
+    cbreak();
+    keypad(stdscr, TRUE);
 
-	if (has_colors()) {
-		int background = COLOR_BLACK;
-		start_color();
-#ifdef HAVE_USE_DEFAULT_COLORS
-		if (use_default_colors () != ERR)
-			background = -1;
+    if (has_colors()) {
+	int background = COLOR_BLACK;
+	start_color();
+#if HAVE_USE_DEFAULT_COLORS
+	if (use_default_colors() != ERR)
+	    background = -1;
 #endif
-		init_pair(1, COLOR_CYAN, background);
-		underline = COLOR_PAIR(1);
-	} else {
-		underline = A_UNDERLINE;
-	}
+	init_pair(1, COLOR_CYAN, background);
+	underline = COLOR_PAIR(1);
+    } else {
+	underline = A_UNDERLINE;
+    }
 
-	while (new_command(buffer, sizeof(buffer)-1, underline) != ERR
-	  && strlen(buffer) != 0) {
-       		reset_shell_mode();
-		printf("\n");
-		fflush(stdout);
-		system(buffer);
-		reset_prog_mode();
-		touchwin(stdscr);
-		erase();
-		refresh();
-	}
-	printw("done");
+    while (new_command(buffer, sizeof(buffer) - 1, underline) != ERR
+	   && strlen(buffer) != 0) {
+	reset_shell_mode();
+	printf("\n");
+	fflush(stdout);
+	system(buffer);
+	reset_prog_mode();
+	touchwin(stdscr);
+	erase();
 	refresh();
-	endwin();
-	return 0;
+    }
+    printw("done");
+    refresh();
+    endwin();
+    ExitProgram(EXIT_SUCCESS);
 }