ncurses 5.9 - patch 20130209

[ncurses.git] / test / railroad.c

diff --git a/test/railroad.c b/test/railroad.c
index fd773c8c52e7695e286bb0b99fcebec8a5775e45..dca2f9144b5b03d8a8da5aff22c0734662c8d2b0 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-2008,2009 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            *
  *                                                                          *
  * 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.20 2011/04/23 19:15:04 tom Exp $

  *
  * A simple demo of the termcap interface.
  */
  *
  * A simple demo of the termcap interface.
  */

+#define USE_TINFO

 #include <test.priv.h>
 
 #include <test.priv.h>
 

-#include <ctype.h>
+#if HAVE_TGETENT

 
 static char *wipeit;
 static char *moveit;
 
 static char *wipeit;
 static char *moveit;


@@ -54,16 +55,20 @@ static char *backup;
 
 static bool interrupted = FALSE;
 
 
 static bool interrupted = FALSE;
 

-static int
-outc(int c)
+static
+TPUTS_PROTO(outc, c)

 {
 {

+    int rc = OK;
+

     if (interrupted) {
     if (interrupted) {

-       char tmp = c;
-       write(STDOUT_FILENO, &tmp, 1);
+       char tmp = (char) c;
+       if (write(STDOUT_FILENO, &tmp, 1) == -1)
+           rc = ERR;

     } else {
     } else {

-       putc(c, stdout);
+       if (putc(c, stdout) == EOF)
+           rc = ERR;

     }
     }

-    return 0;
+    TPUTS_RETURN(rc);

 }
 
 static void
 }
 
 static void


@@ -81,7 +86,7 @@ Backup(void)
 }
 
 static void
 }
 
 static void

-ShowCursor(int flag)
+MyShowCursor(int flag)

 {
     if (startC != 0 && finisC != 0) {
        tputs(flag ? startC : finisC, 1, outc);
 {
     if (startC != 0 && finisC != 0) {
        tputs(flag ? startC : finisC, 1, outc);


@@ -165,7 +170,7 @@ cleanup(void)
 {
     Underline(0);
     StandOut(0);
 {
     Underline(0);
     StandOut(0);

-    ShowCursor(1);
+    MyShowCursor(1);

 }
 
 static void
 }
 
 static void


@@ -182,11 +187,10 @@ railroad(char **args)
     NCURSES_CONST char *name = getenv("TERM");
     char buffer[1024];
     char area[1024], *ap = area;
     NCURSES_CONST char *name = getenv("TERM");
     char buffer[1024];
     char area[1024], *ap = area;

-    int j;

 
     if (name == 0)
        name = "dumb";
 
     if (name == 0)
        name = "dumb";

-    if (tgetent(buffer, name)) {
+    if (tgetent(buffer, name) >= 0) {

 
        wipeit = tgetstr("ce", &ap);
        height = tgetnum("li");
 
        wipeit = tgetstr("ce", &ap);
        height = tgetnum("li");


@@ -214,16 +218,14 @@ railroad(char **args)
        startC = tgetstr("ve", &ap);
        finisC = tgetstr("vi", &ap);
 
        startC = tgetstr("ve", &ap);
        finisC = tgetstr("vi", &ap);
 

-       ShowCursor(0);
+       MyShowCursor(0);

 
 

-       for (j = SIGHUP; j <= SIGTERM; j++)
-           if (signal(j, SIG_IGN) != SIG_IGN)
-               signal(j, onsig);
+       CATCHALL(onsig);

 
        while (*args) {
            ShowSign(*args++);
        }
 
        while (*args) {
            ShowSign(*args++);
        }

-       ShowCursor(1);
+       MyShowCursor(1);

     }
 }
 
     }
 }
 


@@ -240,3 +242,13 @@ main(int argc, char *argv[])
     }
     ExitProgram(EXIT_SUCCESS);
 }
     }
     ExitProgram(EXIT_SUCCESS);
 }

+
+#else
+int
+main(int argc GCC_UNUSED,
+     char *argv[]GCC_UNUSED)
+{
+    printf("This program requires termcap\n");
+    exit(EXIT_FAILURE);
+}
+#endif