X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fwidechar%2Flib_key_name.c;h=daf4ab022ae9c727ede89900c92af84525b9c610;hp=e24c9654d56459eba083f2cede09a22d5ee18ab3;hb=8d8a3537cd58af7879c6e1921235daeed2b74926;hpb=7b2974498fac39a3ffde257c92f572234d529239

diff --git a/ncurses/widechar/lib_key_name.c b/ncurses/widechar/lib_key_name.c
index e24c9654..daf4ab02 100644
--- a/ncurses/widechar/lib_key_name.c
+++ b/ncurses/widechar/lib_key_name.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2007 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2007,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            *
@@ -35,7 +35,9 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_key_name.c,v 1.2 2007/06/12 21:01:13 tom Exp $")
+MODULE_ID("$Id: lib_key_name.c,v 1.4 2017/01/07 19:50:17 tom Exp $")
+
+#define MyData _nc_globals.key_name
 
 NCURSES_EXPORT(NCURSES_CONST char *)
 key_name(wchar_t c)
@@ -44,19 +46,16 @@ key_name(wchar_t c)
     wchar_t *my_wchars;
     size_t len;
 
-    /* FIXME: move to _nc_globals */
-    static char result[MB_LEN_MAX + 1];
-
     memset(&my_cchar, 0, sizeof(my_cchar));
     my_cchar.chars[0] = c;
     my_cchar.chars[1] = L'\0';
 
     my_wchars = wunctrl(&my_cchar);
-    len = wcstombs(result, my_wchars, sizeof(result) - 1);
+    len = wcstombs(MyData, my_wchars, sizeof(MyData) - 1);
     if (isEILSEQ(len) || (len == 0)) {
-	return "UNKNOWN KEY";
+	return 0;
     }
 
-    result[len] = '\0';
-    return result;
+    MyData[len] = '\0';
+    return MyData;
 }