ncurses 5.9 - patch 20150321

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

diff --git a/ncurses/base/MKkeyname.awk b/ncurses/base/MKkeyname.awk
index bb2599acb558c26d29407bb220a27ddb3168f70e..7901611931698cadf870a0b7d8943f53f745113c 100644 (file)
--- a/ncurses/base/MKkeyname.awk
+++ b/ncurses/base/MKkeyname.awk
@@ -1,6 +1,6 @@
-# $Id: MKkeyname.awk,v 1.45 2010/12/19 01:36:14 tom Exp $
+# $Id: MKkeyname.awk,v 1.48 2013/08/24 17:37:22 tom Exp $
 ##############################################################################
-# Copyright (c) 1999-2009,2010 Free Software Foundation, Inc.                #
+# Copyright (c) 1999-2012,2013 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"), #
@@ -65,6 +65,7 @@ END {
        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)"
@@ -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 ""
        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 "                                 p = name;"
-       print "                                 if (cc >= 128 && (sp == 0 || sp->_use_meta)) {"
-       print "                                         strcpy(p, \"M-\");"
+       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 "                                         sprintf(p, \"^%c\", cc + '@');"
+       print "                                         _nc_SPRINTF(p, _nc_SLIMIT(P_LIMIT) \"^%c\", cc + '@');"
        print "                                 else if (cc == 127)"
-       print "                                         strcpy(p, \"^?\");"
+       print "                                         _nc_STRCPY(p, \"^?\", P_LIMIT);"
        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];"