X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ftest_getstr.c;h=4c243092b75460ec9c2d63ba4e12d060548752c8;hp=2af10091d48abc22d1d2e9375775d5b15829397a;hb=af3d0ee323cbb22d2a7596d564bf68f7307f5076;hpb=772f879d17117c5b766022f28099e341ebea825b

diff --git a/test/test_getstr.c b/test/test_getstr.c
index 2af10091..4c243092 100644
--- a/test/test_getstr.c
+++ b/test/test_getstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2007 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2007-2012,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            *
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_getstr.c,v 1.5 2007/07/21 22:22:55 tom Exp $
+ * $Id: test_getstr.c,v 1.11 2017/04/15 14:14:37 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -44,6 +44,9 @@
 
 #include <test.priv.h>
 
+#if HAVE_CHGAT
+/* Solaris SVr4 curses lacks wchgat, mvgetnstr, mvwgetnstr */
+
 #define BASE_Y 6
 #define MAX_COLS 1024
 
@@ -55,6 +58,15 @@ typedef enum {
     eMaxFlavor
 } Flavors;
 
+/*
+ * Return-code is OK/ERR or a keyname.
+ */
+static const char *
+ok_keyname(int code)
+{
+    return ((code == OK) ? "OK" : ((code == ERR) ? "ERR" : keyname(code)));
+}
+
 static bool
 Quit(int ch)
 {
@@ -87,9 +99,9 @@ MovePrompt(WINDOW *txtwin, int limit, int y, int x)
 }
 
 static int
-ShowFlavor(WINDOW *strwin, WINDOW *txtwin, Flavors flavor, int limit)
+ShowFlavor(WINDOW *strwin, WINDOW *txtwin, int flavor, int limit)
 {
-    char *name = "?";
+    const char *name = "?";
     bool limited = FALSE;
     bool wins = (txtwin != stdscr);
     int result;
@@ -129,7 +141,7 @@ ShowFlavor(WINDOW *strwin, WINDOW *txtwin, Flavors flavor, int limit)
 }
 
 static int
-test_getstr(int level, char **argv, WINDOW *strwin)
+recursive_test(int level, char **argv, WINDOW *strwin)
 {
     WINDOW *txtbox = 0;
     WINDOW *txtwin = 0;
@@ -221,7 +233,7 @@ test_getstr(int level, char **argv, WINDOW *strwin)
 	    break;
 
 	case 'w':
-	    test_getstr(level + 1, argv, strwin);
+	    recursive_test(level + 1, argv, strwin);
 	    if (txtbox != 0) {
 		touchwin(txtbox);
 		wnoutrefresh(txtbox);
@@ -268,7 +280,7 @@ test_getstr(int level, char **argv, WINDOW *strwin)
 	    *buffer = '\0';
 	    rc = ERR;
 	    echo();
-	    wattrset(txtwin, A_REVERSE);
+	    (void) wattrset(txtwin, A_REVERSE);
 	    switch (flavor) {
 	    case eGetStr:
 		if (txtwin != stdscr) {
@@ -306,8 +318,8 @@ test_getstr(int level, char **argv, WINDOW *strwin)
 		break;
 	    }
 	    noecho();
-	    wattrset(txtwin, A_NORMAL);
-	    wprintw(strwin, "%d:%s", rc, buffer);
+	    (void) wattrset(txtwin, A_NORMAL);
+	    wprintw(strwin, "%s:%s", ok_keyname(rc), buffer);
 	    wnoutrefresh(strwin);
 	    break;
 	default:
@@ -344,8 +356,17 @@ main(int argc, char *argv[])
 
     strwin = derwin(chrbox, 4, COLS - 2, 1, 1);
 
-    test_getstr(1, argv, strwin);
+    recursive_test(1, argv, strwin);
 
     endwin();
     ExitProgram(EXIT_SUCCESS);
 }
+
+#else
+int
+main(void)
+{
+    printf("This program requires the curses chgat function\n");
+    ExitProgram(EXIT_FAILURE);
+}
+#endif