ncurses 6.2 - patch 20200718

[ncurses.git] / test / railroad.c

diff --git a/test/railroad.c b/test/railroad.c
index fc3391329f1a6d3b2b9940e47e8be3999c913593..e3558b0d77bbf95b56f5332da6e06a2afc233f99 100644 (file)
--- a/test/railroad.c
+++ b/test/railroad.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2000-2005,2006 Free Software Foundation, Inc.              *
+ * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2000-2013,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,10 +30,11 @@
 /*
  * Author: Thomas E. Dickey - 2000
  *
- * $Id: railroad.c,v 1.14 2006/05/20 16:02:04 tom Exp $
+ * $Id: railroad.c,v 1.24 2020/02/02 23:34:34 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
+#define USE_TINFO
 #include <test.priv.h>
 
 #if HAVE_TGETENT
@@ -54,16 +56,20 @@ static char *backup;
 
 static bool interrupted = FALSE;
 
-static int
-outc(int c)
+static
+TPUTS_PROTO(outc, c)
 {
+    int rc = OK;
+
     if (interrupted) {
-       char tmp = c;
-       write(STDOUT_FILENO, &tmp, 1);
+       char tmp = (char) c;
+       if (write(STDOUT_FILENO, &tmp, (size_t) 1) == -1)
+           rc = ERR;
     } else {
-       putc(c, stdout);
+       if (putc(c, stdout) == EOF)
+           rc = ERR;
     }
-    return 0;
+    TPUTS_RETURN(rc);
 }
 
 static void
@@ -81,7 +87,7 @@ Backup(void)
 }
 
 static void
-ShowCursor(int flag)
+MyShowCursor(int flag)
 {
     if (startC != 0 && finisC != 0) {
        tputs(flag ? startC : finisC, 1, outc);
@@ -108,7 +114,7 @@ static void
 ShowSign(char *string)
 {
     char *base = string;
-    int ch, first, last;
+    int first, last;
 
     if (moveit != 0) {
        tputs(tgoto(moveit, 0, height - 1), 1, outc);
@@ -116,7 +122,7 @@ ShowSign(char *string)
     }
 
     while (*string != 0) {
-       ch = *string;
+       int ch = *string;
        if (ch != ' ') {
            if (moveit != 0) {
                for (first = length - 2; first >= (string - base); first--) {
@@ -165,7 +171,7 @@ cleanup(void)
 {
     Underline(0);
     StandOut(0);
-    ShowCursor(1);
+    MyShowCursor(1);
 }
 
 static void
@@ -182,10 +188,13 @@ railroad(char **args)
     NCURSES_CONST char *name = getenv("TERM");
     char buffer[1024];
     char area[1024], *ap = area;
+    int z;
 
     if (name == 0)
        name = "dumb";
-    if (tgetent(buffer, name) >= 0) {
+
+    InitAndCatch(z = tgetent(buffer, name), onsig);
+    if (z >= 0) {
 
        wipeit = tgetstr("ce", &ap);
        height = tgetnum("li");
@@ -213,14 +222,12 @@ railroad(char **args)
        startC = tgetstr("ve", &ap);
        finisC = tgetstr("vi", &ap);
 
-       ShowCursor(0);
-
-       CATCHALL(onsig);
+       MyShowCursor(0);
 
        while (*args) {
            ShowSign(*args++);
        }
-       ShowCursor(1);
+       MyShowCursor(1);
     }
 }