ncurses 6.4 - patch 20240420

[ncurses.git] / ncurses / trace / lib_tracechr.c

diff --git a/ncurses/trace/lib_tracechr.c b/ncurses/trace/lib_tracechr.c
index 79cf03b4870cfb96e4f88dac050648b2be7eec24..9c879dc6739784bdb8483be012b3ecf0a0ac00eb 100644 (file)
--- a/ncurses/trace/lib_tracechr.c
+++ b/ncurses/trace/lib_tracechr.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
+ * Copyright 1998-2009,2012 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            *
@@ -39,10 +40,12 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_tracechr.c,v 1.19 2008/08/03 15:39:29 tom Exp $")
+MODULE_ID("$Id: lib_tracechr.c,v 1.24 2024/02/04 00:11:35 tom Exp $")
 
 #ifdef TRACE
 
+#define MyBufSize sizeof(_nc_globals.tracechr_buf)
+
 NCURSES_EXPORT(char *)
 _nc_tracechar(SCREEN *sp, int ch)
 {
@@ -51,23 +54,28 @@ _nc_tracechar(SCREEN *sp, int ch)
                      ? sp->tracechr_buf
                      : _nc_globals.tracechr_buf);
 
-    if (ch > KEY_MIN || ch < 0) {
-       name = _nc_keyname(sp, ch);
+    if ((ch > KEY_MIN && !_nc_unicode_locale()) || ch < 0) {
+       name = safe_keyname(SP_PARM, ch);
        if (name == 0 || *name == '\0')
            name = "NULL";
-       (void) sprintf(MyBuffer, "'%.30s' = %#03o", name, ch);
-    } else if (!is8bits(ch) || !isprint(UChar(ch))) {
+       _nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize)
+                   "'%.30s' = \\x%02x", name, ch);
+    } else if (!is8bits(ch)
+              || (_nc_unicode_locale() && !is7bits(ch))
+              || !isprint(UChar(ch))) {
        /*
         * workaround for glibc bug:
         * sprintf changes the result from unctrl() to an empty string if it
         * does not correspond to a valid multibyte sequence.
         */
-       (void) sprintf(MyBuffer, "%#03o", ch);
+       _nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize)
+                   "\\x%02x", ch);
     } else {
-       name = _nc_unctrl(sp, (chtype) ch);
+       name = safe_unctrl(SP_PARM, (chtype) ch);
        if (name == 0 || *name == 0)
            name = "null";      /* shouldn't happen */
-       (void) sprintf(MyBuffer, "'%.30s' = %#03o", name, ch);
+       _nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize)
+                   "'%.30s' = \\x%02x", name, ch);
     }
     return (MyBuffer);
 }
@@ -75,7 +83,7 @@ _nc_tracechar(SCREEN *sp, int ch)
 NCURSES_EXPORT(char *)
 _tracechar(int ch)
 {
-    return _nc_tracechar(SP, ch);
+    return _nc_tracechar(CURRENT_SCREEN, ch);
 }
 #else
 EMPTY_MODULE(_nc_lib_tracechr)