X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Flist_keys.c;h=cdad60e928b6a92a9a77ce4cce74e9d3ff53234f;hp=2000a44e767490006596cd64d36436fb77bb1d9d;hb=f3ec084eb66ba14feb6357b674fb85dd474933d8;hpb=d545d5dd9889756f005fb63a843adb230b990493 diff --git a/test/list_keys.c b/test/list_keys.c index 2000a44e..cdad60e9 100644 --- a/test/list_keys.c +++ b/test/list_keys.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 2016-2017,2018 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.23 2018/02/12 09:57:31 tom Exp $ + * $Id: list_keys.c,v 1.26 2020/02/02 23:34:34 tom Exp $ * * Author: Thomas E Dickey * @@ -88,7 +89,6 @@ static int show_key(const char *name, bool show) { int width = 0; - char buffer[10]; NCURSES_CONST char *value = tigetstr((NCURSES_CONST char *) name); if (show && t_opt) @@ -96,6 +96,7 @@ show_key(const char *name, bool show) if (value != 0 && value != (char *) -1) { while (*value != 0) { + char buffer[10]; int ch = UChar(*value++); switch (ch) { case '\177': @@ -197,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("-"); } @@ -209,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] = @@ -285,8 +286,8 @@ 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 = (TERMTYPE *) cur_term; total += (size_t) (NUM_STRINGS(term) - STRCOUNT); @@ -305,9 +306,11 @@ list_keys(TERMINAL **terms, int count) } #if NCURSES_XNAMES if (x_opt) { - TERMTYPE *term; int m, n; + for (k = 0; k < count; ++k) { + TERMTYPE *term; + set_curterm(terms[k]); term = (TERMTYPE *) cur_term; for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) {