ncurses 5.6 - patch 20070609

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

diff --git a/ncurses/trace/lib_tracechr.c b/ncurses/trace/lib_tracechr.c
index bf004f35294ed54fc806aac449601ca85b1455d7..479756ac59beee19b3b92988f31ee65ec04d5663 100644 (file)
--- a/ncurses/trace/lib_tracechr.c
+++ b/ncurses/trace/lib_tracechr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
+ * Copyright (c) 1998-2005,2007 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -29,6 +29,7 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *

+ *     and: Thomas E. Dickey                        1996-on                 *

  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*


@@ -36,16 +37,38 @@
  */
 #include <curses.priv.h>
 
  */
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_tracechr.c,v 1.2 2000/04/01 20:17:26 tom Exp $")
+#include <ctype.h>
+
+MODULE_ID("$Id: lib_tracechr.c,v 1.13 2007/04/21 23:16:37 tom Exp $")

 
 #ifdef TRACE
 
 #ifdef TRACE

-char *_tracechar(const unsigned char ch)
+#define MyBuffer _nc_globals.tracechr_buf
+
+NCURSES_EXPORT(char *)
+_tracechar(int ch)

 {
 {

-    static char crep[20];
-    (void) sprintf(crep, "'%s' = 0x%02x", unctrl(ch), (unsigned)ch);
-    return(crep);
+    NCURSES_CONST char *name;
+
+    if (ch > KEY_MIN || ch < 0) {
+       name = keyname(ch);
+       if (name == 0 || *name == '\0')
+           name = "NULL";
+       (void) sprintf(MyBuffer, "'%.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(MyBuffer, "%#03o", ch);
+    } else {
+       name = unctrl((chtype) ch);
+       if (name == 0 || *name == 0)
+           name = "null";      /* shouldn't happen */
+       (void) sprintf(MyBuffer, "'%.30s' = %#03o", name, ch);
+    }
+    return (MyBuffer);

 }
 #else
 }
 #else

-extern void _nc_lib_tracechr(void);
-       void _nc_lib_tracechr(void) { }
+empty_module(_nc_lib_tracechr)

 #endif
 #endif