X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Ftries.c;h=402bd2f7aa0d84c7c56ff3232073be4ed5ce5686;hp=a346decc96eaa9c45bc5536d64701f338aafd904;hb=3511767aa77f332927de0c4a610f9fb37ea18101;hpb=f70db18a0c3c6a828d8a5999be37239f01c9d98a diff --git a/ncurses/base/tries.c b/ncurses/base/tries.c index a346decc..402bd2f7 100644 --- a/ncurses/base/tries.c +++ b/ncurses/base/tries.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * + * Copyright (c) 1998-2007,2008 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,7 +39,7 @@ #include -MODULE_ID("$Id: tries.c,v 1.23 2006/12/30 16:26:54 tom Exp $") +MODULE_ID("$Id: tries.c,v 1.28 2008/11/16 00:19:59 juergen Exp $") /* * Expand a keycode into the string that it corresponds to, returning null if @@ -68,11 +68,15 @@ _nc_expand_try(TRIES * tree, unsigned code, int *count, size_t len) } } if (result != 0) { - if ((result[len] = ptr->ch) == 0) + if (ptr != 0 && (result[len] = (char) ptr->ch) == 0) *((unsigned char *) (result + len)) = 128; #ifdef TRACE - if (len == 0 && _nc_tracing != 0) - _tracef("expand_key %s %s", _tracechar(code), _nc_visbuf(result)); + if (len == 0 && USE_TRACEF(TRACE_MAXIMUM)) { + _tracef("expand_key %s %s", + _nc_tracechar(CURRENT_SCREEN, code), + _nc_visbuf(result)); + _nc_unlock_global(tracef); + } #endif } return result;