ncurses 5.6 - patch 20070630

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

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

- * Copyright (c) 1998-2002,2003 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                 *

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


@@ -38,34 +39,35 @@
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

-MODULE_ID("$Id: lib_tracechr.c,v 1.10 2003/06/14 11:05:42 tom Exp $")
+MODULE_ID("$Id: lib_tracechr.c,v 1.13 2007/04/21 23:16:37 tom Exp $")

 
 #ifdef TRACE
 
 #ifdef TRACE

+#define MyBuffer _nc_globals.tracechr_buf
+

 NCURSES_EXPORT(char *)
 _tracechar(int ch)
 {
 NCURSES_EXPORT(char *)
 _tracechar(int ch)
 {

-    static char result[40];
-    char *name;
+    NCURSES_CONST char *name;

 
     if (ch > KEY_MIN || ch < 0) {
        name = keyname(ch);
        if (name == 0 || *name == '\0')
            name = "NULL";
 
     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 (!isprint(ch) || ch > 255) {
+       (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.
         */
        /*
         * 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);
+       (void) sprintf(MyBuffer, "%#03o", ch);

     } else {
     } else {

-       name = unctrl(ch);
+       name = unctrl((chtype) ch);

        if (name == 0 || *name == 0)
            name = "null";      /* shouldn't happen */
        if (name == 0 || *name == 0)
            name = "null";      /* shouldn't happen */

-       (void) sprintf(result, "'%.30s' = %#03o", name, ch);
+       (void) sprintf(MyBuffer, "'%.30s' = %#03o", name, ch);

     }
     }

-    return (result);
+    return (MyBuffer);

 }
 #else
 empty_module(_nc_lib_tracechr)
 }
 #else
 empty_module(_nc_lib_tracechr)