ncurses 5.6 - patch 20061230

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

diff --git a/ncurses/trace/lib_tracechr.c b/ncurses/trace/lib_tracechr.c
index e97e67931464f1a18f5c7c29d5a53005f3c51737..34a2bb616f295eaec104a40f885c5dcb4b201f04 100644 (file)
--- a/ncurses/trace/lib_tracechr.c
+++ b/ncurses/trace/lib_tracechr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2004,2005 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            *
@@ -29,41 +29,45 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-
-
 /*
  *     lib_tracechr.c - Tracing/Debugging routines
  */
-
-#ifndef TRACE
-#define TRACE                  /* turn on internal defs for this module */
-#endif
-
 #include <curses.priv.h>
 
 #include <ctype.h>
 
+MODULE_ID("$Id: lib_tracechr.c,v 1.12 2005/04/16 16:55:46 tom Exp $")
+
 #ifdef TRACE
-char *_tracechar(const unsigned char ch)
+NCURSES_EXPORT(char *)
+_tracechar(int ch)
 {
-    static char crep[20];
-    /* 
-     * We can show the actual character if it's either an ordinary printable
-     * or one of the high-half characters.
-     */
-    if (isprint(ch) || (ch & 0x80))
-    {
-       crep[0] = '\'';
-       crep[1] = ch;   /* necessary; printf tries too hard on metachars */
-       (void) sprintf(crep + 2, "' = 0x%02x", (unsigned)ch);
+    static char result[40];
+    NCURSES_CONST char *name;
+
+    if (ch > KEY_MIN || ch < 0) {
+       name = keyname(ch);
+       if (name == 0 || *name == '\0')
+           name = "NULL";
+       (void) sprintf(result, "'%.30s' = %#03o", name, ch);
+    } else if (!is8bits(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(result, "%#03o", ch);
+    } else {
+       name = unctrl((chtype) ch);
+       if (name == 0 || *name == 0)
+           name = "null";      /* shouldn't happen */
+       (void) sprintf(result, "'%.30s' = %#03o", name, ch);
     }
-    else
-       (void) sprintf(crep, "0x%02x", (unsigned)ch);
-    return(crep);
+    return (result);
 }
 #else
-extern void _nc_lib_tracechr(void);
-       void _nc_lib_tracechr(void) { }
+empty_module(_nc_lib_tracechr)
 #endif