X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Flist_keys.c;h=cdad60e928b6a92a9a77ce4cce74e9d3ff53234f;hp=5f9fbaf1c907945bb12c9dd8c7bac8a6e9f82126;hb=9b4c4abadc0a29999c5ddad5aa8d769fee28d687;hpb=53ea71aa108570a4a070e004484642a75f3492df diff --git a/test/list_keys.c b/test/list_keys.c index 5f9fbaf1..cdad60e9 100644 --- a/test/list_keys.c +++ b/test/list_keys.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 2016 Free Software Foundation, Inc. * + * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 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 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: list_keys.c,v 1.15 2016/07/09 18:21:24 tom Exp $ + * $Id: list_keys.c,v 1.26 2020/02/02 23:34:34 tom Exp $ * * Author: Thomas E Dickey * @@ -88,58 +89,61 @@ static int show_key(const char *name, bool show) { int width = 0; - char buffer[10]; - NCURSES_CONST char *value = tigetstr(name); + NCURSES_CONST char *value = tigetstr((NCURSES_CONST char *) name); if (show && t_opt) fputc('"', stdout); if (value != 0 && value != (char *) -1) { while (*value != 0) { + char buffer[10]; 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; } @@ -156,7 +160,7 @@ show_key(const char *name, bool show) } static bool -valid_key(const char *name, TERMINAL ** terms, int count) +valid_key(const char *name, TERMINAL **terms, int count) { bool result = FALSE; if (*name == 'k') { @@ -194,8 +198,8 @@ compare_keys(const void *a, const void *b) static void draw_line(int width) { - int j; if (!t_opt) { + int j; for (j = 0; j < width; ++j) { printf("-"); } @@ -206,8 +210,8 @@ draw_line(int width) static const char * modified_key(const char *name) { - static char result[80]; - char buffer[sizeof(result)]; + static char result[100]; + char buffer[sizeof(result) - 10]; int value; char chr; static const char *modifiers[][2] = @@ -234,7 +238,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][(unsigned) f_opt], 1 + key); } else if (sscanf(name, "k%[A-Z]%d%c", buffer, &value, &chr) == 2 && (value > 1 && value <= 8) && @@ -248,11 +253,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][(unsigned) 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][(unsigned) f_opt], buffer); } else { *result = '\0'; } @@ -260,7 +267,7 @@ modified_key(const char *name) } static void -list_keys(TERMINAL ** terms, int count) +list_keys(TERMINAL **terms, int count) { int j, k; int widths0 = 0; @@ -279,10 +286,10 @@ list_keys(TERMINAL ** terms, int count) } #if NCURSES_XNAMES if (x_opt) { - TERMTYPE *term; for (k = 0; k < count; ++k) { + TERMTYPE *term; set_curterm(terms[k]); - term = &(cur_term->type); + term = (TERMTYPE *) cur_term; total += (size_t) (NUM_STRINGS(term) - STRCOUNT); } } @@ -292,18 +299,20 @@ list_keys(TERMINAL ** terms, int count) Type(j) = ktOther; if (sscanf(strnames[j], "kf%d", &k) == 1) { Type(j) = ktFunction; - } else if (!strncmp(strnames[j], "kcu", 3)) { + } else if (!(strncmp) (strnames[j], "kcu", 3)) { Type(j) = ktCursor; } Name(j) = strnames[j]; } #if NCURSES_XNAMES if (x_opt) { - TERMTYPE *term; int m, n; + for (k = 0; k < count; ++k) { + TERMTYPE *term; + 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); @@ -480,6 +489,8 @@ main(int argc, char *argv[]) list_keys(terms, 1); } + free(terms); + ExitProgram(EXIT_SUCCESS); }