ncurses 6.0 - patch 20170225

[ncurses.git] / test / demo_defkey.c

diff --git a/test/demo_defkey.c b/test/demo_defkey.c
index ab120636b7ff6dd82206f51667a068a912c02513..05914718ff79a7609d74f2480895c2c9f67711ac 100644 (file)
--- a/test/demo_defkey.c
+++ b/test/demo_defkey.c
@@ -1,5 +1,32 @@
+/****************************************************************************
+ * Copyright (c) 2002-2016,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            *
+ * "Software"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/
 /*
- * $Id: demo_defkey.c,v 1.13 2004/01/04 00:01:13 tom Exp $
+ * $Id: demo_defkey.c,v 1.26 2017/01/21 22:07:43 tom Exp $
  *
  * Demonstrate the define_key() function.
  * Thomas Dickey - 2002/11/23
@@ -9,8 +36,6 @@
 
 #if defined(NCURSES_VERSION) && NCURSES_EXT_FUNCS
 
-#include <term.h>
-
 #define MY_LOGFILE "demo_defkey.log"
 
 /*
@@ -24,9 +49,12 @@ log_last_line(WINDOW *win)
     char temp[256];
 
     if ((fp = fopen(MY_LOGFILE, "a")) != 0) {
+       int need = sizeof(temp) - 1;
+       if (need > COLS)
+           need = COLS;
        getyx(win, y, x);
        wmove(win, y - 1, 0);
-       n = winnstr(win, temp, sizeof(temp));
+       n = winnstr(win, temp, need);
        while (n-- > 0) {
            if (isspace(UChar(temp[n])))
                temp[n] = '\0';
@@ -48,16 +76,17 @@ visichar(int ch)
     static char temp[10];
 
     ch = UChar(ch);
+    assert(ch >= 0 && ch < 256);
     if (ch == '\\') {
-       strcpy(temp, "\\\\");
+       _nc_STRCPY(temp, "\\\\", sizeof(temp));
     } else if (ch == '\033') {
-       strcpy(temp, "\\E");
+       _nc_STRCPY(temp, "\\E", sizeof(temp));
     } else if (ch < ' ') {
-       sprintf(temp, "\\%03o", ch);
+       _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "\\%03o", ch);
     } else if (ch >= 127) {
-       sprintf(temp, "\\%03o", ch);
+       _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "\\%03o", ch);
     } else {
-       sprintf(temp, "%c", ch);
+       _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "%c", ch);
     }
     return temp;
 }
@@ -69,7 +98,7 @@ static char *
 visible(const char *string)
 {
     char *result = 0;
-    unsigned need = 1;
+    size_t need = 1;
     int pass;
     int n;
 
@@ -77,17 +106,18 @@ visible(const char *string)
        for (pass = 0; pass < 2; ++pass) {
            for (n = 0; string[n] != '\0'; ++n) {
                char temp[80];
-               strcpy(temp, visichar(string[n]));
-               if (pass)
-                   strcat(result, temp);
-               else
+               _nc_STRNCPY(temp, visichar(string[n]), sizeof(temp) - 2);
+               if (pass) {
+                   _nc_STRCAT(result, temp, need);
+               } else {
                    need += strlen(temp);
+               }
            }
            if (!pass)
-               result = (char *) calloc(need, 1);
+               result = typeCalloc(char, need);
        }
     } else {
-       result = (char *) calloc(1, 1);
+       result = typeCalloc(char, (size_t) 1);
     }
     return result;
 }
@@ -102,7 +132,7 @@ really_define_key(WINDOW *win, const char *new_string, int code)
     char temp[80];
 
     if (code_name == 0) {
-       sprintf(temp, "Keycode %d", code);
+       _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "Keycode %d", code);
        code_name = temp;
     }
 
@@ -115,6 +145,7 @@ really_define_key(WINDOW *win, const char *new_string, int code)
                code_name);
     }
     log_last_line(win);
+
     if (vis_string != 0) {
        free(vis_string);
        vis_string = 0;
@@ -141,7 +172,7 @@ really_define_key(WINDOW *win, const char *new_string, int code)
        wprintw(win, "%s deleted\n", code_name);
        log_last_line(win);
     }
-    if (vis_string != 0 && *vis_string != 0)
+    if (vis_string != 0)
        free(vis_string);
     if (old_string != 0)
        free(old_string);
@@ -156,13 +187,14 @@ duplicate(WINDOW *win, NCURSES_CONST char *name, int code)
        const char *prefix = 0;
        char temp[BUFSIZ];
 
-       if (!strncmp(value, "\033[", 2)) {
+       if (!strncmp(value, "\033[", (size_t) 2)) {
            prefix = "\033O";
-       } else if (!strncmp(value, "\033O", 2)) {
+       } else if (!strncmp(value, "\033O", (size_t) 2)) {
            prefix = "\033[";
        }
        if (prefix != 0) {
-           sprintf(temp, "%s%s", prefix, value + 2);
+           _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
+                       "%s%s", prefix, value + 2);
            really_define_key(win, temp, code);
        }
     }
@@ -209,7 +241,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
      */
     for (n = 0; n < 12; ++n) {
        char name[10];
-       sprintf(name, "kf%d", n + 1);
+       _nc_SPRINTF(name, _nc_SLIMIT(sizeof(name)) "kf%d", n + 1);
        fkeys[n] = tigetstr(name);
     }
     for (n = 0; n < 12; ++n) {
@@ -236,9 +268,11 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
                name != 0 ? name : "<null>");
        log_last_line(win);
        wclrtoeol(win);
+       if (ch == 'q')
+           break;
     }
     endwin();
-    return EXIT_SUCCESS;
+    ExitProgram(EXIT_FAILURE);
 }
 #else
 int