X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=ncurses%2Ftrace%2Flib_tracechr.c;h=5ceeed2aa9ad7f283c9884184e5336315ca8669f;hb=refs%2Ftags%2Fv5.4;hp=e97e67931464f1a18f5c7c29d5a53005f3c51737;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce;p=ncurses.git diff --git a/ncurses/trace/lib_tracechr.c b/ncurses/trace/lib_tracechr.c index e97e6793..5ceeed2a 100644 --- 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-2002,2003 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 * @@ -31,39 +31,42 @@ * and: Eric S. Raymond * ****************************************************************************/ - - /* * lib_tracechr.c - Tracing/Debugging routines */ - -#ifndef TRACE -#define TRACE /* turn on internal defs for this module */ -#endif - #include #include +MODULE_ID("$Id: lib_tracechr.c,v 1.10 2003/06/14 11:05:42 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]; + 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 (!isprint(ch) || ch > 255) { + /* + * 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(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