ncurses 6.2 - patch 20210206

[ncurses.git] / ncurses / widechar / lib_key_name.c

diff --git a/ncurses/widechar/lib_key_name.c b/ncurses/widechar/lib_key_name.c
index da65f219c26621ea9b43532871ef2a978e33f8a9..8acfe7a2f4987b42147cec31e7f1e028e047ca02 100644 (file)
--- a/ncurses/widechar/lib_key_name.c
+++ b/ncurses/widechar/lib_key_name.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2007 Free Software Foundation, Inc.                        *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2007-2008,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 +36,9 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_key_name.c,v 1.3 2008/10/11 20:15:14 tom Exp $")
+MODULE_ID("$Id: lib_key_name.c,v 1.5 2020/02/02 23:34:34 tom Exp $")
+
+#define MyData _nc_globals.key_name
 
 NCURSES_EXPORT(NCURSES_CONST char *)
 key_name(wchar_t c)
@@ -44,19 +47,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 0;
     }
 
-    result[len] = '\0';
-    return result;
+    MyData[len] = '\0';
+    return MyData;
 }