X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fredraw.c;h=96c6b0f308b67a78d0438085fee300e92f0c2e32;hp=ce98259c321734baee31572131146f84f3571a5c;hb=c120fddebe9e9c1e2b29dbd744a6b1d03652bf8b;hpb=027ae42953e3186daed8f3882da73de48291b606

diff --git a/test/redraw.c b/test/redraw.c
index ce98259c..96c6b0f3 100644
--- a/test/redraw.c
+++ b/test/redraw.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2006 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2006-2010,2011 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            *
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: redraw.c,v 1.3 2006/11/04 23:20:27 tom Exp $
+ * $Id: redraw.c,v 1.7 2011/05/21 18:38:35 tom Exp $
  *
  * Demonstrate the redrawwin() and wredrawln() functions.
  * Thomas Dickey - 2006/11/4
@@ -65,11 +65,13 @@ test_redraw(WINDOW *win)
     int max_y, max_x;
     int beg_y, beg_x;
 
+    assert(win != 0);
+
     scrollok(win, TRUE);
     keypad(win, TRUE);
     getmaxyx(win, max_y, max_x);
     getbegyx(win, beg_y, beg_x);
-    while (!done) {
+    while (!done && win != 0) {
 	ch = wgetch(win);
 	getyx(win, y, x);
 	switch (ch) {
@@ -111,7 +113,7 @@ test_redraw(WINDOW *win)
 	     * using mvcur().  It is ifdef'd for NCURSES, since X/Open does
 	     * not define the case where the old location is unknown. 
 	     */
-	    system("date");
+	    IGNORE_RC(system("date"));
 	    mvcur(-1, -1, y, x);
 	    break;
 #endif
@@ -148,7 +150,7 @@ test_redraw(WINDOW *win)
 	    if (ch > KEY_MIN) {
 		waddstr(win, keyname(ch));
 	    } else {
-		waddstr(win, unctrl(ch));
+		waddstr(win, unctrl(UChar(ch)));
 	    }
 	    break;
 	}