/****************************************************************************
- * Copyright (c) 2003 Free Software Foundation, Inc. *
+ * Copyright (c) 2003-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 *
#include <curses.priv.h>
-MODULE_ID("$Id: charable.c,v 1.2 2003/07/05 18:04:08 tom Exp $")
+MODULE_ID("$Id: charable.c,v 1.4 2005/04/16 18:08:56 tom Exp $")
NCURSES_EXPORT(bool) _nc_is_charable(wchar_t ch)
{
bool result;
#if HAVE_WCTOB
- result = (wctob(ch) == ch);
+ result = (wctob((wint_t) ch) == ch);
#else
result = (_nc_to_char(ch) >= 0);
#endif
#if HAVE_BTOWC
result = btowc(ch);
#elif HAVE_MBTOWC
+ wchar_t convert;
char temp[2];
temp[0] = ch;
temp[1] = '\0';
- if (mbtowc((wchar_t *) (&result), temp, 1) != 1)
+ if (mbtowc(&convert, temp, 1) >= 0)
+ result = convert;
+ else
result = WEOF;
#endif
return result;