ncurses 5.6 - patch 20080804

[ncurses.git] / test / railroad.c

diff --git a/test/railroad.c b/test/railroad.c
index fd773c8c52e7695e286bb0b99fcebec8a5775e45..160823d43cfc8e653efe12faeda7cc79350e9dba 100644 (file)
--- a/test/railroad.c
+++ b/test/railroad.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2000-2001,2002 Free Software Foundation, Inc.              *
+ * Copyright (c) 2000-2007,2008 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            *
@@ -27,15 +27,16 @@
  ****************************************************************************/
 
 /*
- * Author: Thomas E. Dickey <dickey@clark.net> 2000
+ * Author: Thomas E. Dickey - 2000
  *
- * $Id: railroad.c,v 1.10 2002/04/06 20:45:22 tom Exp $
+ * $Id: railroad.c,v 1.16 2008/02/09 18:08:43 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
+#define USE_TINFO
 #include <test.priv.h>
 
-#include <ctype.h>
+#if HAVE_TGETENT
 
 static char *wipeit;
 static char *moveit;
@@ -55,7 +56,7 @@ static char *backup;
 static bool interrupted = FALSE;
 
 static int
-outc(int c)
+outc(TPUTS_ARG c)
 {
     if (interrupted) {
        char tmp = c;
@@ -182,11 +183,10 @@ railroad(char **args)
     NCURSES_CONST char *name = getenv("TERM");
     char buffer[1024];
     char area[1024], *ap = area;
-    int j;
 
     if (name == 0)
        name = "dumb";
-    if (tgetent(buffer, name)) {
+    if (tgetent(buffer, name) >= 0) {
 
        wipeit = tgetstr("ce", &ap);
        height = tgetnum("li");
@@ -216,9 +216,7 @@ railroad(char **args)
 
        ShowCursor(0);
 
-       for (j = SIGHUP; j <= SIGTERM; j++)
-           if (signal(j, SIG_IGN) != SIG_IGN)
-               signal(j, onsig);
+       CATCHALL(onsig);
 
        while (*args) {
            ShowSign(*args++);
@@ -240,3 +238,13 @@ main(int argc, char *argv[])
     }
     ExitProgram(EXIT_SUCCESS);
 }
+
+#else
+int
+main(int argc GCC_UNUSED,
+     char *argv[]GCC_UNUSED)
+{
+    printf("This program requires termcap\n");
+    exit(EXIT_FAILURE);
+}
+#endif