ncurses 6.2 - patch 20210213

[ncurses.git] / ncurses / base / MKkeyname.awk

diff --git a/ncurses/base/MKkeyname.awk b/ncurses/base/MKkeyname.awk
index abceeea8883eeca8433ee14ae73c568cb3beff34..b3d04ee77f53113e9e62d6e5c8e7c11e87f7c693 100644 (file)
--- a/ncurses/base/MKkeyname.awk
+++ b/ncurses/base/MKkeyname.awk
@@ -1,6 +1,7 @@
-# $Id: MKkeyname.awk,v 1.44 2010/01/23 17:57:43 tom Exp $
+# $Id: MKkeyname.awk,v 1.51 2020/02/02 23:34:34 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1999-2009,2010 Free Software Foundation, Inc.                #
+# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 1998-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"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -65,18 +66,18 @@ END {
        print ""
        print "#define SIZEOF_TABLE 256"
        print "#define MyTable _nc_globals.keyname_table"
        print ""
        print "#define SIZEOF_TABLE 256"
        print "#define MyTable _nc_globals.keyname_table"

+       print "#define MyInit  _nc_globals.init_keyname"

        print ""
        print "NCURSES_EXPORT(NCURSES_CONST char *)"
        print "safe_keyname (SCREEN *sp, int c)"
        print "{"
        print ""
        print "NCURSES_EXPORT(NCURSES_CONST char *)"
        print "safe_keyname (SCREEN *sp, int c)"
        print "{"

-       print " int i;"

        print " char name[20];"
        print " char name[20];"

-       print " char *p;"

        print " NCURSES_CONST char *result = 0;"
        print ""
        print " if (c == -1) {"
        print "         result = \"-1\";"
        print " } else {"
        print " NCURSES_CONST char *result = 0;"
        print ""
        print " if (c == -1) {"
        print "         result = \"-1\";"
        print " } else {"

+       print "         int i;"

        if (bigstrings) {
                print "         for (i = 0; _nc_key_names[i].offset != -1; i++) {"
                print "                 if (_nc_key_names[i].code == c) {"
        if (bigstrings) {
                print "         for (i = 0; _nc_key_names[i].offset != -1; i++) {"
                print "                 if (_nc_key_names[i].code == c) {"


@@ -96,21 +97,36 @@ END {
        print "         if (result == 0 && (c >= 0 && c < SIZEOF_TABLE)) {"
        print "                 if (MyTable == 0)"
        print "                         MyTable = typeCalloc(char *, SIZEOF_TABLE);"
        print "         if (result == 0 && (c >= 0 && c < SIZEOF_TABLE)) {"
        print "                 if (MyTable == 0)"
        print "                         MyTable = typeCalloc(char *, SIZEOF_TABLE);"

+       print ""

        print "                 if (MyTable != 0) {"
        print "                 if (MyTable != 0) {"

+       print "                         int m_prefix = (sp == 0 || sp->_use_meta);"
+       print ""
+       print "                         /* if sense of meta() changed, discard cached data */"
+       print "                         if (MyInit != (m_prefix + 1)) {"
+       print "                                 MyInit = m_prefix + 1;"
+       print "                                 for (i = 0; i < SIZEOF_TABLE; ++i) {"
+       print "                                         if (MyTable[i]) {"
+       print "                                                 FreeAndNull(MyTable[i]);"
+       print "                                         }"
+       print "                                 }"
+       print "                         }"
+       print ""
+       print "                         /* create and cache result as needed */"

        print "                         if (MyTable[c] == 0) {"
        print "                                 int cc = c;"
        print "                         if (MyTable[c] == 0) {"
        print "                                 int cc = c;"

-       print "                                 p = name;"
-       print "                                 if (cc >= 128 && (sp == 0 || sp->_use_meta)) {"
-       print "                                         strcpy(p, \"M-\");"
+       print "                                 char *p = name;"
+       print "#define P_LIMIT (sizeof(name) - (size_t) (p - name))"
+       print "                                 if (cc >= 128 && m_prefix) {"
+       print "                                         _nc_STRCPY(p, \"M-\", P_LIMIT);"

        print "                                         p += 2;"
        print "                                         cc -= 128;"
        print "                                 }"
        print "                                 if (cc < 32)"
        print "                                         p += 2;"
        print "                                         cc -= 128;"
        print "                                 }"
        print "                                 if (cc < 32)"

-       print "                                         sprintf(p, \"^%c\", cc + '@');"
+       print "                                         _nc_SPRINTF(p, _nc_SLIMIT(P_LIMIT) \"^%c\", cc + '@');"

        print "                                 else if (cc == 127)"
        print "                                 else if (cc == 127)"

-       print "                                         strcpy(p, \"^?\");"
+       print "                                         _nc_STRCPY(p, \"^?\", P_LIMIT);"

        print "                                 else"
        print "                                 else"

-       print "                                         sprintf(p, \"%c\", cc);"
+       print "                                         _nc_SPRINTF(p, _nc_SLIMIT(P_LIMIT) \"%c\", cc);"

        print "                                 MyTable[c] = strdup(name);"
        print "                         }"
        print "                         result = MyTable[c];"
        print "                                 MyTable[c] = strdup(name);"
        print "                         }"
        print "                         result = MyTable[c];"


@@ -119,8 +135,8 @@ END {
        print "         } else if (result == 0 && HasTerminal(sp)) {"
        print "                 int j, k;"
        print "                 char * bound;"
        print "         } else if (result == 0 && HasTerminal(sp)) {"
        print "                 int j, k;"
        print "                 char * bound;"

-       print "                 TERMTYPE *tp = &(TerminalOf(sp)->type);"
-       print "                 int save_trace = _nc_tracing;"
+       print "                 TERMTYPE2 *tp = &TerminalType(TerminalOf(sp));"
+       print "                 unsigned save_trace = _nc_tracing;"

        print ""
        print "                 _nc_tracing = 0;        /* prevent recursion via keybound() */"
        print "                 for (j = 0; (bound = NCURSES_SP_NAME(keybound)(NCURSES_SP_ARGx c, j)) != 0; ++j) {"
        print ""
        print "                 _nc_tracing = 0;        /* prevent recursion via keybound() */"
        print "                 for (j = 0; (bound = NCURSES_SP_NAME(keybound)(NCURSES_SP_ARGx c, j)) != 0; ++j) {"


@@ -150,8 +166,8 @@ END {
        print "#if NO_LEAKS"
        print "void _nc_keyname_leaks(void)"
        print "{"
        print "#if NO_LEAKS"
        print "void _nc_keyname_leaks(void)"
        print "{"

-       print " int j;"

        print " if (MyTable != 0) {"
        print " if (MyTable != 0) {"

+       print "         int j;"

        print "         for (j = 0; j < SIZEOF_TABLE; ++j) {"
        print "                 FreeIfNeeded(MyTable[j]);"
        print "         }"
        print "         for (j = 0; j < SIZEOF_TABLE; ++j) {"
        print "                 FreeIfNeeded(MyTable[j]);"
        print "         }"