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

diff --git a/test/railroad.c b/test/railroad.c
index 90eac981..91117b91 100644
--- a/test/railroad.c
+++ b/test/railroad.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2000 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2000-2001,2002 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,16 +29,12 @@
 /*
  * Author: Thomas E. Dickey <dickey@clark.net> 2000
  *
- * $Id: railroad.c,v 1.4 2000/10/15 00:21:33 tom Exp $
+ * $Id: railroad.c,v 1.11 2002/10/19 22:11:24 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
 #include <test.priv.h>
 
-#include <termcap.h>
-#include <ctype.h>
-#include <signal.h>
-
 static char *wipeit;
 static char *moveit;
 static int length;
@@ -119,36 +115,38 @@ 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(' ');
+	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);
@@ -173,7 +171,7 @@ onsig(int n GCC_UNUSED)
 {
     interrupted = TRUE;
     cleanup();
-    exit(EXIT_FAILURE);
+    ExitProgram(EXIT_FAILURE);
 }
 
 static void
@@ -233,9 +231,10 @@ 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);
 }