X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Frailroad.c;h=246dc0d4afa9480bb895a6a9c5973fc3934c31fe;hp=90eac981941161d0a298f3b209e02fbe5d208026;hb=119b5a6788c26bf7dcc99fcfd54e072946352a93;hpb=c633e5103a29a38532cf1925257b91cea33fd090

diff --git a/test/railroad.c b/test/railroad.c
index 90eac981..246dc0d4 100644
--- a/test/railroad.c
+++ b/test/railroad.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2000 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            *
@@ -27,17 +27,16 @@
  ****************************************************************************/
 
 /*
- * Author: Thomas E. Dickey <dickey@clark.net> 2000
+ * Author: Thomas E. Dickey - 2000
  *
- * $Id: railroad.c,v 1.4 2000/10/15 00:21:33 tom Exp $
+ * $Id: railroad.c,v 1.23 2019/08/24 23:11:01 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
+#define USE_TINFO
 #include <test.priv.h>
 
-#include <termcap.h>
-#include <ctype.h>
-#include <signal.h>
+#if HAVE_TGETENT
 
 static char *wipeit;
 static char *moveit;
@@ -56,16 +55,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
@@ -83,7 +86,7 @@ Backup(void)
 }
 
 static void
-ShowCursor(int flag)
+MyShowCursor(int flag)
 {
     if (startC != 0 && finisC != 0) {
 	tputs(flag ? startC : finisC, 1, outc);
@@ -110,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);
@@ -118,37 +121,39 @@ ShowSign(char *string)
     }
 
     while (*string != 0) {
-	ch = *string;
-	if (moveit != 0) {
-	    for (first = length - 2; first >= (string - base); first--) {
-		if (first < length - 1) {
-		    tputs(tgoto(moveit, first + 1, height - 1), 1, outc);
-		    PutChar(' ');
+	int ch = *string;
+	if (ch != ' ') {
+	    if (moveit != 0) {
+		for (first = length - 2; first >= (string - base); first--) {
+		    if (first < length - 1) {
+			tputs(tgoto(moveit, first + 1, height - 1), 1, outc);
+			PutChar(' ');
+		    }
+		    tputs(tgoto(moveit, first, height - 1), 1, outc);
+		    PutChar(ch);
 		}
-		tputs(tgoto(moveit, first, height - 1), 1, outc);
-		PutChar(ch);
-	    }
-	} else {
-	    last = ch;
-	    if (isalpha(ch)) {
-		first = isupper(ch) ? 'A' : 'a';
-	    } else if (isdigit(ch)) {
-		first = '0';
 	    } else {
-		first = ch;
-	    }
-	    if (first < last) {
-		Underline(1);
-		while (first < last) {
-		    PutChar(first);
-		    Backup();
-		    first++;
+		last = ch;
+		if (isalpha(ch)) {
+		    first = isupper(ch) ? 'A' : 'a';
+		} else if (isdigit(ch)) {
+		    first = '0';
+		} else {
+		    first = ch;
+		}
+		if (first < last) {
+		    Underline(1);
+		    while (first < last) {
+			PutChar(first);
+			Backup();
+			first++;
+		    }
+		    Underline(0);
 		}
-		Underline(0);
 	    }
+	    if (moveit != 0)
+		Backup();
 	}
-	if (moveit != 0)
-	    Backup();
 	StandOut(1);
 	PutChar(ch);
 	StandOut(0);
@@ -165,7 +170,7 @@ cleanup(void)
 {
     Underline(0);
     StandOut(0);
-    ShowCursor(1);
+    MyShowCursor(1);
 }
 
 static void
@@ -173,7 +178,7 @@ onsig(int n GCC_UNUSED)
 {
     interrupted = TRUE;
     cleanup();
-    exit(EXIT_FAILURE);
+    ExitProgram(EXIT_FAILURE);
 }
 
 static void
@@ -182,11 +187,13 @@ railroad(char **args)
     NCURSES_CONST char *name = getenv("TERM");
     char buffer[1024];
     char area[1024], *ap = area;
-    int j;
+    int z;
 
     if (name == 0)
 	name = "dumb";
-    if (tgetent(buffer, name)) {
+
+    InitAndCatch(z = tgetent(buffer, name), onsig);
+    if (z >= 0) {
 
 	wipeit = tgetstr("ce", &ap);
 	height = tgetnum("li");
@@ -214,16 +221,12 @@ railroad(char **args)
 	startC = tgetstr("ve", &ap);
 	finisC = tgetstr("vi", &ap);
 
-	ShowCursor(0);
-
-	for (j = SIGHUP; j <= SIGTERM; j++)
-	    if (signal(j, SIG_IGN) != SIG_IGN)
-		signal(j, onsig);
+	MyShowCursor(0);
 
 	while (*args) {
 	    ShowSign(*args++);
 	}
-	ShowCursor(1);
+	MyShowCursor(1);
     }
 }
 
@@ -233,9 +236,20 @@ main(int argc, char *argv[])
     if (argc > 1) {
 	railroad(argv + 1);
     } else {
+	static char world[] = "Hello World";
 	static char *hello[] =
-	{"Hello World", 0};
+	{world, 0};
 	railroad(hello);
     }
-    return 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