ncurses 6.3 - patch 20220219

[ncurses.git] / test / ncurses.c

diff --git a/test/ncurses.c b/test/ncurses.c
index 37693ac4e6c07c19b2b507a0c2239a0848f2d125..c387b0a1f2cb490ec5620a72367a1d182e81cdc5 100644 (file)
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -41,7 +41,7 @@ AUTHOR
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 
-$Id: ncurses.c,v 1.524 2021/03/20 16:11:50 tom Exp $
+$Id: ncurses.c,v 1.527 2021/09/04 10:31:03 tom Exp $
 
 ***************************************************************************/
 
@@ -855,7 +855,7 @@ wgetch_test(unsigned level, WINDOW *win, int delay)
            setup_getch(win, flags);
            wgetch_help(win, flags);
        } else if (c == 'g') {
-           waddstr(win, "getstr test: ");
+           waddstr(win, "wgetnstr test: ");
            echo();
            c = wgetnstr(win, buf, sizeof(buf) - 1);
            noecho();
@@ -1113,7 +1113,7 @@ wget_wch_test(unsigned level, WINDOW *win, int delay)
            setup_getch(win, flags);
            wgetch_help(win, flags);
        } else if (c == 'g') {
-           waddstr(win, "getstr test: ");
+           waddstr(win, "wgetn_str test: ");
            echo();
            code = wgetn_wstr(win, wint_buf, BUFSIZ - 1);
            noecho();
@@ -5531,7 +5531,7 @@ panner_legend(int line)
        "Number repeats.  Toggle legend:? filler:a timer:t scrollmark:s."
     };
     int n = ((int) SIZEOF(legend) - (LINES - line));
-    if (n >= 0) {
+    if (n >= 0 && n < (int) SIZEOF(legend)) {
        if (move(line, 0) != ERR) {
            if (show_panner_legend)
                printw("%s", legend[n]);
@@ -6232,7 +6232,7 @@ tracetrace(unsigned tlevel)
     }
     _nc_SPRINTF(buf, _nc_SLIMIT(need) "0x%02x = {", tlevel);
     if (tlevel == 0) {
-       _nc_STRCAT(buf, t_tbl[0].name, need);
+       _nc_STRCAT(buf, t_tbl[0].name ? t_tbl[0].name : "", need);
        _nc_STRCAT(buf, ", ", need);
     } else {
        for (n = 1; t_tbl[n].name != 0; n++)
@@ -7236,11 +7236,11 @@ overlap_test(bool recur GCC_UNUSED)
            overlap_test_0(win2, win1);
            break;
 
-       case 'c':               /* fill window A so it's visible */
+       case 'c':               /* fill window A so it is visible */
            overlap_test_1(flavor[otBASE_fill], 0, win1, 'A');
            break;
 
-       case 'd':               /* fill window B so it's visible */
+       case 'd':               /* fill window B so it is visible */
            overlap_test_1(flavor[otBASE_fill], 1, win2, 'B');
            break;
 
@@ -7436,11 +7436,11 @@ x_overlap_test(bool recur GCC_UNUSED)
            overlap_test_0(win2, win1);
            break;
 
-       case 'c':               /* fill window A so it's visible */
+       case 'c':               /* fill window A so it is visible */
            x_overlap_test_1(flavor[otBASE_fill], 0, win1, WIDE_A);
            break;
 
-       case 'd':               /* fill window B so it's visible */
+       case 'd':               /* fill window B so it is visible */
            x_overlap_test_1(flavor[otBASE_fill], 1, win2, WIDE_B);
            break;
 
@@ -7855,7 +7855,7 @@ main_menu(bool top)
 
        if (doit != NULL && doit(FALSE) == OK) {
            /*
-            * This may be overkill; it's intended to reset everything back
+            * This may be overkill; it is intended to reset everything back
             * to the initial terminal modes so that tests don't get in
             * each other's way.
             */