X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Flist_keys.c;h=759469500a40a92f97537dce4ad7795132819681;hp=5f9fbaf1c907945bb12c9dd8c7bac8a6e9f82126;hb=5eb177874dea59107a1a2ea44f5d8f5bb99550b2;hpb=53ea71aa108570a4a070e004484642a75f3492df;ds=sidebyside

diff --git a/test/list_keys.c b/test/list_keys.c
index 5f9fbaf1..75946950 100644
--- a/test/list_keys.c
+++ b/test/list_keys.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2016 Free Software Foundation, Inc.                        *
+ * Copyright (c) 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            *
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: list_keys.c,v 1.15 2016/07/09 18:21:24 tom Exp $
+ * $Id: list_keys.c,v 1.18 2017/03/18 22:03:07 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -99,47 +99,50 @@ show_key(const char *name, bool show)
 	    int ch = UChar(*value++);
 	    switch (ch) {
 	    case '\177':
-		strcpy(buffer, "^?");
+		_nc_STRCPY(buffer, "^?", sizeof(buffer));
 		break;
 	    case '\033':
-		strcpy(buffer, "\\E");
+		_nc_STRCPY(buffer, "\\E", sizeof(buffer));
 		break;
 	    case '\b':
-		strcpy(buffer, "\\b");
+		_nc_STRCPY(buffer, "\\b", sizeof(buffer));
 		break;
 	    case '\f':
-		strcpy(buffer, "\\f");
+		_nc_STRCPY(buffer, "\\f", sizeof(buffer));
 		break;
 	    case '\n':
-		strcpy(buffer, "\\n");
+		_nc_STRCPY(buffer, "\\n", sizeof(buffer));
 		break;
 	    case '\r':
-		strcpy(buffer, "\\r");
+		_nc_STRCPY(buffer, "\\r", sizeof(buffer));
 		break;
 	    case ' ':
-		strcpy(buffer, "\\s");
+		_nc_STRCPY(buffer, "\\s", sizeof(buffer));
 		break;
 	    case '\t':
-		strcpy(buffer, "\\t");
+		_nc_STRCPY(buffer, "\\t", sizeof(buffer));
 		break;
 	    case '^':
-		strcpy(buffer, "\\^");
+		_nc_STRCPY(buffer, "\\^", sizeof(buffer));
 		break;
 	    case ':':
-		strcpy(buffer, "\\072");
+		_nc_STRCPY(buffer, "\\072", sizeof(buffer));
 		break;
 	    case '\\':
-		strcpy(buffer, "\\\\");
+		_nc_STRCPY(buffer, "\\\\", sizeof(buffer));
 		break;
 	    default:
 		if (t_opt && ch == '"') {
-		    strcpy(buffer, "\"\"");
+		    _nc_STRCPY(buffer, "\"\"", sizeof(buffer));
 		} else if (isgraph(ch)) {
-		    sprintf(buffer, "%c", ch);
+		    _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
+				"%c", ch);
 		} else if (ch < 32) {
-		    sprintf(buffer, "^%c", ch + '@');
+		    _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
+				"^%c", ch + '@');
 		} else {
-		    sprintf(buffer, "\\%03o", ch);
+		    _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
+				"\\%03o", ch);
 		}
 		break;
 	    }
@@ -234,7 +237,8 @@ modified_key(const char *name)
 	int bit2 = (map & 4);
 	map &= ~6;
 	map |= (bit1 << 1) | (bit2 >> 1);
-	sprintf(result, "%sF%d", modifiers[map][f_opt], 1 + key);
+	_nc_SPRINTF(result, _nc_SLIMIT(sizeof(result))
+		    "%sF%d", modifiers[map][f_opt], 1 + key);
     } else if (sscanf(name, "k%[A-Z]%d%c", buffer, &value, &chr) == 2 &&
 	       (value > 1 &&
 		value <= 8) &&
@@ -248,11 +252,13 @@ modified_key(const char *name)
 		!strcmp(buffer, "END") ||
 		!strcmp(buffer, "NXT") ||
 		!strcmp(buffer, "PRV"))) {
-	sprintf(result, "%sk%s", modifiers[value - 1][f_opt], buffer);
+	_nc_SPRINTF(result, _nc_SLIMIT(sizeof(result))
+		    "%sk%s", modifiers[value - 1][f_opt], buffer);
     } else if (sscanf(name, "k%[A-Z]%c", buffer, &chr) == 1 &&
 	       (!strcmp(buffer, "UP") ||
 		!strcmp(buffer, "DN"))) {
-	sprintf(result, "%sk%s", modifiers[1][f_opt], buffer);
+	_nc_SPRINTF(result, _nc_SLIMIT(sizeof(result))
+		    "%sk%s", modifiers[1][f_opt], buffer);
     } else {
 	*result = '\0';
     }
@@ -282,7 +288,7 @@ list_keys(TERMINAL ** terms, int count)
 	TERMTYPE *term;
 	for (k = 0; k < count; ++k) {
 	    set_curterm(terms[k]);
-	    term = &(cur_term->type);
+	    term = (TERMTYPE *) cur_term;
 	    total += (size_t) (NUM_STRINGS(term) - STRCOUNT);
 	}
     }
@@ -303,7 +309,7 @@ list_keys(TERMINAL ** terms, int count)
 	int m, n;
 	for (k = 0; k < count; ++k) {
 	    set_curterm(terms[k]);
-	    term = &(cur_term->type);
+	    term = (TERMTYPE *) cur_term;
 	    for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) {
 		bool found = FALSE;
 		const char *estr = ExtStrname(term, (int) n, strnames);