aboutsummaryrefslogtreecommitdiff
path: root/test/railroad.c
diff options
context:
space:
mode:
Diffstat (limited to 'test/railroad.c')
-rw-r--r--test/railroad.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/test/railroad.c b/test/railroad.c
index 33dc46f1dd1c..246dc0d4afa9 100644
--- a/test/railroad.c
+++ b/test/railroad.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2000-2011,2013 Free Software Foundation, Inc. *
+ * Copyright (c) 2000-2017,2019 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 - 2000
*
- * $Id: railroad.c,v 1.21 2013/09/28 22:02:17 tom Exp $
+ * $Id: railroad.c,v 1.23 2019/08/24 23:11:01 tom Exp $
*
* A simple demo of the termcap interface.
*/
@@ -113,7 +113,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);
@@ -121,7 +121,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--) {
@@ -187,10 +187,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");
@@ -220,8 +223,6 @@ railroad(char **args)
MyShowCursor(0);
- CATCHALL(onsig);
-
while (*args) {
ShowSign(*args++);
}